Check path of Qt tools if qtchooser is detected

[lyx.git] / config / spell.m4

diff --git a/config/spell.m4 b/config/spell.m4
index d8b643cc841fb582f3ce3a7d3402e9a556971e71..fffad96aa5c3c6376351a1a4fdb44b8ec790d42d 100644 (file)
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -51,16 +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])
-
-       if test x$lyx_use_hunspell = xtrue ; then
-               AC_CHECK_LIB(hunspell, main, LIBS="-lhunspell $LIBS", lyx_use_hunspell=false)
-               if test x$lyx_use_hunspell = xfalse ; then
-                        AC_CHECK_LIB(hunspell-1.2, main, [LIBS="-lhunspell-1.2 $LIBS" lyx_use_hunspell=true], lyx_use_hunspell=false)
-               fi
-       fi
+       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)
@@ -69,6 +65,24 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
        else
                AC_MSG_RESULT(no)
        fi
+    fi
+    ])
+
+dnl Usage: LYX_USE_INCLUDED_HUNSPELL : select if the included hunspell should
+dnl        be used.
+AC_DEFUN([LYX_USE_INCLUDED_HUNSPELL],[
+       AC_MSG_CHECKING([whether to use included hunspell library])
+       AC_ARG_WITH(included-hunspell,
+               [AC_HELP_STRING([--without-included-hunspell], [do not use the hunspell lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])],
+               [lyx_cv_with_included_hunspell=$withval],
+               [lyx_cv_with_included_hunspell=no])
+       AM_CONDITIONAL(USE_INCLUDED_HUNSPELL, test x$lyx_cv_with_included_hunspell = xyes)
+       AC_MSG_RESULT([$lyx_cv_with_included_hunspell])
+       if test x$lyx_cv_with_included_hunspell = xyes ; then
+               HUNSPELL_CFLAGS='-I$(top_srcdir)/3rdparty/hunspell/1.3.3/src'
+               HUNSPELL_LIBS='$(top_builddir)/3rdparty/hunspell/liblyxhunspell.a'
+               AC_SUBST(HUNSPELL_CFLAGS)
+               AC_SUBST(HUNSPELL_LIBS)
        fi
        ])
 
@@ -76,12 +90,21 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
 ### Check if we want spell libraries, prefer new aspell or hunspell
 AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 [
-       CHECK_WITH_ASPELL
-       AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
+       LYX_USE_INCLUDED_HUNSPELL
+       if test x$lyx_cv_with_included_hunspell = xyes ; then
+dnl the user wanted to use the included hunspell, so do not check for the other spell checkers
+               lyx_use_aspell=false
+               lyx_use_enchant=false
+               lyx_use_hunspell=true
+               lyx_flags="$lyx_flags use-hunspell"
+       else
+               CHECK_WITH_ASPELL
+               CHECK_WITH_ENCHANT
+               CHECK_WITH_HUNSPELL
+       fi
 
-       CHECK_WITH_ENCHANT
+       AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
        AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)
-
-       CHECK_WITH_HUNSPELL
        AM_CONDITIONAL(USE_HUNSPELL, $lyx_use_hunspell)
        ])
+