fix writing of tabulars; output the real lyx version number at the top of generated...

[lyx.git] / config / pspell.m4

diff --git a/config/pspell.m4 b/config/pspell.m4
index ad626abd4b762c9c57a670a19cd699038bb69401..6afd1a91b10efe099d21d8504df2d2274d447a60 100644 (file)
--- a/config/pspell.m4
+++ b/config/pspell.m4
@@ -3,49 +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*) USING_PSPELL="yes";;
+               *) USING_PSPELL="no";;
            esac
            ],
        [
-           USE_PSPELL="yes"
+           USING_PSPELL="yes"
            ])
 
-    AC_ARG_WITH(pspell-includes,
-       AC_HELP_STRING([--with-pspell-include],[where the pspell.h is located]),
-       pspell_use_include="$withval",
-       [])
+    if test "$USING_PSPELL" = "yes" ; then
+       AC_CHECK_HEADERS(pspell/pspell.h, USING_PSPELL="yes", USING_PSPELL="no")
+       AC_CHECK_LIB(pspell, main, LIBS="-lpspell $LIBS"; USING_PSPELL="yes", USING_PSPELL="no")
 
-    AC_ARG_WITH(pspell-libs,
-       AC_HELP_STRING([--with-pspell-lib],[where the libpspell.a is located]),
-       pspell_use_lib="$withval",
-       [])
-
-    if test "$USE_PSPELL" = "yes" ; then
-       AC_CHECK_HEADER(pspell/pspell.h)
-       AC_CHECK_LIB(pspell, delete_pspell_config)
-
-       if test "$pspell_use_include" = "NO" || \
-           test "$pspell_use_lib" = "NO"; then
-           if test "$USE_PSPELL" = "yes"; then
-               USE_PSPELL="not found"
-           fi
-       fi
-
-       if test "$USE_PSPELL" = "yes"; then
+       if test "$USING_PSPELL" = "yes"; then
            AC_DEFINE(USE_PSPELL, 1, [Define as 1 to use the pspell library])
-#      PSPELL_INCLUDES="-I$pspell_use_include"
-#      PSPELL_LIBS="-L$pspell_use_lib -lpspell"
-#      USE_PSPELL="yes ($pspell_use_include $pspell_use_lib)"
-           AC_SUBST(PSPELL_INCLUDES)
-           AC_SUBST(PSPELL_LIBS)
            lyx_flags="$lyx_flags use-pspell"
        fi
     fi
-    AC_MSG_RESULT($USE_PSPELL)
+    AC_MSG_CHECKING([whether to use pspell])
+    AC_MSG_RESULT($USING_PSPELL)
     ])