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 da387c1fc5eeda0631c29c66bb33b5c5e1d9eff8..6afd1a91b10efe099d21d8504df2d2274d447a60 100644 (file)
--- a/config/pspell.m4
+++ b/config/pspell.m4
@@ -3,53 +3,27 @@
 
 AC_DEFUN(CHECK_WITH_PSPELL,
 [
-  USE_PSPELL="yes"
-  AC_MSG_CHECKING([for pspell support])
     AC_ARG_WITH(pspell,
-      [  --with-pspell           use PSpell libraries],[
-        if test "$withval" = "no"; then
-          USE_PSPELL="no"
-        fi
-      ])
+       AC_HELP_STRING([--with-pspell],[use PSpell libraries]),
+       [
+           case "$withval" in
+               y*) USING_PSPELL="yes";;
+               *) USING_PSPELL="no";;
+           esac
+           ],
+       [
+           USING_PSPELL="yes"
+           ])
 
-    AC_ARG_WITH(pspell-includes, [  --with-pspell-include   where the pspell.h is located],
-      pspell_use_include="$withval",
-      pspell_use_include=NONE)
+    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")
 
-    if test "$pspell_use_include" = "" || \
-      test "$pspell_use_include" = "NONE"; then
-      pspell_includes="/usr/include /usr/local/include"
-      AC_FIND_FILE(pspell/pspell.h,$pspell_includes,pspell_use_include)
+       if test "$USING_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_ARG_WITH(pspell-libs, [  --with-pspell-lib       where the libpspell.a is located],
-      pspell_use_lib="$withval",
-      pspell_use_lib=NONE)
-
-    if test -n "$pspell_use_lib" && \
-      test "$pspell_use_lib" != "NONE"; then
-      pspell_lib_found="Setting to $pspell_use_lib"
-    else
-      pspell_libs="/usr/lib /usr/lib/pspell /usr/local/lib /usr/local/lib/pspell"
-      AC_FIND_FILE(libpspell.la libpspell.so libpspell.a,$pspell_libs,pspell_use_lib)
-      pspell_lib_found="yes"
-    fi
-
-    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
-      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
-    AC_MSG_RESULT($USE_PSPELL)
-  ])
+    AC_MSG_CHECKING([whether to use pspell])
+    AC_MSG_RESULT($USING_PSPELL)
+    ])