summaryrefslogtreecommitdiff
path: root/config_office
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-07-31 12:09:45 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-07-31 12:09:45 +0000
commit245c67634d1471bfc31dd5a9534a774e3fdf34eb (patch)
tree60232a8400f7731a06457a10487e0bcf13102870 /config_office
parentcaa3e0ac0104a370629fc360d47862bd9132827b (diff)
INTEGRATION: CWS configure21 (1.140.2); FILE MERGED
2007/07/05 19:37:53 rene 1.140.2.7: RESYNC: (1.149-1.152); FILE MERGED 2007/06/27 15:11:34 rene 1.140.2.6: RESYNC: (1.144-1.149); FILE MERGED 2007/06/05 12:53:07 rene 1.140.2.5: RESYNC: (1.140-1.144); FILE MERGED 2007/05/06 16:08:51 rene 1.140.2.4: support --hash-style= from binutils 2007/04/23 21:34:23 rene 1.140.2.3: #i76354# support portaudio v19 2007/04/23 21:10:17 rene 1.140.2.2: support pkg-config for system-hunspell 2007/04/23 21:03:13 rene 1.140.2.1: #i73936# use pkg-config for sndfile detection
Diffstat (limited to 'config_office')
-rw-r--r--config_office/set_soenv.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in
index 3e3528886a6e..79fffd690047 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.152 $
-# Date: $Date: 2007-06-27 17:52:06 $
+# Version: $Revision: 1.153 $
+# Date: $Date: 2007-07-31 13:09:45 $
# Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
#
#---------------------------------------------------------------------------
@@ -1733,6 +1733,7 @@ ToFile( "JAVAHOME", $JAVAHOME, "e" );
ToFile( "CC", $CC, "e" );
ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
+ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
ToFile( "CXX", $CXX, "e" );
ToFile( "MINGWCXX", "@MINGWCXX@", "e" );
ToFile( "MINGWSTRIP", "@MINGWSTRIP@", "e" );
@@ -1839,7 +1840,10 @@ ToFile( "NAS_INCLUDES", "@NAS_INCLUDES@", "e" );
ToFile( "ENABLE_NAS", "@ENABLE_NAS@", "e" );
ToFile( "ENABLE_PASF", "@ENABLE_PASF@", "e" );
ToFile( "SYSTEM_SNDFILE", "@SYSTEM_SNDFILE@", "e" );
+ToFile( "SNDFILE_CFLAGS", "@SNDFILE_CFLAGS@", "e" );
+ToFile( "SNDFILE_LIBS", "@SNDFILE_LIBS@", "e" );
ToFile( "SYSTEM_PORTAUDIO", "@SYSTEM_PORTAUDIO@", "e" );
+ToFile( "PA_VER", "@PA_VER@", "e" );
ToFile( "SYSTEM_NEON", "@SYSTEM_NEON@", "e" );
ToFile( "NEON_VERSION", "@NEON_VERSION@", "e" );
ToFile( "NEON_LIBS", "@NEON_LIBS@", "e" );
@@ -1855,6 +1859,7 @@ ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );
ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );
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( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );
ToFile( "PAM", "@PAM@", "e" );