INTEGRATION: CWS vq15 (1.58.10); FILE MERGED

2005/05/09 03:19:00 vq 1.58.10.1: #i48857# Restore the ability to use perbuild mozab packages.

config_office/set_soenv.in

 #!@PERL@ -w
 #
 # Program:     set_soenv.in
-# Version:     $Revision: 1.58 $
-# Date:        $Date: 2005-04-11 09:31:27 $
+# Version:     $Revision: 1.59 $
+# Date:        $Date: 2005-05-10 07:52:29 $
 # 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, $MOZILLA_VERSION, $MOZILLA_TOOLKIT,
+     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB,
 	 $PROEXT,
      $SYSTEM_PYTHON, $PYTHONPATH, $PYTHONHOME, $SYSTEM_MOZILLA );
 #
@@ -709,6 +709,7 @@ if ( "@WITH_MOZILLA@" eq "YES" and "@BUILD_MOZAB@" ne "TRUE" and "@SYSTEM_MOZILL
         and -e $mozbinfile."lib.zip"
         and -e $mozbinfile."runtime.zip" )
    {   print " found.\n";
+       $PREBUILD_MOZAB = "YES";
    }
    else
    {   print " not found!\n";
@@ -719,6 +720,10 @@ if ( "@WITH_MOZILLA@" eq "YES" and "@BUILD_MOZAB@" ne "TRUE" and "@SYSTEM_MOZILL
        die;
    }
 }
+else
+{
+   $PREBUILD_MOZAB = "";
+}
 
 #
 # E. Determining the envionment values based on the information
@@ -1470,7 +1475,8 @@ 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( "PREBUILD_MOZAB",    $PREBUILD_MOZAB,    "e" );
+ToFile( "MOZILLA_VERSION",   $MOZILLA_VERSION,   "e" );
 ToFile( "DEFAULT_MOZILLA_TOOLKIT", $MOZILLA_TOOLKIT, "e" );
 ToFile( "BUILD_VER_STRING",  "@BUILD_VER_STRING@", "e" );
 ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );