From f64c0196029845934cf0b9e2752ab0d2fddec30d Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 26 Nov 2007 11:47:08 +0000 Subject: [PATCH] INTEGRATION: CWS openssl01 (1.162.6); FILE MERGED 2007/11/22 12:10:53 rt 1.162.6.2: #i83731# Typo corrected: CFLAS - > CFLAGS 2007/11/21 14:38:00 rt 1.162.6.1: #i83731# System openssl. Fix by rene, joined from CWS configure22. --- config_office/set_soenv.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index ec282beeec0e..79f551f83c79 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.162 $ -# Date: $Date: 2007-11-14 16:45:56 $ +# Version: $Revision: 1.163 $ +# Date: $Date: 2007-11-26 12:47:08 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -1894,6 +1894,9 @@ ToFile( "BUILD_EPM", "@BUILD_EPM@", "e" ); ToFile( "PKGFORMAT", "@PKGFORMAT@", "e" ); ToFile( "SYSTEM_STDLIBS", "@SYSTEM_STDLIBS@", "e" ); ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" ); +ToFile( "SYSTEM_OPENSSL", "@SYSTEM_OPENSSL@", "e" ); +ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" ); +ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" ); ToFile( "SYSTEM_PYTHON", "@SYSTEM_PYTHON@", "e" ); ToFile( "PYTHON_CFLAGS", "@PYTHON_CFLAGS@", "e" ); ToFile( "PYTHON_LIBS", "@PYTHON_LIBS@", "e" );