strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mythes12: update system-mythes check for 1.2.0; add missing AC_LANG_PUSH/POP

Browse source
This commit is contained in:
Rene Engelhard 2010-04-27 17:16:50 +02:00
parent a0de0def4a
commit 0cce173a5b
4 changed files with 10207 additions and 16267 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26446
configure vendored
View file

File diff suppressed because it is too large Load diff

22
configure.in
View file

@ -5090,15 +5090,29 @@ AC_MSG_CHECKING([which mythes to use])
if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then
AC_MSG_RESULT([external])
SYSTEM_MYTHES=YES
AC_CHECK_HEADER(mythes.hxx, [],
[ AC_MSG_ERROR(mythes.hxx headers not found.)], [])
AC_CHECK_LIB(mythes, main, [],
[ AC_MSG_ERROR(mythes library not found.)], [])
AC_LANG_PUSH([C++])
PKG_CHECK_MODULES(MYTHES, mythes, MYTHES_PKGCONFIG=yes, MYTHES_PKGCONFIG=no)
if test "$MYTHES_PKGCONFIG" = "no"; then
AC_CHECK_HEADER(mythes.hxx, [],
[ AC_MSG_ERROR(mythes.hxx headers not found.)], [])
AC_CHECK_LIB(mythes-1.2, main, [],
[ MYTHES_FOUND=no], [])
if test "$MYTHES_FOUND" = "no"; then
AC_CHECK_LIB(mythes, main, [],
[ MYTHES_FOUND=no], [])
fi
if test "$MYTHES_FOUND" = "no"; then
AC_MSG_ERROR([mythes library not found!.])
fi
fi
AC_LANG_POP([C++])
else
AC_MSG_RESULT([internal])
SYSTEM_MYTHES=NO
fi
AC_SUBST(SYSTEM_MYTHES)
AC_SUBST(MYTHES_CFLAGS)
AC_SUBST(MYTHES_LIBS)
dnl ===================================================================
dnl Checking for lpsolve

2
set_soenv.in
View file

@ -1878,6 +1878,8 @@ ToFile( "SYSTEM_LPSOLVE", "@SYSTEM_LPSOLVE@", "e" );
ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" );
ToFile( "HYPHEN_LIB", "@HYPHEN_LIB@", "e" );
ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );
ToFile( "MYTHES_CFLAGS", "@MYTHES_CFLAGS@", "e" );
ToFile( "MYTHES_LIBS", "@MYTHES_LIBS@", "e" );
ToFile( "PAM", "@PAM@", "e" );
ToFile( "NEW_SHADOW_API", "@NEW_SHADOW_API@", "e" );
ToFile( "PAM_LINK", "@PAM_LINK@", "e" );

4
solenv/inc/libs.mk
View file

@ -342,7 +342,11 @@ HUNSPELLLIB=$(HUNSPELL_LIBS)
.ELSE
HUNSPELLLIB=-lhunspell-1.2
.ENDIF
.IF "$(SYSTEM_MYTHES)" == "YES"
MYTHESLIB=$(MYTHES_LIBS)
.ELSE
MYTHESLIB=-lmythes
.ENDIF
PYUNOLIB=-lpyuno
LPSOLVELIB=-llpsolve55
SOFFICELIB=-lsofficeapp