diff options
author | Rene Engelhard <rene@openoffice.org> | 2010-04-27 17:21:14 +0200 |
---|---|---|
committer | Rene Engelhard <rene@openoffice.org> | 2010-04-27 17:21:14 +0200 |
commit | 8a4cb9e710988a56b109672cde3dea0124c9d487 (patch) | |
tree | f5db5b9e7c07523aa4bb81d7365d832574e0b1e7 | |
parent | mythes12: update system-mythes check for 1.2.0; add missing AC_LANG_PUSH/POP (diff) | |
download | core-8a4cb9e710988a56b109672cde3dea0124c9d487.tar.gz core-8a4cb9e710988a56b109672cde3dea0124c9d487.zip |
mythes12: move to proper external mythes module
-rw-r--r-- | configure.in | 1 | ||||
-rw-r--r-- | ooo.lst | 1 | ||||
-rw-r--r-- | solenv/inc/libs.mk | 2 | ||||
-rw-r--r-- | splitbuild/extern.lst | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 756ddb2a78fe..8ee4736996be 100644 --- a/configure.in +++ b/configure.in @@ -5109,6 +5109,7 @@ if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then else AC_MSG_RESULT([internal]) SYSTEM_MYTHES=NO + BUILD_TYPE="$BUILD_TYPE MYTHES" fi AC_SUBST(SYSTEM_MYTHES) AC_SUBST(MYTHES_CFLAGS) @@ -72,3 +72,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/solenv/inc/libs.mk b/solenv/inc/libs.mk index 3c014a8256bd..5910c43e1175 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -345,7 +345,7 @@ HUNSPELLLIB=-lhunspell-1.2 .IF "$(SYSTEM_MYTHES)" == "YES" MYTHESLIB=$(MYTHES_LIBS) .ELSE -MYTHESLIB=-lmythes +MYTHESLIB=-lmythes-1.2 .ENDIF PYUNOLIB=-lpyuno LPSOLVELIB=-llpsolve55 diff --git a/splitbuild/extern.lst b/splitbuild/extern.lst index 334ad19a5b10..f3d2e3291ca2 100644 --- a/splitbuild/extern.lst +++ b/splitbuild/extern.lst @@ -1 +1 @@ -afms agg apache-commons apple_remote beanshell berkeleydb bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD 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 bitstream_vera_fonts boost cairo cppunit curl epm expat external fondu graphite hsqldb hunspell hyphen mythes icc icu jfreereport jpeg libegg libtextcat libwpd libxml2 libxmlsec libxslt lpsolve lucene MathMLDTD moz neon np_sdk nss openssl python redland rhino sane saxon stax stlport tomcat twain unixODBC vigra x11_extensions xpdf xsltml zlib |