BufferParams.h: revert unintended changes from previous commit

[lyx.git] / config / spell.m4

diff --git a/config/spell.m4 b/config/spell.m4
index a7299490716408f3918af21eab869594ac1ae577..71a0b7bcad37da34f2b6dc6d8c107238c66e6308 100644 (file)
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -51,11 +51,7 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
        test "$with_hunspell" = "no" && lyx_use_hunspell=false
 
        if $lyx_use_hunspell ; then
-       AC_CHECK_HEADERS(hunspell/hunspell.hxx,
-               [lyx_use_hunspell=true; break;],
-               [lyx_use_hunspell=false])
-       AC_CHECK_LIB(hunspell, main, LIBS="-lhunspell $LIBS", lyx_use_hunspell=false)
-
+       PKG_CHECK_MODULES([HUNSPELL], [hunspell], [], [lyx_use_hunspell=false])
        AC_MSG_CHECKING([whether to use hunspell])
        if $lyx_use_hunspell ; then
                AC_MSG_RESULT(yes)
@@ -64,24 +60,19 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
        else
                AC_MSG_RESULT(no)
        fi
-       fi
-       ])
+    fi
+    ])
+
 
 ### Check if we want spell libraries, prefer new aspell or hunspell
 AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 [
-       lyx_use_aspell=false
        CHECK_WITH_ASPELL
-
        AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
 
-       lyx_use_enchant=false
        CHECK_WITH_ENCHANT
-
        AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)
 
-       lyx_use_hunspell=false
        CHECK_WITH_HUNSPELL
-
        AM_CONDITIONAL(USE_HUNSPELL, $lyx_use_hunspell)
        ])