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

cmcfixes77: #i80021# system libtextcat

Browse source
This commit is contained in:
Caolán McNamara 2010-07-16 14:44:32 +01:00
parent 166bd6955a
commit 3e04ba7e48
7 changed files with 49 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
configure vendored
View file

File diff suppressed because one or more lines are too long

27
configure.in
View file

@ -549,8 +549,8 @@ AC_ARG_WITH(system-lpsolve,
AC_ARG_WITH(system-libtextcat,
[ --with-system-libtextcat Use libtextcat already on system
],,)
AC_ARG_WITH(external-libtextcat-dir,
[ --with-external-libtextcat-dir Specify external libtextcat dir
AC_ARG_WITH(external-libtextcat-data,
[ --with-system-libtextcat-data Use libtextcat data already on system
],,)
AC_ARG_WITH(system-cppunit,
[ --with-system-cppunit Use cppunit already on system
@ -5152,27 +5152,34 @@ dnl ===================================================================
dnl Checking for libtextcat
dnl ===================================================================
AC_MSG_CHECKING([which libtextcat to use])
LIBTEXTCAT_SYSTEM_DIR=file:///usr/share/libtextcat
if test -n "$with_system_libtextcat"; then
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)], [])
AC_MSG_CHECKING([for libtextcat data directory])
if test -n "$with_external_libtextcat_dir"; then
LIBTEXTCAT_SYSTEM_DIR=file://$with_external_libtextcat_dir
fi
AC_MSG_RESULT([$LIBTEXTCAT_SYSTEM_DIR])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBTEXTCAT=NO
BUILD_TYPE="$BUILD_TYPE LIBTEXTCAT"
fi
AC_SUBST(LIBTEXTCAT_SYSTEM_DIR)
AC_SUBST(SYSTEM_LIBTEXTCAT)
AC_MSG_CHECKING([which libtextcat data directory to use])
if test -n "$with_system_libtextcat_data" && test "$with_system_libtextcat_data" != "no"; then
if test "$with_system_libtextcat_data" = "yes"; then
SYSTEM_LIBTEXTCAT_DATA=file:///usr/share/libtextcat
else
SYSTEM_LIBTEXTCAT_DATA=file://$with_system_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 ***************************************

2
scp2/source/ooo/file_ooo.scp
View file

@ -523,7 +523,7 @@ STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
#endif
#endif
#ifndef SYSTEM_LIBTEXTCAT
#ifndef SYSTEM_LIBTEXTCAT_DATA
// fingerprint files (lm)
File gid_File_Conf_Fpdb

4
scp2/source/ooo/makefile.mk
View file

@ -237,6 +237,10 @@ SCPDEFS+=-DSYSTEM_PYTHON
SCPDEFS+=-DSYSTEM_LIBTEXTCAT
.ENDIF
.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
SCPDEFS+=-DSYSTEM_LIBTEXTCAT_DATA
.ENDIF
.IF "$(ENABLE_SVCTAGS)" == "YES"
SCPDEFS+=-DENABLE_SVCTAGS
.ENDIF

2
set_soenv.in
View file

@ -1927,7 +1927,7 @@ 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( "LIBTEXTCAT_SYSTEM_DIR","@LIBTEXTCAT_SYSTEM_DIR@","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" );

2
solenv/bin/modules/installer/ziplist.pm
View file

@ -806,7 +806,7 @@ sub add_variables_to_allvariableshashref
$variableshashref->{'PRODUCTMINOR'} = $localminor;
$variableshashref->{'PRODUCTBUILDID'} = $installer::globals::buildid;
$variableshashref->{'LIBTEXTCAT_SYSTEM_DIR'} = $ENV{'LIBTEXTCAT_SYSTEM_DIR'} , if( defined $ENV{'LIBTEXTCAT_SYSTEM_DIR'} && $ENV{'LIBTEXTCAT_SYSTEM_DIR'} ne "" );
$variableshashref->{'SYSTEM_LIBTEXTCAT_DATA'} = $ENV{'SYSTEM_LIBTEXTCAT_DATA'} , if( defined $ENV{'SYSTEM_LIBTEXTCAT_DATA'} && $ENV{'SYSTEM_LIBTEXTCAT_DATA'} ne "" );
}
1;

2
solenv/config/sdev300.ini
View file

@ -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 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 AFMS
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