[Libreoffice-commits] .: config_host.mk.in set_soenv.in
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Tue Dec 27 02:04:30 PST 2011
config_host.mk.in | 44 ++++++++++++++++++++++++++++++++++++++++++++
set_soenv.in | 43 -------------------------------------------
2 files changed, 44 insertions(+), 43 deletions(-)
New commits:
commit 52ec70499e337aac43d9ddfd564c1bfc6fe98301
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Dec 27 04:04:06 2011 -0600
move ENABLE_* variables from set_soenv.in to config_host.mk
diff --git a/config_host.mk.in b/config_host.mk.in
index 4a5b7ac..383118a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -3,6 +3,50 @@
# or to be sourced in a shell session
#
export SRC_ROOT="@SRC_ROOT@"
+
+export ENABLE_CAIRO_CANVAS="@ENABLE_CAIRO_CANVAS@"
+export ENABLE_CRASHDUMP="@ENABLE_CRASHDUMP@"
+export ENABLE_DBUS="@ENABLE_DBUS@"
+export ENABLE_DIRECTX="@ENABLE_DIRECTX@"
+export ENABLE_EVOAB2="@ENABLE_EVOAB2@"
+export ENABLE_GCONF="@ENABLE_GCONF@"
+export ENABLE_GIO="@ENABLE_GIO@"
+export ENABLE_GNOMEVFS="@ENABLE_GNOMEVFS@"
+export ENABLE_GRAPHITE="@ENABLE_GRAPHITE@"
+export ENABLE_GSTREAMER="@ENABLE_GSTREAMER@"
+export ENABLE_GTK3="@ENABLE_GTK3@"
+export ENABLE_GTK="@ENABLE_GTK@"
+export ENABLE_GTK_PRINT="@ENABLE_GTK_PRINT@"
+export ENABLE_KAB="@ENABLE_KAB@"
+export ENABLE_KDE4="@ENABLE_KDE4@"
+export ENABLE_KDE="@ENABLE_KDE@"
+export ENABLE_LIBRSVG="@ENABLE_LIBRSVG@"
+export ENABLE_LOCKDOWN="@ENABLE_LOCKDOWN@"
+export ENABLE_LOMENUBAR="@ENABLE_LOMENUBAR@"
+export ENABLE_LTO="@ENABLE_LTO@"
+export ENABLE_MEDIAWIKI="@ENABLE_MEDIAWIKI@"
+export ENABLE_MINIMIZER="@ENABLE_MINIMIZER@@"
+export ENABLE_MYSQLC="@ENABLE_MYSQLC@"
+export ENABLE_NSPLUGIN="@ENABLE_NSPLUGIN@@"
+export ENABLE_ONLINE_UPDATE="@ENABLE_ONLINE_UPDATE@"
+export ENABLE_OPENGL="@ENABLE_OPENGL@@"
+export ENABLE_OXYGENOFFICE="@ENABLE_OXYGENOFFICE@"
+export ENABLE_PDFIMPORT="@ENABLE_PDFIMPORT@"
+export ENABLE_PRESENTER_SCREEN="@ENABLE_PRESENTER_SCREEN@"
+export ENABLE_QUICKSTART_LIBPNG="@ENABLE_QUICKSTART_LIBPNG@"
+export ENABLE_RANDR="@ENABLE_RANDR@"
+export ENABLE_RELEASE_BUILD="@ENABLE_RELEASE_BUILD@"
+export ENABLE_REPORTBUILDER="@ENABLE_REPORTBUILDER@"
+export ENABLE_SCRIPTING_BEANSHELL="@ENABLE_SCRIPTING_BEANSHELL@"
+export ENABLE_SCRIPTING_JAVASCRIPT="@ENABLE_SCRIPTING_JAVASCRIPT@"
+export ENABLE_SCRIPTING_PYTHON="@ENABLE_SCRIPTING_PYTHON@"
+export ENABLE_SILENT_MSI="@ENABLE_SILENT_MSI@"
+export ENABLE_SYMBOLS="@ENABLE_SYMBOLS@"
+export ENABLE_SYSTRAY_GTK="@ENABLE_SYSTRAY_GTK@"
+export ENABLE_UGLY="@ENABLE_UGLY@"
+export ENABLE_XMLSEC="@ENABLE_XMLSEC@"
+export ENABLE_ZENITY="@ENABLE_ZENITY@"
+export SAL_ENABLE_FILE_LOCKING="1"
export SYSTEM_APACHE_COMMONS="@SYSTEM_APACHE_COMMONS@"
export SYSTEM_BOOST="@SYSTEM_BOOST@"
export SYSTEM_BSH="@SYSTEM_BSH@"
diff --git a/set_soenv.in b/set_soenv.in
index ab1cdae..9dd385b 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1404,28 +1404,14 @@ if ($platform =~ m/linux/ && $platform =~ m/powerpc/) {
ToFile( "JITC_PROCESSOR_TYPE","6", "e" );
}
ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING", "yes", "e" );
-ToFile( "ENABLE_GTK", "@ENABLE_GTK@", "e" );
ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" );
ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" );
-ToFile( "ENABLE_GTK3", "@ENABLE_GTK3@", "e" );
ToFile( "GTK3_CFLAGS", "@GTK3_CFLAGS@", "e" );
ToFile( "GTK3_LIBS", "@GTK3_LIBS@", "e" );
ToFile( "GTHREAD_CFLAGS", "@GTHREAD_CFLAGS@", "e" );
ToFile( "GTHREAD_LIBS", "@GTHREAD_LIBS@", "e" );
-ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" );
ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
-ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@", "e" );
-ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" );
-ToFile( "ENABLE_NSPLUGIN", "@ENABLE_NSPLUGIN@", "e" );
-ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
-ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
-ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
-ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
-ToFile( "ENABLE_SCRIPTING_BEANSHELL","@ENABLE_SCRIPTING_BEANSHELL@","e" );
-ToFile( "ENABLE_SCRIPTING_JAVASCRIPT","@ENABLE_SCRIPTING_JAVASCRIPT@","e" );
-ToFile( "ENABLE_SCRIPTING_PYTHON","@ENABLE_SCRIPTING_PYTHON@","e" );
-ToFile( "ENABLE_QUICKSTART_LIBPNG", "@ENABLE_QUICKSTART_LIBPNG@", "e" );
ToFile( "WITH_THEMES", "@WITH_THEMES@", "e");
ToFile( "WITH_HELPPACK_INTEGRATION", "@WITH_HELPPACK_INTEGRATION@", "e");
ToFile( "WITH_EXTENSION_INTEGRATION", "@WITH_EXTENSION_INTEGRATION@", "e");
@@ -1441,7 +1427,6 @@ ToFile( "LIBREPOSITORY_JAR", "@LIBREPOSITORY_JAR@","e" );
ToFile( "LIBBASE_JAR", "@LIBBASE_JAR@", "e" );
ToFile( "LIBFONTS_JAR", "@LIBFONTS_JAR@", "e" );
ToFile( "LIBSERIALIZER_JAR", "@LIBSERIALIZER_JAR@","e" );
-ToFile( "ENABLE_MEDIAWIKI", "@ENABLE_MEDIAWIKI@", "e" );
ToFile( "COMMONS_CODEC_JAR", "@COMMONS_CODEC_JAR@","e" );
ToFile( "COMMONS_LANG_JAR", "@COMMONS_LANG_JAR@", "e" );
ToFile( "COMMONS_HTTPCLIENT_JAR","@COMMONS_HTTPCLIENT_JAR@","e" );
@@ -1449,28 +1434,19 @@ ToFile( "COMMONS_LOGGING_JAR","@COMMONS_LOGGING_JAR@","e" );
ToFile( "SAMPLEICC_CFLAGS", "@SAMPLEICC_CFLAGS@", "e" );
ToFile( "SAMPLEICC_LIBS", "@SAMPLEICC_LIBS@", "e" );
ToFile( "SERVLETAPI_JAR", "@SERVLETAPI_JAR@", "e" );
-ToFile( "ENABLE_DBUS", "@ENABLE_DBUS@", "e" );
ToFile( "DBUS_CFLAGS", "@DBUS_CFLAGS@", "e" );
ToFile( "DBUS_LIBS", "@DBUS_LIBS@", "e" );
-ToFile( "ENABLE_GTK_PRINT", "@ENABLE_GTK_PRINT@", "e" );
ToFile( "GTK_PRINT_CFLAGS", "@GTK_PRINT_CFLAGS@", "e" );
ToFile( "GTK_PRINT_LIBS", "@GTK_PRINT_LIBS@", "e" );
-ToFile( "ENABLE_GCONF", "@ENABLE_GCONF@", "e" );
-ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" );
-ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" );
-ToFile( "ENABLE_GIO", "@ENABLE_GIO@", "e" );
-ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" );
ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" );
ToFile( "KDE_LIBS", "@KDE_LIBS@", "e" );
ToFile( "MOC", "@MOC@", "e" );
-ToFile( "ENABLE_KDE4", "@ENABLE_KDE4@", "e" );
ToFile( "KDE4_CFLAGS", "@KDE4_CFLAGS@", "e" );
ToFile( "KDE4_LIBS", "@KDE4_LIBS@", "e" );
ToFile( "MOC4", "@MOC4@", "e" );
ToFile( "KDE_GLIB_CFLAGS", "@KDE_GLIB_CFLAGS@", "e" );
ToFile( "KDE_GLIB_LIBS", "@KDE_GLIB_LIBS@", "e" );
ToFile( "KDE_HAVE_GLIB", "@KDE_HAVE_GLIB@", "e" );
-ToFile( "ENABLE_KAB", "@ENABLE_KAB@", "e" );
ToFile( "PSPRINT", "TRUE", "e" );
ToFile( "MKDEPENDSOLVER", "TRUE", "e" );
ToFile( "nodep", "@nodep@", "e" );
@@ -1711,17 +1687,11 @@ ToFile( "MINGWCXX", "@MINGWCXX@", "e" );
ToFile( "MINGWSTRIP", "@MINGWSTRIP@", "e" );
ToFile( "WITH_STLPORT", "@WITH_STLPORT@", "e" );
ToFile( "ALLOC", "@ALLOC@", "e" );
-ToFile( "ENABLE_LTO", "@ENABLE_LTO@", "e" );
-ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
ToFile( "DISABLE_LINKOO", "@DISABLE_LINKOO@", "e" );
ToFile( "DISABLE_STRIP", "@DISABLE_STRIP@", "e" );
ToFile( "LFS_CFLAGS", "@LFS_CFLAGS@", "e" );
-ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
-ToFile( "ENABLE_RANDR", "@ENABLE_RANDR@", "e" );
ToFile( "FONTCONFIG_LIBS", "@FONTCONFIG_LIBS@", "e");
ToFile( "FONTCONFIG_CFLAGS", "@FONTCONFIG_CFLAGS@", "e");
-ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" );
-ToFile( "ENABLE_GRAPHITE", "@ENABLE_GRAPHITE@", "e");
ToFile( "GRAPHITE_LIBS", "@GRAPHITE_LIBS@", "e");
ToFile( "GRAPHITE_CFLAGS", "@GRAPHITE_CFLAGS@", "e");
ToFile( "CL_X64", "@CL_X64@", "e");
@@ -1729,8 +1699,6 @@ ToFile( "WITH_MYSPELL_DICTS","@WITH_MYSPELL_DICTS@","e");
ToFile( "DICT_SYSTEM_DIR", "@DICT_SYSTEM_DIR@", "e");
ToFile( "HYPH_SYSTEM_DIR", "@HYPH_SYSTEM_DIR@", "e");
ToFile( "THES_SYSTEM_DIR", "@THES_SYSTEM_DIR@", "e");
-ToFile( "ENABLE_LOCKDOWN", "@ENABLE_LOCKDOWN@", "e" );
-ToFile( "ENABLE_XMLSEC", "@ENABLE_XMLSEC@", "e" );
ToFile( "WITH_LDAP", "@WITH_LDAP@", "e" );
ToFile( "WITH_OPENLDAP", "@WITH_OPENLDAP@", "e" );
ToFile( "WITH_MOZILLA", "@WITH_MOZILLA@", "e" );
@@ -1770,11 +1738,6 @@ ToFile( "WITH_BINFILTER", "@WITH_BINFILTER@", "e" );
ToFile( "BUILD_TYPE", "$BUILD_TYPE", "e" );
ToFile( "MINGW_EXTERNAL_DLLS","@MINGW_EXTERNAL_DLLS@","e");
ToFile( "VERBOSE", "@VERBOSE@", "e" );
-ToFile( "ENABLE_ZENITY", "@ENABLE_ZENITY@", "e" );
-ToFile( "ENABLE_EVOAB2", "@ENABLE_EVOAB2@", "e" );
-ToFile( "ENABLE_UGLY", "@ENABLE_UGLY@", "e" );
-ToFile( "ENABLE_SILENT_MSI", "@ENABLE_SILENT_MSI@", "e" );
-ToFile( "ENABLE_RELEASE_BUILD", "@ENABLE_RELEASE_BUILD@", "e" );
ToFile( "GOBJECT_CFLAGS", "@GOBJECT_CFLAGS@", "e" );
ToFile( "GOBJECT_LIBS", "@GOBJECT_LIBS@", "e" );
if ( '@ENABLE_RPATH@' eq "no" ) {
@@ -1830,15 +1793,11 @@ ToFile( "WITH_EXTRA_GALLERY","@WITH_EXTRA_GALLERY@", "e" );
ToFile( "WITH_EXTRA_TEMPLATE","@WITH_EXTRA_TEMPLATE@", "e" );
ToFile( "WITH_EXTRA_SAMPLE", "@WITH_EXTRA_SAMPLE@", "e" );
ToFile( "WITH_EXTRA_FONT", "@WITH_EXTRA_FONT@", "e" );
-ToFile( "ENABLE_OXYGENOFFICE","@ENABLE_OXYGENOFFICE@","e" );
ToFile( "OXYGENOFFICE_PACK","@OXYGENOFFICE_PACK@","e" );
ToFile( "DB_LIB", "@DB_LIB@", "e" );
ToFile( "DB_CPPLIB", "@DB_CPPLIB@", "e" );
-ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" );
-ToFile( "ENABLE_LOMENUBAR", "@ENABLE_LOMENUBAR@", "e" );
ToFile( "DBUSMENUGTK_CFLAGS", "@DBUSMENUGTK_CFLAGS@", "e" );
ToFile( "DBUSMENUGTK_LIBS", "@DBUSMENUGTK_LIBS@", "e" );
-ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" );
ToFile( "MYSQL_INC", "@MYSQL_INC@", "e" );
ToFile( "MYSQL_LIB", "@MYSQL_LIB@", "e" );
ToFile( "MYSQL_DEFINES", "@MYSQL_DEFINES@", "e" );
@@ -1855,7 +1814,6 @@ ToFile( "XSLTPROC", "@XSLTPROC@", "e" );
ToFile( "CURL_CFLAGS", "@CURL_CFLAGS@", "e" );
ToFile( "CURL_LIBS", "@CURL_LIBS@", "e" );
ToFile( "MDDS_CPPFLAGS", "@MDDS_CPPFLAGS@", "e" );
-ToFile( "ENABLE_LIBRSVG", "@ENABLE_LIBRSVG@", "e" );
ToFile( "NEON_VERSION", "@NEON_VERSION@", "e" );
ToFile( "NEON_LIBS", "@NEON_LIBS@", "e" );
ToFile( "NEON_CFLAGS", "@NEON_CFLAGS@", "e" );
@@ -1926,7 +1884,6 @@ if ($platform =~ m/solaris|darwin|freebsd/)
ToFile( "GNUPATCH", "@GNUPATCH@", "e");
}
ToFile( "GNUCOPY", "@GNUCP@", "e");
-ToFile( "SAL_ENABLE_FILE_LOCKING", "1", "e");
ToFile( "ENV_SCRIPT", "$outfile", "e" );
#
More information about the Libreoffice-commits
mailing list