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

diff --git a/config/spell.m4 b/config/spell.m4
index c733dab2b4..4d949aa572 100644
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -7,23 +7,37 @@ AC_DEFUN([CHECK_WITH_ASPELL],
 	test "$with_aspell" = "no" && lyx_use_aspell=false
 
 	if $lyx_use_aspell ; then
-	AC_CHECK_HEADERS(aspell.h,
-		[lyx_use_aspell=true; break;],
-		[lyx_use_aspell=false])
-	AC_CHECK_LIB(aspell, new_aspell_config, LIBS="-laspell $LIBS", lyx_use_aspell=false)
+		AC_CHECK_HEADERS(aspell.h,
+			[lyx_use_aspell=true; break;],
+			[lyx_use_aspell=false])
+		AC_CHECK_LIB(aspell, new_aspell_config, LIBS="-laspell $LIBS", lyx_use_aspell=false)
 
-	AC_MSG_CHECKING([whether to use aspell])
-	if $lyx_use_aspell ; then
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(USE_ASPELL, 1, [Define as 1 to use the aspell library])
-		lyx_flags="$lyx_flags use-aspell"
-	else
-		AC_MSG_RESULT(no)
-	fi
+		AC_MSG_CHECKING([whether to use aspell])
+		if $lyx_use_aspell ; then
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(USE_ASPELL, 1, [Define as 1 to use the aspell library])
+			lyx_flags="$lyx_flags use-aspell"
+		else
+			AC_MSG_RESULT(no)
+		fi
 	fi
 	])
 
-# Macro to add for using enchant spellchecker libraries!     -*- sh -*-
+AC_DEFUN([LYX_HAVE_ENCHANT2],
+[
+  AC_MSG_CHECKING([whether enchant is version 2.x at least])
+  save_CXXFLAGS=$CXXFLAGS
+  CXXFLAGS="$ENCHANT_CFLAGS $AM_CXXFLAGS $CXXFLAGS"
+
+  AC_TRY_COMPILE([#include <enchant++.h>],
+      [enchant::Broker broker;],
+      [AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_ENCHANT2, 1, [Define to 1 if enchant 2.x is detected])
+      ],
+      [AC_MSG_RESULT(no)])
+  CXXFLAGS=$save_CXXFLAGS
+])
+
 AC_DEFUN([CHECK_WITH_ENCHANT],
 [
 	lyx_use_enchant=true
@@ -31,18 +45,39 @@ AC_DEFUN([CHECK_WITH_ENCHANT],
 	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
+		PKG_CHECK_MODULES([ENCHANT], [enchant-2], [],
+		    [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_HAVE_ENCHANT2
+		    lyx_flags="$lyx_flags use-enchant"
+		else
+		    AC_MSG_RESULT(no)
+		fi
+    	fi
     ])
 
+AC_DEFUN([LYX_HAVE_HUNSPELL_CXXABI],
+[
+  AC_MSG_CHECKING([whether hunspell C++ (rather than C) ABI is provided])
+  save_CXXFLAGS=$CXXFLAGS
+  CXXFLAGS="$ENCHANT_CFLAGS $AM_CXXFLAGS $CXXFLAGS"
+
+# in the C++ ABI, stem() returns a vector, in the C ABI, it returns an int
+  AC_TRY_COMPILE([#include <hunspell/hunspell.hxx>],
+      [Hunspell sp("foo", "bar");
+       int i = sp.stem("test").size();],
+      [AC_MSG_RESULT(yes)
+       AC_DEFINE(HAVE_HUNSPELL_CXXABI, 1, [Define to 1 if hunspell C++ (rather than C) ABI is detected])
+       have_hunspell_cxx_abi=yes
+      ],
+      [AC_MSG_RESULT(no)])
+  CXXFLAGS=$save_CXXFLAGS
+])
+
 # Macro to add for using hunspell spellchecker libraries!     -*- sh -*-
 AC_DEFUN([CHECK_WITH_HUNSPELL],
 [
@@ -66,6 +101,12 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
 		AC_MSG_RESULT(no)
 	fi
     fi
+	LYX_HAVE_HUNSPELL_CXXABI
+	if test $enable_stdlib_debug = "yes" -a -n "$have_hunspell_cxx_abi" ; then
+		LYX_WARNING([Compiling LyX with stdlib-debug and system hunspell libraries may lead to
+   crashes. Consider using --disable-stdlib-debug or --with-included-hunspell.])
+	      fi
+
     ])
 
 dnl Usage: LYX_USE_INCLUDED_HUNSPELL : select if the included hunspell should
@@ -80,7 +121,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 +134,16 @@ 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])
+		AC_DEFINE(HAVE_HUNSPELL_CXXABI, 1, [Define to 1 if hunspell C++ (rather than C) ABI is detected])
 		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)