[ooo-build-commit] .: configure.in scp2/source set_soenv.in solenv/bin solenv/config
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Oct 5 03:52:17 PDT 2010
configure.in | 45 +++++++++++++++++++++++++++++++-
scp2/source/ooo/file_library_ooo.scp | 2 +
scp2/source/ooo/file_ooo.scp | 4 +-
scp2/source/ooo/makefile.mk | 8 +++++
set_soenv.in | 2 +
solenv/bin/modules/installer/ziplist.pm | 1
solenv/config/sooo330.ini | 2 -
7 files changed, 60 insertions(+), 4 deletions(-)
New commits:
commit 408884b3025f697598f5b39b806e9631961f910b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Oct 5 11:05:39 2010 +0100
add some configure options to control external libtextcat and libtextcat data
diff --git a/configure.in b/configure.in
index 92d59b1..4d27ac0 100644
--- a/configure.in
+++ b/configure.in
@@ -568,6 +568,12 @@ AC_ARG_WITH(system-altlinuxhyph,
AC_ARG_WITH(system-lpsolve,
[ --with-system-lpsolve Use lpsolve already on system
],,)
+AC_ARG_WITH(system-libtextcat,
+[ --with-system-libtextcat Use libtextcat already on system
+],,)
+AC_ARG_WITH(external-libtextcat-data,
+[ --with-external-libtextcat-data Use libtextcat data already on system
+],,)
AC_ARG_WITH(system-cppunit,
[ --with-system-cppunit Use cppunit already on system
],,)
@@ -4056,7 +4062,11 @@ if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
[
AC_CHECK_FILE(/usr/share/java/lucene-core.jar,
[ LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar ],
- [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
+ [ AC_CHECK_FILE(/usr/share/java/lucene.jar,
+ [ LUCENE_CORE_JAR=/usr/share/java/lucene.jar ],
+ [ AC_MSG_ERROR(lucene-core.jar replacement not found)]
+ )
+ ]
)
]
)
@@ -5415,6 +5425,38 @@ else
fi
AC_SUBST(SYSTEM_LPSOLVE)
+dnl ===================================================================
+dnl Checking for libtextcat
+dnl ===================================================================
+AC_MSG_CHECKING([which libtextcat to use])
+if test -n "$with_system_libtextcat" && test "$with_system_libtextcat" != "no"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_LIBTEXTCAT=YES
+ AC_CHECK_HEADER(libtextcat/textcat.h, [],
+ [ AC_MSG_ERROR(libtextcat headers not found.)], [])
+ AC_CHECK_LIB(textcat, special_textcat_Init, ,
+ [ AC_MSG_ERROR(libtextcat library not found or not suitable. libtextcat typically needs to be patched)], [])
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_LIBTEXTCAT=NO
+ BUILD_TYPE="$BUILD_TYPE LIBTEXTCAT"
+fi
+AC_SUBST(SYSTEM_LIBTEXTCAT)
+
+AC_MSG_CHECKING([which libtextcat data directory to use])
+if test -n "$with_external_libtextcat_data" && test "$with_external_libtextcat_data" != "no"; then
+ if test "$with_external_libtextcat_data" = "yes"; then
+ SYSTEM_LIBTEXTCAT_DATA=file:///usr/share/libtextcat
+ else
+ SYSTEM_LIBTEXTCAT_DATA=file://$with_external_libtextcat_data
+ fi
+ AC_MSG_RESULT([$SYSTEM_LIBTEXTCAT_DATA])
+else
+ AC_MSG_RESULT([internal])
+ BUILD_TYPE="$BUILD_TYPE LIBTEXTCATDATA"
+fi
+AC_SUBST(SYSTEM_LIBTEXTCAT_DATA)
+
dnl ***************************************
dnl testing libc version for Linux...
dnl ***************************************
@@ -7015,6 +7057,7 @@ dnl ===================================================================
AC_MSG_CHECKING([whether to include AFMs])
if test "$with_afms" != "no"; then
AC_MSG_RESULT([yes])
+ BUILD_TYPE="$BUILD_TYPE AFMS"
else
AC_MSG_RESULT([no])
WITHOUT_AFMS=YES
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 08c2756..b653791 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1716,6 +1716,7 @@ File gid_File_Lib_Migrationoo2
#endif
End
+#ifndef SYSTEM_LIBTEXTCAT
File gid_File_Lib_Libtextcat
TXT_FILE_BODY;
Styles = (PACKED);
@@ -1726,6 +1727,7 @@ File gid_File_Lib_Libtextcat
Name = "libtextcat.dll";
#endif
End
+#endif
STD_UNO_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ceeeeed..fd64c88 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -523,6 +523,7 @@ STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
#endif
#endif
+#ifndef SYSTEM_LIBTEXTCAT_DATA
// fingerprint files (lm)
File gid_File_Conf_Fpdb
@@ -1036,8 +1037,7 @@ File gid_File_Lm_Zulu
Dir = gid_Dir_Share_Fingerprint;
Styles = (PACKED);
End
-
-
+#endif
// mod files
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 0777feb..cb14363 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -233,6 +233,14 @@ SCPDEFS+=-DDISABLE_ATL
SCPDEFS+=-DSYSTEM_PYTHON
.ENDIF
+.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
+SCPDEFS+=-DSYSTEM_LIBTEXTCAT
+.ENDIF
+
+.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
+SCPDEFS+=-DSYSTEM_LIBTEXTCAT_DATA
+.ENDIF
+
.IF "$(ENABLE_SVCTAGS)" == "YES"
SCPDEFS+=-DENABLE_SVCTAGS
.ENDIF
diff --git a/set_soenv.in b/set_soenv.in
index 84b337e..65338a0 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1946,6 +1946,8 @@ 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( "SYSTEM_LIBTEXTCAT", "@SYSTEM_LIBTEXTCAT@","e" );
+ToFile( "SYSTEM_LIBTEXTCAT_DATA","@SYSTEM_LIBTEXTCAT_DATA@","e" );
ToFile( "PAM", "@PAM@", "e" );
ToFile( "NEW_SHADOW_API", "@NEW_SHADOW_API@", "e" );
ToFile( "PAM_LINK", "@PAM_LINK@", "e" );
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index e387d84..fdbb3a9 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -806,6 +806,7 @@ sub add_variables_to_allvariableshashref
$variableshashref->{'PRODUCTMINOR'} = $localminor;
$variableshashref->{'PRODUCTBUILDID'} = $installer::globals::buildid;
+ $variableshashref->{'SYSTEM_LIBTEXTCAT_DATA'} = $ENV{'SYSTEM_LIBTEXTCAT_DATA'} , if( defined $ENV{'SYSTEM_LIBTEXTCAT_DATA'} && $ENV{'SYSTEM_LIBTEXTCAT_DATA'} ne "" );
}
1;
diff --git a/solenv/config/sooo330.ini b/solenv/config/sooo330.ini
index ab42c23..9ca5489 100644
--- a/solenv/config/sooo330.ini
+++ b/solenv/config/sooo330.ini
@@ -9,7 +9,7 @@ common
BMP_WRITES_FLAG TRUE
BUILD_SPECIAL TRUE
BUILD_STAX YES
- 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 MDDS 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 MDDS 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 LIBTEXTCAT LIBTEXTCATDATA AFMS
common_build TRUE
COMMON_OUTDIR common
CONFIG_PROJECT config_office
More information about the ooo-build-commit
mailing list