anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport r39040 (pkgconfig to configure hunspell).

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39041 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2011-06-14 14:37:26 +00:00
parent 00f0562003
commit 4df6ae89f6
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/spell.m4
View File

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

4
src/Makefile.am
View File

@ -4,7 +4,7 @@ include $(top_srcdir)/config/common.am
DISTCLEANFILES += libintl.h 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) AM_CPPFLAGS += $(QT4_CPPFLAGS) $(QT4_CORE_INCLUDES)
if BUILD_CLIENT_SUBDIR if BUILD_CLIENT_SUBDIR
@ -16,7 +16,7 @@ SUBDIRS = support frontends . $(CLIENT) tex2lyx
EXTRA_DIST = pch.h EXTRA_DIST = pch.h
OTHERLIBS = $(BOOST_LIBS) $(INTLLIBS) $(MYTHES_LIBS) \ 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 noinst_LIBRARIES = liblyxcore.a
bin_PROGRAMS = lyx bin_PROGRAMS = lyx

2
status.20x
View File

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