diff options
author | Kurt Zenker <kz@openoffice.org> | 2010-07-13 13:58:14 +0200 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2010-07-13 13:58:14 +0200 |
commit | 38521b81c68fc4e9eca535e5a6dfe82435f3fd5e (patch) | |
tree | 81056761cecdaf3b578fa06d34d5c72f96703f08 /set_soenv.in | |
parent | 09834f7dbd7086e6bf1c360c443fe5cf12c55b53 (diff) | |
parent | 414a031eb9de5375ee55eaa204d09a8d5b8bfb5b (diff) |
CWS-TOOLING: integrate CWS configure25_OOO330
Diffstat (limited to 'set_soenv.in')
-rw-r--r-- | set_soenv.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/set_soenv.in b/set_soenv.in index e827c3cb3eef..94fab67f15c9 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1384,7 +1384,7 @@ if ($platform =~ m/linux|freebsd|netbsd/) # This simply adds an include path, so even cases that break the FHS work $SOLARINC .= $STLPORT_inc_stlport; } -if ($platform =~ m/solaris/ && $CC !=~ "gcc") +if ($platform =~ m/solaris/ && ! $CC =~ "gcc") { $SOLARINC .= '/SC5 '; } @@ -1909,6 +1909,7 @@ ToFile( "ENABLE_AGG", "@ENABLE_AGG@", "e" ); ToFile( "SYSTEM_AGG", "@SYSTEM_AGG@", "e" ); ToFile( "AGG_VERSION", "@AGG_VERSION@", "e" ); ToFile( "BUILD_DMAKE", "@BUILD_DMAKE@", "e" ); +ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" ); ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" ); ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" ); ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" ); |