diff options
| -rw-r--r-- | configure.in | 23 | ||||
| -rw-r--r-- | ooo.lst | 1 | ||||
| -rw-r--r-- | set_soenv.in | 2 | ||||
| -rwxr-xr-x | solenv/config/sdev300.ini | 2 | ||||
| -rw-r--r-- | solenv/inc/libs.mk | 6 | ||||
| -rw-r--r-- | splitbuild/extern.lst | 2 |
6 files changed, 29 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 048bdc37d924..02faf69d6198 100644 --- a/configure.in +++ b/configure.in @@ -5090,15 +5090,30 @@ 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=yes], + [ 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 + BUILD_TYPE="$BUILD_TYPE MYTHES" fi AC_SUBST(SYSTEM_MYTHES) +AC_SUBST(MYTHES_CFLAGS) +AC_SUBST(MYTHES_LIBS) dnl =================================================================== dnl Checking for lpsolve @@ -71,3 +71,4 @@ fcc6df1160753d0b8c835d17fdeeb0a7-boost_1_39_0.tar.gz fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz fe5b3e2b7c4577f30dc001054365653e-dejavu-fonts-ttf-2.30.zip 831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip +067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz diff --git a/set_soenv.in b/set_soenv.in index 8b6d6f1a7724..15f51cf81148 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1922,6 +1922,8 @@ ToFile( "SYSTEM_LIBC", "@SYSTEM_LIBC@", "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" ); diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index d04a87c595e2..2b6526f9aa22 100755 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -8,7 +8,7 @@ common BIG_SVX TRUE BMP_WRITES_FLAG TRUE BUILD_SPECIAL TRUE - BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT + BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT common_build TRUE COMMON_OUTDIR common CONFIG_PROJECT config_office diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 7237832e1cd3..09b6df9d33d9 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -344,7 +344,11 @@ HUNSPELLLIB=$(HUNSPELL_LIBS) .ELSE HUNSPELLLIB=-lhunspell-1.2 .ENDIF -MYTHESLIB=-lmythes +.IF "$(SYSTEM_MYTHES)" == "YES" +MYTHESLIB=$(MYTHES_LIBS) +.ELSE +MYTHESLIB=-lmythes-1.2 +.ENDIF PYUNOLIB=-lpyuno LPSOLVELIB=-llpsolve55 SOFFICELIB=-lsofficeapp diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst index 000db8095f5c..a3e85950337c 100644 --- a/splitbuild/extern.lst +++ b/splitbuild/extern.lst @@ -1 +1 @@ -afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib +afms agg apache-commons apple_remote beanshell berkeleydb boost cairo cppunit curl epm expat external graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD more_fonts moz mythes neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib |