Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.10.6.5.2.2
diff -u -r1.10.6.5.2.2 set_soenv.in
--- config_office/set_soenv.in	8 Feb 2004 01:10:56 -0000	1.10.6.5.2.2
+++ config_office/set_soenv.in	26 Feb 2004 22:46:40 -0000
@@ -235,7 +235,6 @@
       $CPUNAME        = "INTEL";
       $DLLSUFFIX      = "si";
       $OUTPATH        = "unxsoli4";
-      $COMEX          = 4;
 	  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
 	  $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."motif21";
 	  $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
@@ -244,19 +243,23 @@
    else
    {  $outfile        = "SolarisSparcEnv.Set"; 
       $CPU            = "S";
-      $COMEX            = 4;
       $CPUNAME        = "SPARC";
       $DLLSUFFIX      = "ss";
       $OUTPATH        = "unxsols4";
-	  $COMEX          = 4;
 	  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
 	  $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."motif21";
 	  $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
    }
+   if ( $USE_GCC3 eq "TRUE") {
+       $COM            = "GCC";
+       $CVER           = "C300";
+   } else {
+       $COM            = "C52";
+       $CVER           = "C52";
+       $COMEX          = 4;
+   }
    $BIG_SVX        = "TRUE";
-   $COM            = "C52";
    $COMPATH        = '@COMPATH@'; 
-   $CVER           = "C52";
    $GUI            = "UNX";
    $GUIBASE        = "unx";
    $GUIENV         = "sal";
@@ -1213,8 +1216,13 @@
                         $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
                         $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB."solaris.2.6".
                         $L.$LIB.
-                        $L.$USR_LIB.
-                        $L.$USR_LOCAL.$LIB.
+                        $L.$USR_LIB;
+   if ( $USE_GCC3 eq "TRUE" ) {
+      my $temp = $COMPATH;
+      $temp =~ s:/bin$::;
+      $SOLARLIB      .= $L.$temp.$LIB;
+   }
+   $SOLARLIB         .= $L.$USR_LOCAL.$LIB.
                         $L.$USR_DT.$LIB.
                         $L.$USR_OPENWIN.$LIB.
                         $L.'$JAVA_HOME'.$LIB.
@@ -1274,13 +1282,16 @@
 }
 if ($platform eq "$Solaris")
 {
-$SOLARINC            .= '/SC5 ';
+    if ($USE_GCC3 ne "TRUE") {
+        $SOLARINC            .= '/SC5 ';
+    }
 }
 # Platform dependent include path at the top of this list of include paths
 if ($platform eq "$Solaris")
-{   my $temp;
-    $temp =~ s:$COMPATH:/bin\$:;
-    $SOLARINC         .= $I.$temp.$ds."include";
+{
+        my $temp;
+        $temp =~ s:$COMPATH:/bin\$:;
+        $SOLARINC         .= $I.$temp.$ds."include";
 }
 if ($platform eq "$Linux")
 {