resyncing to master

1 files changed, 15 insertions, 10 deletions

diff --git a/set_soenv.in b/set_soenv.in
index 5ea6bbf03b09..99a4ffbe6438 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -323,7 +323,7 @@ elsif ( $platform =~ m/freebsd/ )
       $OS             = "FREEBSD";
       $PATH_SEPERATOR = $ps;
       $OSVERSION      = '@OSVERSION@';
-   if ($platform =~ m/^amd64/)
+   if ($platform =~ m/^(amd64|x86_64)/)
    {  my ( $JAVA_OS );
       print "Setting FreeBSD AMD64 specific values... ";
       $outfile        = "FreeBSDAMDEnv.Set.sh";
@@ -655,7 +655,9 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
   {   print "Setting Windows (MinGW) specific values... ";
       # At the moment this implies the use of tcsh
       # WTF does that mean?
-      $FLIPCMD        = "slfl.pl";
+
+      $FLIPCMD        = "slfl.pl" if '@build_os@' eq 'cygwin';
+
       $PATH_SEPERATOR = ';';
       $PATH_SEPERATOR = ':' if '@build_os@' ne 'cygwin';
       $outfile        = "WindowsMinGWEnv.Set.sh";
@@ -670,8 +672,6 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
   else # The MSVC section starts here
   {   print "Setting Windows (MSVC) specific values... ";
       $outfile        = "WindowsMSVCEnv.Set.sh";
-      # Temporary hack: remove the old winenv.set.sh to avoid confusion... drop after a few weeks
-      unlink('winenv.set.sh');
       $COMPATH        = PathFormat('@COMPATH@');
       $COM            = "MSC";
       $OUTPATH        = "wntmsci@COMEX@";
@@ -1291,13 +1291,14 @@ elsif ($platform =~ m/cygwin|mingw32/)
                         $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
 }
 elsif ($platform =~ m/darwin/)
-{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $L.$USR_LIB;
+{  $SOLARLIB          = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB;
+   if ($platform !~ m/^arm-apple/)
+   {  $SOLARLIB      .= $L.$USR_LIB;
+   }
     # [ed] 6/15/02 Add in X11 libraries onto the library path
     if ($GUIBASE eq "unx") {
        $SOLARLIB      .= $L.$XLIB;
     }
-
 }
 
 if ($SYSTEM_MOZILLA eq "YES")
@@ -1321,7 +1322,7 @@ if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
 $SOLARINC            .= '/SC5 ';
 }
 # Platform dependent include path at the top of this list of include paths
-if ($platform =~ m/solaris/)
+if ($platform =~ m/solaris/ && ! $CC =~ "gcc")
 {
     $SOLARINC         .= $I.$COMPATH.$INCLUDE;
 }
@@ -1518,6 +1519,7 @@ ToFile( "NO_BSYMBOLIC",      $NO_BSYMBOLIC,      "e" );
 if ("@ENABLE_DEBUG@" eq "TRUE") {
 ToFile( "debug",             "true",             "e" );
 }
+ToFile( "ENABLE_DEBUG_STL",  "@ENABLE_DEBUG_STL@", "e" );
 if ("@ENABLE_WERROR@" eq "FALSE") {
 ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE",  "e" );
 }
@@ -1547,7 +1549,6 @@ ToFile( "GTHREAD_CFLAGS",    "@GTHREAD_CFLAGS@",   "e" );
 ToFile( "GTHREAD_LIBS",      "@GTHREAD_LIBS@",     "e" );
 ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
 ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
-ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
 ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
@@ -1682,6 +1683,8 @@ if ( $platform =~ m/cygwin/ )
 }
 elsif ( $platform =~ m/mingw32/ )
 {  ToFile( "NSIS_PATH",         $NSIS_PATH,         "e" );
+   ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
+   ToFile( "DISABLE_ATL",       "@DISABLE_ATL@",    "e" );
 }
 
 if ("@WITH_VC_REDIST@" eq "TRUE") {
@@ -1828,6 +1831,8 @@ ToFile( "ENABLE_CRASHDUMP",  "@ENABLE_CRASHDUMP@",  "e" );
 ToFile( "ENABLE_CUPS",       "@ENABLE_CUPS@",       "e" );
 ToFile( "ENABLE_RANDR",      "@ENABLE_RANDR@",      "e" );
 ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" );
+ToFile( "FONTCONFIG_LIBS",   "@FONTCONFIG_LIBS@",   "e");
+ToFile( "FONTCONFIG_CFLAGS", "@FONTCONFIG_CFLAGS@", "e");
 ToFile( "ENABLE_DIRECTX",    "@ENABLE_DIRECTX@",    "e" );
 ToFile( "ENABLE_LAYOUT",     "@ENABLE_LAYOUT@",     "e" );
 ToFile( "ENABLE_PCH",        "@ENABLE_PCH@",       "e" );
@@ -1927,7 +1932,6 @@ ToFile( "POPPLER_LIBS",      "@POPPLER_LIBS@",     "e" );
 ToFile( "GSTREAMER_CFLAGS",  "@GSTREAMER_CFLAGS@", "e" );
 ToFile( "GSTREAMER_LIBS",    "@GSTREAMER_LIBS@",   "e" );
 ToFile( "SYSTEM_CAIRO",      "@SYSTEM_CAIRO@",     "e" );
-ToFile( "BUILD_PIXMAN",      "@BUILD_PIXMAN@",     "e" );
 ToFile( "CAIRO_CFLAGS",      "@CAIRO_CFLAGS@",     "e" );
 ToFile( "CAIRO_LIBS",        "@CAIRO_LIBS@",       "e" );
 ToFile( "XRANDR_CFLAGS",     "@XRANDR_CFLAGS@",    "e" );
@@ -1966,6 +1970,7 @@ ToFile( "DB_LIB",            "@DB_LIB@",           "e" );
 ToFile( "DB_CPPLIB",         "@DB_CPPLIB@",        "e" );
 ToFile( "ENABLE_MYSQLC",     "@ENABLE_MYSQLC@",    "e" );
 ToFile( "ENABLE_LOMENUBAR",  "@ENABLE_LOMENUBAR@", "e" );
+ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" );
 ToFile( "SYSTEM_MYSQL",      "@SYSTEM_MYSQL@",     "e" );
 ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" );
 ToFile( "MYSQL_INC",         "@MYSQL_INC@",        "e" );