anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

restore old hunspell library detection code as fallback when pkg-config is not available - for Mac OS X

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39485 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Stephan Witt 2011-08-15 05:09:32 +00:00
parent 2961d29cd3
commit be43302c90
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/spell.m4
View File

@ -51,7 +51,12 @@ 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
PKG_CHECK_MODULES([HUNSPELL], [hunspell], [], [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]) 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)

3
status.20x
View File

@ -310,5 +310,8 @@ What's new
- Using pkgconfig to configure hunspell (hunspell 1.3 was not correctly - Using pkgconfig to configure hunspell (hunspell 1.3 was not correctly
recognized). recognized).
- Using explicit header and library detection as fallback to configure
hunspell in case pkgconfig is missing in build environment.
- Fixed build failure on GNU/Hurd, which doesn't define PATH_MAX - Fixed build failure on GNU/Hurd, which doesn't define PATH_MAX
(bug 7467). (bug 7467).