--- oo_1.0.1_src/config_office/set_soenv.1.x86_64-config 2002-10-15 05:20:21.000000000 -0400 +++ oo_1.0.1_src/config_office/set_soenv.1 2002-10-15 07:33:26.000000000 -0400 @@ -80,7 +80,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, $PERL_PATH, $TCSH_PATH, $XLIB, $XINC, @GCC_INCLUDES, @GXX_INCLUDES, $CYGWIN, $language, $ASM_PATH, $UNZIP_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB, @@ -367,6 +367,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"; @@ -419,6 +430,10 @@ if ($USE_GCC3 eq "TRUE") { $OUTPATH = "unxlngi4" } + elsif ($machine_type eq "x86_64") + { + $OUTPATH = "unxlngx4"; + } } else { @@ -784,6 +799,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"; @@ -793,7 +811,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"; @@ -801,8 +819,8 @@ $USR_DT = $USR.$ds."dt"; $COMMON_BUILD_TOOLS = '$SRC_ROOT'.$ds."external".$ds."common"; 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 { @@ -915,10 +933,10 @@ $STAR_REGISTRY = '$STAR_RESOURCEP $DMAKEROOT = '$SOLARENVINC'.$ds."startup"; # Location of JDK classes .zip file. # but in jdk 1.2 it is called rt.jar and it lives in jre/lib -$CLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar"; +$CLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB64.$ds."rt.jar"; # Location of the JDK supported standard classes.zip file. # see above for why the change -$XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar"; +$XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB64.$ds."rt.jar"; # Paths to run time shared libraries. if ($platform eq "$Solaris") { $LD_LIBRARY_PATH = $cur_dir. @@ -932,8 +950,9 @@ if ($platform eq "$Solaris") elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64")) { $LD_LIBRARY_PATH = $cur_dir. $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB. - $ps.$USR_LOCAL.$LIB. + $ps.$USR_LOCAL.$LIB64. $ps.$par_dir.$LIB. + $ps.$par_dir.$LIB64. $ps_STLPORT_LIB. $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB; } @@ -999,9 +1018,10 @@ if ($platform eq "$Solaris") } elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB. - $L.$LIB. - $L.$USR.$LIB. - $L.$USR.$LOCAL.$LIB.'"'; + $L.$par_dir.$LIB64. + $L.$LIB64. + $L.$USR.$LIB64. + $L.$USR.$LOCAL.$LIB64.'"'; } elsif ($platform eq "$Macosx") { $SOLAREXTRALIB = '"'.$L.$LIB. @@ -1095,7 +1115,7 @@ elsif (($platform eq "$Linux") or ($plat $ps.$ETC. $ps.$USR.$BIN.$ds."X11". $ps.$USR.$ds."X11".$BIN. - $ps.$USR.$LIB; + $ps.$USR.$LIB64; } elsif ($platform eq "$Winnt") { @@ -1199,12 +1219,13 @@ if ($platform eq "$Solaris") } elsif (($platform eq "$Linux") || ($platform eq "$FreeBSD") || ($platform eq "$NetBSD") || ($platform eq "$Tru64") || ($platform eq "$Irix") || ($platform eq "$Irix64")) { $SOLARLIB = '"'.$L.$par_dir.$LIB. + $L.$par_dir.$LIB64. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB. - $L.$LIB. + $L.$LIB64. $L.$USR_LIB. - $L.$USR_LOCAL.$LIB. + $L.$USR_LOCAL.$LIB64. $L.'$JAVA_HOME'.$LIB. $L.$JRELIBDIR. $L.$JRETOOLKITDIR. --- oo_1.0.1_src/config_office/configure.in.x86_64-config 2002-10-15 05:20:21.000000000 -0400 +++ oo_1.0.1_src/config_office/configure.in 2002-10-15 06:15:41.000000000 -0400 @@ -250,7 +250,7 @@ if test "$_os" = "Linux" -o "$_os" = "Fr AC_PROG_CC COMPATH=`echo $CC | $SED -n "s,/[^/]\+$,,p"` - _gcc_include_start=/usr/lib/gcc-lib + _gcc_include_start=`$CC -print-search-dirs | sed -n "/install: \(.*gcc-lib\).*/s//\1/p"` _gxx_include_start=/usr/include else @@ -824,6 +824,14 @@ if test "$JAVA"; then _jdk_minor="true" fi fi + if test "$_os" = "Linux" -a "$_machine_type" = "x86_64"; then + _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` + _jdk_middle3=`echo $_jdk | $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'` + + if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then + _jdk_minor="true" + fi + fi if test "$_os" = "NetBSD"; then _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'` fi @@ -866,6 +874,9 @@ if test "$JAVA"; then if test "$_machine_type" = "i686"; then _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` fi + if test "$_machine_type" = "x86_64"; then + _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` + fi if test "$_machine_type" = "sparc"; then _jdk_minor=`echo $_jdk | $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'` fi