Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / config / spell.m4

diff --git a/config/spell.m4 b/config/spell.m4
index adce739c945b05ce93048cae0c1fa240ad54f2db..1a2a1e9522fd68d3741ddf6824c2be595844f97a 100644 (file)
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -23,6 +23,26 @@ AC_DEFUN([CHECK_WITH_ASPELL],
        fi
        ])
 
+# Macro to add for using enchant spellchecker libraries!     -*- sh -*-
+AC_DEFUN([CHECK_WITH_ENCHANT],
+[
+       lyx_use_enchant=true
+       AC_ARG_WITH(enchant, AC_HELP_STRING([--without-enchant],[do not check for Enchant library]))
+       test "$with_enchant" = "no" && lyx_use_enchant=false
+
+       if $lyx_use_enchant; then
+       PKG_CHECK_MODULES([ENCHANT], [enchant], [], [lyx_use_enchant=false])
+       AC_MSG_CHECKING([whether to use enchant])
+       if $lyx_use_enchant ; then
+           AC_MSG_RESULT(yes)
+           AC_DEFINE(USE_ENCHANT, 1, [Define as 1 to use the enchant library])
+           lyx_flags="$lyx_flags use-enchant"
+       else
+           AC_MSG_RESULT(no)
+       fi
+    fi
+    ])
+
 # Macro to add for using hunspell spellchecker libraries!     -*- sh -*-
 AC_DEFUN([CHECK_WITH_HUNSPELL],
 [
@@ -31,11 +51,12 @@ 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], [], [
+                 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)
+               ])
        AC_MSG_CHECKING([whether to use hunspell])
        if $lyx_use_hunspell ; then
                AC_MSG_RESULT(yes)
@@ -44,19 +65,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_hunspell=false
-       CHECK_WITH_HUNSPELL
+       CHECK_WITH_ENCHANT
+       AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)
 
+       CHECK_WITH_HUNSPELL
        AM_CONDITIONAL(USE_HUNSPELL, $lyx_use_hunspell)
        ])