Backport r39040 (pkgconfig to configure hunspell).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39041 a592a061-630c-0410-9148-cb99ea01b6c8

config/spell.m4

@@ -51,11 +51,7 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
 	test "$with_hunspell" = "no" && lyx_use_hunspell=false
 
 	if $lyx_use_hunspell ; then
-	  AC_CHECK_HEADERS(hunspell/hunspell.hxx,
-		[AC_SEARCH_LIBS(Hunspell_spell,
-		     [hunspell hunspell-1.2],, [lyx_use_hunspell=false])],
-		[lyx_use_hunspell=false])
-	fi
+	PKG_CHECK_MODULES([HUNSPELL], [hunspell], [], [lyx_use_hunspell=false])
 	AC_MSG_CHECKING([whether to use hunspell])
 	if $lyx_use_hunspell ; then
 		AC_MSG_RESULT(yes)
@@ -64,7 +60,8 @@ AC_DEFUN([CHECK_WITH_HUNSPELL],
 	else
 		AC_MSG_RESULT(no)
 	fi
-	])
+    fi
+    ])
 
 
 ### Check if we want spell libraries, prefer new aspell or hunspell

src/Makefile.am

@@ -4,7 +4,7 @@ include $(top_srcdir)/config/common.am
 
 DISTCLEANFILES += libintl.h
 
-AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS)
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(top_srcdir)/src $(BOOST_INCLUDES) $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS)
 AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
 
 if BUILD_CLIENT_SUBDIR
@@ -16,7 +16,7 @@ SUBDIRS = support frontends . $(CLIENT) tex2lyx
 EXTRA_DIST = pch.h
 
 OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \
-		 $(ENCHANT_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
+		 $(ENCHANT_LIBS) $(HUNSPELL_LIBS) @LIBS@ $(SOCKET_LIBS) $(LIBSHLWAPI) $(LIBPSAPI)
 
 noinst_LIBRARIES = liblyxcore.a
 bin_PROGRAMS = lyx

status.20x

@@ -168,3 +168,5 @@ What's new
 
 * BUILD/INSTALLATION
 
+- Using pkgconfig to configure hunspell (hunspell 1.3 was not correctly
+  recognized).