X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fspell.m4;h=1a2a1e9522fd68d3741ddf6824c2be595844f97a;hb=6de3c19fd63f810eed90ef3bc4469faf28e949c2;hp=a7299490716408f3918af21eab869594ac1ae577;hpb=7746747506617b952e04e2e805c3688f4fef5256;p=lyx.git

diff --git a/config/spell.m4 b/config/spell.m4
index a729949071..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,24 +65,19 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
 	else
 		AC_MSG_RESULT(no)
 	fi
-	fi
-	])
+    fi
+    ])
+
 
 ### Check if we want spell libraries, prefer new aspell or hunspell
 AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
 [
-	lyx_use_aspell=false
 	CHECK_WITH_ASPELL
-
 	AM_CONDITIONAL(USE_ASPELL, $lyx_use_aspell)
 
-	lyx_use_enchant=false
 	CHECK_WITH_ENCHANT
-
 	AM_CONDITIONAL(USE_ENCHANT, $lyx_use_enchant)
 
-	lyx_use_hunspell=false
 	CHECK_WITH_HUNSPELL
-
 	AM_CONDITIONAL(USE_HUNSPELL, $lyx_use_hunspell)
 	])