diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:25:13 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-12-12 12:25:13 +0000 |
| commit | ad45ea460801cb3a343d7151accc255954150992 (patch) | |
| tree | 773c7e0602a7007b14679ea0b16d4d0802997760 /config_office | |
| parent | 7eb6720735077a9065f7f3ee6689623759f5a45a (diff) | |
INTEGRATION: CWS configure22 (1.157.6); FILE MERGED
2007/12/02 12:34:14 rene 1.157.6.8: #i84165# --enable-sdext, --disable-reportdesign and --with-system-jfreereport
2007/12/02 12:14:19 rene 1.157.6.7: #i84165# support hyphen
2007/12/01 19:13:28 rene 1.157.6.6: RESYNC: (1.162-1.164); FILE MERGED
2007/11/22 14:24:53 rene 1.157.6.5: #i83872# configure flag for OGLTrans
2007/11/22 12:17:30 rene 1.157.6.4: typo
2007/11/18 18:05:00 rene 1.157.6.3: #i83731# system openssl
2007/11/14 21:11:18 rene 1.157.6.2: RESYNC: (1.157-1.162); FILE MERGED
2007/10/15 22:46:21 rene 1.157.6.1: #i79874# STLport5 support for configure
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/set_soenv.in | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index 34aaa665bcce..6db161529ebb 100644 --- a/config_office/set_soenv.in +++ b/config_office/set_soenv.in @@ -1,8 +1,8 @@ #!@PERL@ -w # # Program: set_soenv.in -# Version: $Revision: 1.165 $ -# Date: $Date: 2007-12-06 17:43:37 $ +# Version: $Revision: 1.166 $ +# Date: $Date: 2007-12-12 13:25:12 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -1563,6 +1563,7 @@ ToFile( "ANT_LIB", "@ANT_LIB@", "e" ); ToFile( "ANT", "@ANT@", "e" ); ToFile( "JDKLIB", $JAVA_LIB, "e" ); ToFile( "STLPORT4", $STLPORT4, "e" ); +ToFile( "STLPORT_VER", "@STLPORT_VER@", "e" ); ToFile( "ASM_PATH", $ASM_PATH, "e" ); ToFile( "BUILD_SOSL", $BUILD_SOSL, "e" ); ToFile( "FRAMEWORKSHOME", $FRAMEWORKSHOME, "e" ); @@ -1651,6 +1652,20 @@ ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" ); ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" ); ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" ); ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" ); +ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" ); +ToFile( "ENABLE_REPORTDESIGN","@ENABLE_REPORTDESIGN@","e" ); +ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" ); +ToFile( "JCOMMON_JAR", "@JCOMMON_JAR@", "e" ); +ToFile( "SAC_JAR", "@SAC_JAR@", "e" ); +ToFile( "LIBXML_JAR", "@LIBXML_JAR@", "e" ); +ToFile( "FLUTE_JAR", "@FLUTE_JAR@", "e" ); +ToFile( "JFREEREPORT_JAR", "@JFREEREPORT_JAR@", "e" ); +ToFile( "LIBLAYOUT_JAR", "@LIBLAYOUT_JAR@", "e" ); +ToFile( "LIBLOADER_JAR", "@LIBLOADER_JAR@", "e" ); +ToFile( "LIBFORMULA_JAR", "@LIBFORMULA_JAR@", "e" ); +ToFile( "LIBREPOSITORY_JAR", "@LIBREPOSITORY_JAR@","e" ); +ToFile( "LIBFONTS_JAR", "@LIBFONTS_JAR@", "e" ); +ToFile( "JCOMMON_SERIALIZER_JAR","@JCOMMON_SERIALIZER_JAR@","e" ); ToFile( "ENABLE_DBUS", "@ENABLE_DBUS@", "e" ); ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" ); ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" ); @@ -1974,6 +1989,7 @@ ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" ); ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" ); ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" ); ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" ); +ToFile( "HYPHEN_LIB", "@HYPHEN_LIB@", "e" ); ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" ); ToFile( "PAM", "@PAM@", "e" ); ToFile( "NEW_SHADOW_API", "@NEW_SHADOW_API@", "e" ); |