X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fspell.m4;h=1a2a1e9522fd68d3741ddf6824c2be595844f97a;hb=68ee68103a77300c3aa01db9e63bd01b8243a0eb;hp=e06fb23dfdb765863a6eb5929e09753cf9696605;hpb=fb43bbbf6c7529cb0165b5c7f3e0be5cfaf00626;p=lyx.git

diff --git a/config/spell.m4 b/config/spell.m4
index e06fb23dfd..1a2a1e9522 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,
-		[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)
@@ -64,8 +65,8 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
 	else
 		AC_MSG_RESULT(no)
 	fi
-	fi
-	])
+    fi
+    ])
 
 
 ### Check if we want spell libraries, prefer new aspell or hunspell
@@ -74,16 +75,6 @@ AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 	CHECK_WITH_ASPELL
 	AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
 
-	if $lyx_use_aspell ; then
-### Check for aspell framework name
-		LYX_WITH_DIR([aspell-framework],[name of aspell framework],aspell_framework, NONE)
-		if ! test "x${lyx_cv_aspell_framework}" = xNONE; then
-		  AC_DEFINE_UNQUOTED([ASPELL_FRAMEWORK], "${lyx_cv_aspell_framework}")
-		else
-		  AC_DEFINE(ASPELL_FRAMEWORK, [""], [Define as name of aspell framework])
-		fi
-	fi
-
 	CHECK_WITH_ENCHANT
 	AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)