From: John Levon <levon@movementarian.org>
Date: Tue, 25 Mar 2003 21:14:44 +0000 (+0000)
Subject: Fix the pspell tests.
X-Git-Tag: 1.6.10~17173
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=16cba1f3ab9343717af6e8d456257f30239edc54;p=lyx.git

Fix the pspell tests.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6576 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/config/ChangeLog b/config/ChangeLog
index a72ce7492e..3ebcf25abf 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-25  John Levon  <levon@movementarian.org>
+
+	* pspell.m4: fix up the tests again
+
 2003-03-24  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* lyxinclude.m4 (lyx_warning): add gcc 3.3 as known compiler and
diff --git a/config/pspell.m4 b/config/pspell.m4
index 08b0f8b4d5..0b8b420ff3 100644
--- a/config/pspell.m4
+++ b/config/pspell.m4
@@ -3,27 +3,27 @@
 
 AC_DEFUN(CHECK_WITH_PSPELL,
 [
-    AC_MSG_CHECKING([for pspell support])
     AC_ARG_WITH(pspell,
 	AC_HELP_STRING([--with-pspell],[use PSpell libraries]),
 	[
 	    case "$withval" in
-		y*) USE_PSPELL="yes";;
-		*) USE_PSPELL="no";;
+		y*) TRY_PSPELL="yes";;
+		*) TRY_PSPELL="no";;
 	    esac
 	    ],
 	[
-	    USE_PSPELL="yes"
+	    TRY_PSPELL="yes"
 	    ])
 
-    if test "$USE_PSPELL" = "yes" ; then
-	AC_CHECK_HEADERS(pspell/pspell.h, break, USE_PSPELL=no)
-	AC_CHECK_LIB(pspell, new_pspell_config)
+    if test "$TRY_PSPELL" = "yes" ; then
+	AC_CHECK_HEADERS(pspell.h pspell/pspell.h, break, USE_PSPELL=no)
+	AC_CHECK_LIB(pspell, main)
 
-	if test "$USE_PSPELL" = "yes"; then
+	if test "$TRY_PSPELL" = "yes"; then
 	    AC_DEFINE(USE_PSPELL, 1, [Define as 1 to use the pspell library])
 	    lyx_flags="$lyx_flags use-pspell"
 	fi
     fi
-    AC_MSG_RESULT($USE_PSPELL)
+    AC_MSG_CHECKING([whether to use pspell])
+    AC_MSG_RESULT($TRY_PSPELL)
     ])