X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fspell.m4;h=1a2a1e9522fd68d3741ddf6824c2be595844f97a;hb=33ff0f276a72113bcaf4c6e48f4bf40bb204cbdd;hp=c1d881798923cf0935c168e733fb23097a44a970;hpb=042e8bb4d07b2f469c2cc21273c80a3d7bd94517;p=lyx.git

diff --git a/config/spell.m4 b/config/spell.m4
index c1d8817989..1a2a1e9522 100644
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -17,9 +17,6 @@ AC_DEFUN([CHECK_WITH_ASPELL],
 		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
@@ -54,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)
@@ -67,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