diff options
author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:05:54 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 15:05:54 +0000 |
commit | 2acec6957c1179c801662daf2d16f2c36d84dcbe (patch) | |
tree | b1d58ccd1643d653c44c78f17a27ac66ae7028f9 /config_office | |
parent | f1685beb7a91143de719add5361a5b693e3ed768 (diff) |
INTEGRATION: CWS icuupgrade (1.118.12); FILE MERGED
2006/11/14 20:19:07 khong 1.118.12.2: RESYNC: (1.118-1.124); FILE MERGED
2006/11/14 01:01:08 khong 1.118.12.1: #i54479# add patch to support using system ICU
Diffstat (limited to 'config_office')
-rw-r--r-- | config_office/set_soenv.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index 8dde13dfa3dc..b0a7c5d4b0ca 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.127 $ -# Date: $Date: 2006-12-01 14:53:16 $ +# Version: $Revision: 1.128 $ +# Date: $Date: 2006-12-12 16:05:54 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -1788,9 +1788,9 @@ ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" ); ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" ); ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" ); ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" ); -#ToFile( "SYSTEM_ICU", "@SYSTEM_ICU@", "e" ); -#ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" ); -#ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" ); +ToFile( "SYSTEM_ICU", "@SYSTEM_ICU@", "e" ); +ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" ); +ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" ); ToFile( "SYSTEM_JPEG", "@SYSTEM_JPEG@", "e" ); ToFile( "SYSTEM_FREETYPE", "@SYSTEM_FREETYPE@", "e" ); ToFile( "FREETYPE_CFLAGS", "@FREETYPE_CFLAGS@", "e" ); |