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

diff --git a/config/spell.m4 b/config/spell.m4
index c733dab2b4..a15f9f6b3d 100644
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -80,7 +80,7 @@ AC_DEFUN([LYX_USE_INCLUDED_HUNSPELL],[
 	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_CFLAGS='-I$(top_srcdir)/3rdparty/hunspell/1.6.2/src'
 		HUNSPELL_LIBS='$(top_builddir)/3rdparty/hunspell/liblyxhunspell.a'
 		AC_SUBST(HUNSPELL_CFLAGS)
 		AC_SUBST(HUNSPELL_LIBS)
@@ -93,16 +93,15 @@ AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 [
 	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
+dnl the user wanted to use the included hunspell, so do not check for external hunspell
 		lyx_use_hunspell=true
+		AC_DEFINE(USE_HUNSPELL, 1, [Define as 1 to use the hunspell library])
 		lyx_flags="$lyx_flags use-hunspell"
 	else
-		CHECK_WITH_ASPELL
-		CHECK_WITH_ENCHANT
 		CHECK_WITH_HUNSPELL
 	fi
+	CHECK_WITH_ASPELL
+	CHECK_WITH_ENCHANT
 
 	AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
 	AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)