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

diff --git a/config/spell.m4 b/config/spell.m4
index ec4c75e526..c733dab2b4 100644
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -51,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,
-		[AC_SEARCH_LIBS(Hunspell_spell,
-		     [hunspell hunspell-1.2],, [lyx_use_hunspell=false])],
-		[lyx_use_hunspell=false])
-	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)
@@ -64,18 +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],
 [
-	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)
 	])
+