X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fspell.m4;h=c1d881798923cf0935c168e733fb23097a44a970;hb=a174f43bc5515291c4d0b28cacd806c9c9ea4de4;hp=6f8fe4000032e7c0e38d1c1bceea041b2b11f335;hpb=201e5bdf707317be29e9b7476e2b97a34e2d0b48;p=lyx.git

diff --git a/config/spell.m4 b/config/spell.m4
index 6f8fe40000..c1d8817989 100644
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -2,81 +2,84 @@
 # Only checks for "new" aspell, > 0.50
 AC_DEFUN([CHECK_WITH_ASPELL],
 [
-    lyx_use_aspell=true
-    AC_ARG_WITH(aspell,	AC_HELP_STRING([--with-aspell],[use ASpell libraries]))
-    test "$with_aspell" = "no" && lyx_use_aspell=false
+	lyx_use_aspell=true
+	AC_ARG_WITH(aspell, AC_HELP_STRING([--without-aspell],[do not check for ASpell library]))
+	test "$with_aspell" = "no" && lyx_use_aspell=false
 
-    if $lyx_use_aspell ; then
-	AC_CHECK_HEADERS(aspell.h aspell/aspell.h, 
-	    [lyx_use_aspell=true; break;], 
-	    [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_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"
+		### Check for aspell framework name
+		LYX_WITH_DIR([aspell-framework], [name of aspell framework],aspell_framework, [])
+		AC_DEFINE_UNQUOTED([ASPELL_FRAMEWORK], "${lyx_cv_aspell_framework}", [Define as name of aspell framework])
+	else
+		AC_MSG_RESULT(no)
+	fi
+	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_ASPELL, 1, [Define as 1 to use the aspell library])
-	    lyx_flags="$lyx_flags use-aspell"
+	    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 pspell spellchecker libraries!     -*- sh -*-
-# @author@: Jürgen Vigna
-AC_DEFUN([CHECK_WITH_PSPELL],
+# Macro to add for using hunspell spellchecker libraries!     -*- sh -*-
+AC_DEFUN([CHECK_WITH_HUNSPELL],
 [
-    lyx_use_pspell=true
-    AC_ARG_WITH(pspell,	AC_HELP_STRING([--with-pspell],[use PSpell libraries]))
-    test "$with_pspell" = "no" && lyx_use_pspell=false
+	lyx_use_hunspell=true
+	AC_ARG_WITH(hunspell, AC_HELP_STRING([--without-hunspell],[do not check for Hunspell library]))
+	test "$with_hunspell" = "no" && lyx_use_hunspell=false
 
-    if $lyx_use_pspell ; then
-	AC_CHECK_HEADERS(pspell/pspell.h,, lyx_use_pspell=false)
-	AC_CHECK_LIB(pspell, main, LIBS="-lpspell $LIBS", lyx_use_pspell=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)
 
-	AC_MSG_CHECKING([whether to use pspell])
-	if $lyx_use_pspell ; then
-	    AC_MSG_RESULT(yes)
-	    AC_DEFINE(USE_PSPELL, 1, [Define as 1 to use the pspell library])
-	    lyx_flags="$lyx_flags use-pspell"
+	AC_MSG_CHECKING([whether to use hunspell])
+	if $lyx_use_hunspell ; then
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(USE_HUNSPELL, 1, [Define as 1 to use the hunspell library])
+		lyx_flags="$lyx_flags use-hunspell"
 	else
-	    AC_MSG_RESULT(no)
+		AC_MSG_RESULT(no)
 	fi
-    fi
-    ])
+	fi
+	])
+
 
-### Check if we want spell libraries, prefer new aspell
+### Check if we want spell libraries, prefer new aspell or hunspell
 AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 [
-    lyx_use_aspell=false
-    lyx_use_pspell=false
-    lyx_use_ispell=false
+	CHECK_WITH_ASPELL
+	AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
 
-    dnl Prefer use of the aspell library over pspell.
-    CHECK_WITH_ASPELL
-    if $lyx_use_aspell ; then : ; else
-        CHECK_WITH_PSPELL
-    fi
-
-    dnl check for the ability to communicate through unix pipes
-    dnl with an external ispell process.
-    dnl Do this independent of the existence of the aspell, pspell libraries.
-    lyx_use_ispell=true
-    AC_LANG_PUSH(C)
-    AC_CHECK_FUNCS(select dup2,, [lyx_use_ispell=false])
-    AC_LANG_POP(C)
-    AC_MSG_CHECKING([whether to use ispell])
-    if $lyx_use_ispell ; then
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(USE_ISPELL, 1, [Define as 1 to use an external ispell process for spell-checking])
-      lyx_flags="$lyx_flags use-ispell"
-    else
-      AC_MSG_RESULT(no)
-    fi
+	CHECK_WITH_ENCHANT
+	AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)
 
-    AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
-    AM_CONDITIONAL(USE_PSPELL, $lyx_use_pspell)
-    AM_CONDITIONAL(USE_ISPELL, $lyx_use_ispell)
-    ])
+	CHECK_WITH_HUNSPELL
+	AM_CONDITIONAL(USE_HUNSPELL, $lyx_use_hunspell)
+	])