X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fspell.m4;h=c733dab2b45b9e32cea87ba0b7f5db7e4f360aca;hb=cccc027cf13ce0b49fc4d9c1de4aa57ddd8aa5a2;hp=adce739c945b05ce93048cae0c1fa240ad54f2db;hpb=89dde39404b7316b7423a6df0a1e92c5bbee8081;p=lyx.git

diff --git a/config/spell.m4 b/config/spell.m4
index adce739c94..c733dab2b4 100644
--- 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,47 @@ 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([--with-included-hunspell], [use the hunspell lib supplied with LyX instead of the system one])],
+		[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
+		lyx_included_libs="$lyx_included_libs hunspell"
+		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
 	])
 
+
 ### Check if we want spell libraries, prefer new aspell or hunspell
 AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 [
-	lyx_use_aspell=false
-	CHECK_WITH_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
 
 	AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
-
-	lyx_use_hunspell=false
-	CHECK_WITH_HUNSPELL
-
+	AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)
 	AM_CONDITIONAL(USE_HUNSPELL, $lyx_use_hunspell)
 	])
+