strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS mozooo (1.10.6.2.10); FILE MERGED

Browse source 
2005/01/27 19:45:00 rene 1.10.6.2.10.14: RESYNC: (1.33-1.39); FILE MERGED
2005/01/20 06:47:35 windly 1.10.6.2.10.13: RESYNC: (1.31-1.33); FILE MERGED
2005/01/08 17:19:46 vq 1.10.6.2.10.12: RESYNC: (1.29-1.31); FILE MERGED
2004/12/31 18:09:26 vq 1.10.6.2.10.11: #i11424# Fix inconsistency between $ENABLE_BUILD_MOZAB and $BUILD_MOZAB and
regenerate configure.
2004/12/24 23:45:32 vq 1.10.6.2.10.10: RESYNC: (1.26-1.29); FILE MERGED
2004/11/30 07:50:40 windly 1.10.6.2.10.9: #i11424# choose mozilla version and default toolkit at configure time
2004/11/30 04:34:20 vq 1.10.6.2.10.8: RESYNC: (1.25-1.26); FILE MERGED
2004/11/27 00:24:40 vq 1.10.6.2.10.7: RESYNC: (1.23-1.25); FILE MERGED
2004/10/29 09:26:18 fs 1.10.6.2.10.6: RESYNC: (1.18-1.23); FILE MERGED
2004/07/07 10:14:14 fs 1.10.6.2.10.5: RESYNC: (1.17-1.18); FILE MERGED
2004/03/29 07:46:24 fs 1.10.6.2.10.4: #100000# syntax
2004/03/15 14:53:24 fs 1.10.6.2.10.3: RESYNC: (1.10.6.4-1.17); FILE MERGED
2004/01/30 09:03:06 fs 1.10.6.2.10.2: RESYNC: (1.10.6.2-1.10.6.4); FILE MERGED
2004/01/07 09:02:47 fs 1.10.6.2.10.1: #i11424# allow for building Mozilla tarballs (needed for Mozilla Address Book integration)
during an OOo build
thanks to Wind Li (yl146652@openoffice.org)
This commit is contained in:
Kurt Zenker 2005-03-01 16:17:28 +00:00
parent 47c0363048
commit a4032a42f3
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
config_office/set_soenv.in
View file

@ -1,8 +1,8 @@
#!@PERL@ -w
#
# Program: set_soenv.in
# Version: $Revision: 1.49 $
# Date: $Date: 2005-03-01 16:58:10 $
# Version: $Revision: 1.50 $
# Date: $Date: 2005-03-01 17:17:28 $
# Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland.
#
#---------------------------------------------------------------------------
@ -84,7 +84,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $SHELL,
$SOLARINC, $LOCALINI, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,
$COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $EXTRA_DOTNET_FILES, $USE_NEW_SDK, $FRAME_HOME,
$ATL_LIB, $ATL_INCLUDE, $NO_HIDS, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4,
$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT,
$PROEXT,
$SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME );
#
@ -132,6 +132,8 @@ $MINGW = '@WITH_MINGWIN@'; # use MinGW for Windows build
$CC = '@CC@'; # C compiler
$CXX = '@CXX@'; # C++ compiler
$EXCEPTIONS = '@EXCEPTIONS@'; # Exception handling type
$MOZILLA_VERSION = '@MOZILLA_VERSION@'; # mozilla version to use to build mozilla
$MOZILLA_TOOLKIT = '@MOZILLA_TOOLKIT@'; # GUI toolkit to use to build mozilla
$WRAPCMD = ""; # Wrapper (only for winnt)
$GLIBC = ""; # Whether the platform uses glibc
$PROEXT = "@PROEXT@";
@ -1452,6 +1454,9 @@ ToFile( "debug", "true", "e" );
ToFile( "PRODUCT", "@PRODUCT@", "e" );
ToFile( "PROFULLSWITCH", "@PROFULLSWITCH@", "e" );
ToFile( "PROEXT", $PROEXT, "e" );
ToFile( "BUILD_MOZAB", "@BUILD_MOZAB@", "e" );
ToFile( "MOZILLA_VERSION", $MOZILLA_VERSION, "e" );
ToFile( "DEFAULT_MOZILLA_TOOLKIT", $MOZILLA_TOOLKIT, "e" );
ToFile( "ENABLE_GTK", "@ENABLE_GTK@", "e" );
ToFile( "GTK_CFLAGS", "@GTK_CFLAGS@", "e" );
ToFile( "GTK_LIBS", "@GTK_LIBS@", "e" );