--- oo_1.0.2_src/config_office/set_soenv.in.x86_64-config	2003-01-28 18:03:39.000000000 -0500
+++ oo_1.0.2_src/config_office/set_soenv.in	2003-01-28 18:04:31.000000000 -0500
@@ -72,7 +72,7 @@ my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CV
 #-------------------------------------------
 #
 # Help variables.
-my ( $USR, $ETC, $BIN, $LIB, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, 
+my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, 
      $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
      $SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
      $CYGWIN, $language, $ASM_PATH, $UNZIP_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
@@ -350,6 +350,17 @@ elsif ( $platform eq "$Linux" ) 
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
    }
+   elsif ($machine_type eq "x86_64")
+   {  print "Setting Linux x86-64 specific values... ";
+      $outfile        = "LinuxAMDEnv.Set"; 
+      $CPU            = "X";
+      $CPUNAME        = "X86_64";
+      $DLLSUFFIX      = "lx";
+      $OUTPATH        = "unxlngx";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64".$ds."client";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64".$ds."native_threads";
+   }
    elsif ($machine_type eq "sparc")
    {  print "Setting Linux Sparc specific values... ";
       $outfile        = "LinuxSparcEnv.Set"; 
@@ -413,6 +424,10 @@ if ($USE_GCC3 eq  "TRUE")
       {
         $OUTPATH      = "unxlngi4"
       }
+      elsif ($machine_type eq "x86_64")
+      {
+        $OUTPATH      = "unxlngx4"
+      }
 	  elsif ($machine_type eq "ppc")
 	  {
 		  $OUTPATH      = "unxlngppc4"
@@ -741,6 +756,9 @@ $USR                  = $ds."usr";
 $ETC                  = $ds."etc";
 $BIN                  = $ds."bin";
 $LIB                  = $ds."lib";
+$LIB64                = $ds."lib";
+$LIB64               .= "64"
+if ($platform eq "Linux" && $machine_type eq "x86_64");
 $INC                  = $ds."inc";
 $INCLUDE              = $ds."include";
 $DEV                  = $ds."dev";
@@ -750,7 +768,7 @@ $SOLENV               = $ds."solenv";
 $SOLVER               = $ds."solver";
 $CONFIG               = $ds."config";
 $USR_BIN              = $USR.$BIN;
-$USR_LIB              = $USR.$LIB;
+$USR_LIB              = $USR.$LIB64;
 $USR_LOCAL            = $USR.$ds."local";
 $USR_CCS              = $USR.$ds."ccs";
 $USR_OPENWIN          = $USR.$ds."openwin";
@@ -766,8 +784,8 @@ else
 }
 
 if ($STLPORT4 ne $no_stl) {
-	$ps_STLPORT_LIB		= $ps.'$STLPORT4'.$LIB;
-	$L_STLPORT_LIB		= $L.'$STLPORT4'.$LIB;
+	$ps_STLPORT_LIB		= $ps.'$STLPORT4'.$LIB64;
+	$L_STLPORT_LIB		= $L.'$STLPORT4'.$LIB64;
 	$STLPORT_stlport 	= $I.'$STLPORT4'.$ds.'stlport';
 	$STLPORT_inc_stlport	= $I.'$STLPORT4'.$ds.'include'.$ds.'stlport';
 } else {
@@ -897,7 +915,7 @@ elsif (($platform eq "$Linux") || ($plat
                         $ps.$JRELIBDIR.
                         $ps.$JRETOOLKITDIR.
                         $ps.$JRETHREADDIR.
-                        $ps.$par_dir.$LIB.
+                        $ps.$par_dir.$LIB64.
                         $ps_STLPORT_LIB.
                         $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
                        $ps.$ENV{'LD_LIBRARY_PATH'};
@@ -979,7 +997,7 @@ if ($platform eq "$Solaris") 
 elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") ||  ($platform eq "$Tru64") ||
        ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD"))
 {
-   $SOLAREXTRALIB     = $L.$par_dir.$LIB;
+   $SOLAREXTRALIB     = $L.$par_dir.$LIB64;
 }
 elsif ($platform eq "$Macosx") 
 {  $SOLAREXTRALIB     = $L.$LIB.