--- configure.orig	2008-08-06 04:36:41.000000000 -0400
+++ configure	2009-06-30 19:32:02.000000000 -0400
@@ -719,7 +719,7 @@
                           Include Oracle (OCI8) support using
                           Oracle Instant Client. DIR is the directory with the
                           Instant Client libraries. On Linux it will default to
-                          /usr/lib/oracle/<most_recent_version>/client/lib
+                          /usr/lib64/oracle/<most_recent_version>/client/lib
                           Other platforms will need to have it explicitly specified."
 ac_help="$ac_help
   --with-adabas[=DIR]     Include Adabas D support.  DIR is the Adabas base
@@ -880,7 +880,7 @@
 PEAR:
 "
 ac_help="$ac_help
-  --with-pear=DIR         Install PEAR in DIR (default PREFIX/lib/php)
+  --with-pear=DIR         Install PEAR in DIR (default PREFIX/lib64/php)
   --without-pear          Do not install PEAR"
 ac_help="$ac_help
 
@@ -2217,7 +2217,7 @@
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  CPP=/lib/cpp
+  CPP=/lib64/cpp
 fi
 rm -f conftest*
 fi
@@ -6764,7 +6764,7 @@
 
 
 
-	INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/lib/$PIKE_VERSION/PHP4.so"
+	INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $withval/lib64/$PIKE_VERSION/PHP4.so"
 	RESULT="	*** Pike binary used:         $PIKE
 	*** Pike include dir(s) used: $PIKE_INCLUDE_DIR
 	*** Pike version:             $PIKE_VERSION"
@@ -8458,12 +8458,12 @@
     if test "$withval" = "yes"; then
       SERVLET_CLASSPATH=.
     else
-      if test -f $withval/lib/servlet.jar; then
-        SERVLET_CLASSPATH=$withval/lib/servlet.jar
+      if test -f $withval/lib64/servlet.jar; then
+        SERVLET_CLASSPATH=$withval/lib64/servlet.jar
       fi
 
-      if test -f $withval/lib/jsdk.jar; then
-        SERVLET_CLASSPATH=$withval/lib/jsdk.jar
+      if test -f $withval/lib64/jsdk.jar; then
+        SERVLET_CLASSPATH=$withval/lib64/jsdk.jar
       fi
 
       if test -d $withval/javax; then
@@ -17482,7 +17482,7 @@
     fi
 
     for i in $PHP_KERBEROS; do
-      if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then
+      if test -f $i/lib64/libkrb5.a || test -f $i/lib64/libkrb5.$SHLIB_SUFFIX_NAME; then
         PHP_KERBEROS_DIR=$i
         break
       fi
@@ -17849,7 +17849,7 @@
       if test -r $i/include/openssl/evp.h; then
         OPENSSL_INCDIR=$i/include
       fi
-      if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
+      if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then
         OPENSSL_LIBDIR=$i/lib
       fi
       test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
@@ -18641,7 +18641,7 @@
       { echo "configure: error: Could not find pcre.h in $PHP_PCRE_REGEX" 1>&2; exit 1; }
     fi
 
-    for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib; do
+    for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib $PHP_PCRE_REGEX/lib64 ; do
       test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
     done
     
@@ -21232,7 +21232,7 @@
   withval="$with_jpeg_dir"
   
     for i in $withval /usr/local /usr; do
-      if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then
+      if test -f "$i/lib64/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libjpeg.a"; then
         CPDF_JPEG_DIR=$i
         break;
       fi
@@ -21479,7 +21479,7 @@
   withval="$with_tiff_dir"
   
     for i in $withval /usr/local /usr; do
-      if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then
+      if test -f "$i/lib64/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib64/libtiff.a"; then
         CPDF_TIFF_DIR=$i
         break;
       fi
@@ -24153,7 +24153,7 @@
     fi
 
     if test "$found_sasl" = "yes"; then
-      if test -f $i/lib/libsasl2.a || test -f $i/lib/libsasl2.$SHLIB_SUFFIX_NAME; then
+      if test -f $i/lib64/libsasl2.a || test -f $i/lib64/libsasl2.$SHLIB_SUFFIX_NAME; then
         
 
   if test "$ext_shared" = "yes"; then
@@ -26188,7 +26188,7 @@
     done
     
   for LIB in db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db; do
-    if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
+    if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then
       
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
@@ -26511,7 +26511,7 @@
     done
     
   for LIB in db-3.3 db-3.2 db-3.1 db-3.0 db-3 db3 db; do
-    if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
+    if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then
       
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
@@ -26834,7 +26834,7 @@
     done
     
   for LIB in db-2 db2 db; do
-    if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
+    if test -f $THIS_PREFIX/lib64/lib$LIB.a -o -f $THIS_PREFIX/lib64/lib$LIB.$SHLIB_SUFFIX_NAME; then
       
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$THIS_PREFIX/lib $LDFLAGS"
@@ -29231,7 +29231,7 @@
   CPPFLAGS=$old_CPPFLAGS
 
 
-  if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then
+  if test -f $DOMXML_DIR/lib64/libxml2.a -o -f $DOMXML_DIR/lib64/libxml2.$SHLIB_SUFFIX_NAME ; then
     DOM_LIBNAME=xml2
   else
     DOM_LIBNAME=xml
@@ -30050,7 +30050,7 @@
     { echo "configure: error: DOMXSLT requires DOMXML. Use --with-dom=<DIR>" 1>&2; exit 1; }
   fi
   
-  if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then
+  if test -f $DOMXML_DIR/lib64/libxml2.a -o -f $DOMXML_DIR/lib64/libxml2.$SHLIB_SUFFIX_NAME ; then
     DOM_LIBNAME=xml2
   else
     DOM_LIBNAME=xml
@@ -30184,7 +30184,7 @@
   fi
 
 
-  if test -f $DOMXML_DIR/lib/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then
+  if test -f $DOMXML_DIR/lib64/libxsltbreakpoint.a -o -f $DOMXML_DIR/lib64/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then
     
 
   if test "$ext_shared" = "yes"; then
@@ -31142,8 +31142,8 @@
     fi
   fi  
 
-  if test ! -r "$FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a"; then
-     { echo "configure: error: Could not find $FBSQL_INSTALLATION_DIR/lib/libFBCAccess.a" 1>&2; exit 1; }
+  if test ! -r "$FBSQL_INSTALLATION_DIR/lib64/libFBCAccess.a"; then
+     { echo "configure: error: Could not find $FBSQL_INSTALLATION_DIR/lib64/libFBCAccess.a" 1>&2; exit 1; }
   fi
 
   
@@ -33554,7 +33554,7 @@
   if test "$PHP_JPEG_DIR" != "no"; then
 
     for i in $PHP_JPEG_DIR /usr/local /usr; do
-      test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break
+      test -f $i/lib64/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libjpeg.a && GD_JPEG_DIR=$i && break
     done
 
     if test -z "$GD_JPEG_DIR"; then
@@ -33829,7 +33829,7 @@
   if test "$PHP_PNG_DIR" != "no"; then
 
     for i in $PHP_PNG_DIR /usr/local /usr; do
-      test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break
+      test -f $i/lib64/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libpng.a && GD_PNG_DIR=$i && break
     done
 
     if test -z "$GD_PNG_DIR"; then
@@ -34209,7 +34209,7 @@
   if test "$PHP_XPM_DIR" != "no"; then
 
     for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
-      test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break
+      test -f $i/lib64/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libXpm.a && GD_XPM_DIR=$i && break
     done
 
     if test -z "$GD_XPM_DIR"; then
@@ -35350,7 +35350,7 @@
   if test "$PHP_JPEG_DIR" != "no"; then
 
     for i in $PHP_JPEG_DIR /usr/local /usr; do
-      test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break
+      test -f $i/lib64/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libjpeg.a && GD_JPEG_DIR=$i && break
     done
 
     if test -z "$GD_JPEG_DIR"; then
@@ -35625,7 +35625,7 @@
   if test "$PHP_PNG_DIR" != "no"; then
 
     for i in $PHP_PNG_DIR /usr/local /usr; do
-      test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break
+      test -f $i/lib64/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libpng.a && GD_PNG_DIR=$i && break
     done
 
     if test -z "$GD_PNG_DIR"; then
@@ -36005,7 +36005,7 @@
   if test "$PHP_XPM_DIR" != "no"; then
 
     for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
-      test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break
+      test -f $i/lib64/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libXpm.a && GD_XPM_DIR=$i && break
     done
 
     if test -z "$GD_XPM_DIR"; then
@@ -42498,7 +42498,7 @@
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  CXXCPP=/lib/cpp
+  CXXCPP=/lib64/cpp
 fi
 rm -f conftest*
   ac_cv_prog_CXXCPP="$CXXCPP"
@@ -43333,8 +43333,8 @@
       { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
     fi
   
-    if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a ||
-       test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
+    if test -f $ICONV_DIR/lib64/lib$iconv_lib_name.a ||
+       test -f $ICONV_DIR/lib64/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
     then
       
   save_old_LDFLAGS=$LDFLAGS
@@ -45474,7 +45474,7 @@
     fi
 
     for i in $PHP_KERBEROS; do
-      if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then
+      if test -f $i/lib64/libkrb5.a || test -f $i/lib64/libkrb5.$SHLIB_SUFFIX_NAME; then
         PHP_KERBEROS_DIR=$i
         break
       fi
@@ -45871,7 +45871,7 @@
       if test -r $i/include/openssl/evp.h; then
         OPENSSL_INCDIR=$i/include
       fi
-      if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
+      if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then
         OPENSSL_LIBDIR=$i/lib
       fi
       test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
@@ -46555,16 +46555,16 @@
   fi
 
     
-  if test "$INFORMIXDIR/lib/esql" != "/usr/lib"; then
+  if test "$INFORMIXDIR/lib64/esql" != "/usr/lib"; then
     
-  if test -z "$INFORMIXDIR/lib/esql" || echo "$INFORMIXDIR/lib/esql" | grep '^/' >/dev/null ; then
-    ai_p=$INFORMIXDIR/lib/esql
+  if test -z "$INFORMIXDIR/lib64/esql" || echo "$INFORMIXDIR/lib64/esql" | grep '^/' >/dev/null ; then
+    ai_p=$INFORMIXDIR/lib64/esql
   else
     
-    ep_dir="`echo $INFORMIXDIR/lib/esql|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $INFORMIXDIR/lib64/esql|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$INFORMIXDIR/lib/esql\"`"
+    ai_p="$ep_realdir/`basename \"$INFORMIXDIR/lib64/esql\"`"
   fi
 
     
@@ -46634,16 +46634,16 @@
   fi
 
     
-  if test "$PHP_INFORMIX/lib/esql" != "/usr/lib"; then
+  if test "$PHP_INFORMIX/lib64/esql" != "/usr/lib"; then
     
-  if test -z "$PHP_INFORMIX/lib/esql" || echo "$PHP_INFORMIX/lib/esql" | grep '^/' >/dev/null ; then
-    ai_p=$PHP_INFORMIX/lib/esql
+  if test -z "$PHP_INFORMIX/lib64/esql" || echo "$PHP_INFORMIX/lib64/esql" | grep '^/' >/dev/null ; then
+    ai_p=$PHP_INFORMIX/lib64/esql
   else
     
-    ep_dir="`echo $PHP_INFORMIX/lib/esql|sed 's%/*[^/][^/]*/*$%%'`"
+    ep_dir="`echo $PHP_INFORMIX/lib64/esql|sed 's%/*[^/][^/]*/*$%%'`"
     
     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
-    ai_p="$ep_realdir/`basename \"$PHP_INFORMIX/lib/esql\"`"
+    ai_p="$ep_realdir/`basename \"$PHP_INFORMIX/lib64/esql\"`"
   fi
 
     
@@ -47445,7 +47445,7 @@
     { echo "configure: error: Cannot find iiapi.h under $II_DIR/files" 1>&2; exit 1; }
   fi
 
-  if test -r $II_DIR/lib/libiiapi.a; then
+  if test -r $II_DIR/lib64/libiiapi.a; then
     II_LIB_DIR=$II_DIR/lib
   else
     { echo "configure: error: Cannot find libiiapi.a under $II_DIR/lib" 1>&2; exit 1; }
@@ -48859,7 +48859,7 @@
     
  echo $ac_n "checking Checking for libjava""... $ac_c" 1>&6
 echo "configure:48862: checking Checking for libjava" >&5
- if test -d $PHP_JAVA/lib/kaffe; then
+ if test -d $PHP_JAVA/lib64/kaffe; then
    
   if test "$PHP_JAVA/lib" != "/usr/lib"; then
     
@@ -48897,24 +48897,24 @@
    JAVA_INCLUDE=-I$PHP_JAVA/include/kaffe
    JAVA_CLASSPATH=$PHP_JAVA/share/kaffe/Klasses.jar
    JAVA_LIB=kaffevm
-   JAVA_LIBPATH=$PHP_JAVA/lib/kaffe
+   JAVA_LIBPATH=$PHP_JAVA/lib64/kaffe
    java_libext=kaffevm
 
-   test -f $PHP_JAVA/lib/$JAVA_LIB       && JAVA_LIBPATH=$PHP_JAVA/lib
-   test -f $PHP_JAVA/lib/kaffe/$JAVA_LIB && JAVA_LIBPATH=$PHP_JAVA/lib/kaffe
+   test -f $PHP_JAVA/lib64/$JAVA_LIB       && JAVA_LIBPATH=$PHP_JAVA/lib
+   test -f $PHP_JAVA/lib64/kaffe/$JAVA_LIB && JAVA_LIBPATH=$PHP_JAVA/lib64/kaffe
 
             if kaffe -version 2>&1 | grep 1.0b > /dev/null; then
      JAVA_JAR='zip -q0'
    fi
- elif test -f $PHP_JAVA/lib/$java_libext; then
+ elif test -f $PHP_JAVA/lib64/$java_libext; then
    JAVA_LIB=java
    JAVA_LIBPATH=$PHP_JAVA/lib
    JAVA_INCLUDE=-I$PHP_JAVA/include
 
-   test -f $PHP_JAVA/lib/classes.zip && JAVA_CFLAGS=-DJNI_11
-   test -f $PHP_JAVA/lib/jvm.jar     && JAVA_CFLAGS=-DJNI_12
-   test -f $PHP_JAVA/lib/classes.zip && JAVA_CLASSPATH=$PHP_JAVA/lib/classes.zip
-   test -f $PHP_JAVA/lib/jvm.jar     && JAVA_CLASSPATH=$PHP_JAVA/lib/jvm.jar
+   test -f $PHP_JAVA/lib64/classes.zip && JAVA_CFLAGS=-DJNI_11
+   test -f $PHP_JAVA/lib64/jvm.jar     && JAVA_CFLAGS=-DJNI_12
+   test -f $PHP_JAVA/lib64/classes.zip && JAVA_CLASSPATH=$PHP_JAVA/lib64/classes.zip
+   test -f $PHP_JAVA/lib64/jvm.jar     && JAVA_CLASSPATH=$PHP_JAVA/lib64/jvm.jar
 
    for i in $PHP_JAVA/include/*; do
      test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
@@ -49751,15 +49751,15 @@
   if test -f $i/include/ldap.h; then
     LDAP_DIR=$i
     LDAP_INCDIR=$i/include
-    LDAP_LIBDIR=$i/lib
+    LDAP_LIBDIR=$i/lib64
   elif test -f $i/include/umich-ldap/ldap.h; then
     LDAP_DIR=$i
     LDAP_INCDIR=$i/include/umich-ldap
-    LDAP_LIBDIR=$i/lib
+    LDAP_LIBDIR=$i/lib64
   elif test -f $i/ldap/public/ldap.h; then
     LDAP_DIR=$i
     LDAP_INCDIR=$i/ldap/public
-    LDAP_LIBDIR=$i/lib
+    LDAP_LIBDIR=$i/lib64
   fi
 
     done
@@ -49768,15 +49768,15 @@
   if test -f $PHP_LDAP/include/ldap.h; then
     LDAP_DIR=$PHP_LDAP
     LDAP_INCDIR=$PHP_LDAP/include
-    LDAP_LIBDIR=$PHP_LDAP/lib
+    LDAP_LIBDIR=$PHP_LDAP/lib64
   elif test -f $PHP_LDAP/include/umich-ldap/ldap.h; then
     LDAP_DIR=$PHP_LDAP
     LDAP_INCDIR=$PHP_LDAP/include/umich-ldap
-    LDAP_LIBDIR=$PHP_LDAP/lib
+    LDAP_LIBDIR=$PHP_LDAP/lib64
   elif test -f $PHP_LDAP/ldap/public/ldap.h; then
     LDAP_DIR=$PHP_LDAP
     LDAP_INCDIR=$PHP_LDAP/ldap/public
-    LDAP_LIBDIR=$PHP_LDAP/lib
+    LDAP_LIBDIR=$PHP_LDAP/lib64
   fi
 
   fi
@@ -52822,7 +52822,7 @@
     fi
   done
 
-  for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do
+  for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib64/mcal $MCAL_DIR/lib; do
     if test -r "$i/libmcal.a"; then
       MCAL_LIBRARY=$i
     fi
@@ -54626,7 +54626,7 @@
       if test -r $i/include/openssl/evp.h; then
         OPENSSL_INCDIR=$i/include
       fi
-      if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
+      if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then
         OPENSSL_LIBDIR=$i/lib
       fi
       test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
@@ -56720,7 +56720,7 @@
 
 
   for i in $PHP_MING /usr/local /usr; do
-    if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then
+    if test -f $i/lib64/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib64/libming.a; then
       MING_DIR=$i
     fi
   done
@@ -57850,13 +57850,13 @@
 
  
 if test "$PHP_MSESSION" != "no"; then
-	if test -r $PHP_MSESSION/lib/libphoenix.a; then
+	if test -r $PHP_MSESSION/lib64/libphoenix.a; then
 		PHOENIX_DIR=$PHP_MSESSION
 	else
 		echo $ac_n "checking for msession in default path""... $ac_c" 1>&6
 echo "configure:57858: checking for msession in default path" >&5
 		for i in /usr/local/phoenix /usr/local /usr; do
-			if test -r $i/lib/libphoenix.a; then
+			if test -r $i/lib64/libphoenix.a; then
 				PHOENIX_DIR=$i
 				echo "$ac_t""found in $i" 1>&6
 			fi
@@ -58806,8 +58806,8 @@
     fi
   fi  
 
-  if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then
-     { echo "configure: error: Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.a|so" 1>&2; exit 1; }
+  if test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib64/libtds.so"; then
+     { echo "configure: error: Could not find $FREETDS_INSTALLATION_DIR/lib64/libtds.a|so" 1>&2; exit 1; }
   fi
 
   MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include
@@ -59521,7 +59521,7 @@
     /var/run/mysqld/mysqld.sock \
     /var/tmp/mysql.sock \
     /var/run/mysql/mysql.sock \
-    /var/lib/mysql/mysql.sock \
+    /var/lib64/mysql/mysql.sock \
     /var/mysql/mysql.sock \
     /usr/local/mysql/var/mysql.sock \
     /Private/tmp/mysql.sock \
@@ -62110,7 +62110,7 @@
       ;;
   esac
 
-  for i in lib lib/mysql; do
+  for i in lib64 lib64/mysql; do
     
   str="$MYSQL_DIR/$i/lib$MY_LIBNAME.*"
   for j in `echo $str`; do
@@ -64078,9 +64078,9 @@
     OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/plsql/public"
   fi
 
-  if test -f "$OCI8_DIR/lib/sysliblist"; then
+  if test -f "$OCI8_DIR/lib64/sysliblist"; then
     
-  for ac_i in `cat $OCI8_DIR/lib/sysliblist`; do
+  for ac_i in `cat $OCI8_DIR/lib64/sysliblist`; do
     case $ac_i in
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
@@ -64151,9 +64151,9 @@
     esac
   done
 
-  elif test -f "$OCI8_DIR/rdbms/lib/sysliblist"; then
+  elif test -f "$OCI8_DIR/rdbms/lib64/sysliblist"; then
     
-  for ac_i in `cat $OCI8_DIR/rdbms/lib/sysliblist`; do
+  for ac_i in `cat $OCI8_DIR/rdbms/lib64/sysliblist`; do
     case $ac_i in
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
@@ -64232,16 +64232,16 @@
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
     OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
     test -z "$OCI8_VERSION" && OCI8_VERSION=7.3
-  elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
+  elif test -f $OCI8_DIR/lib64/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
     OCI8_VERSION=10.1    
-  elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
+  elif test -f $OCI8_DIR/lib64/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
     OCI8_VERSION=9.0
-  elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
+  elif test -f $OCI8_DIR/lib64/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
     OCI8_VERSION=8.1
-  elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
+  elif test -f $OCI8_DIR/lib64/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
     OCI8_VERSION=8.0
-  elif test -f $OCI8_DIR/lib/libclntsh.a; then 
-    if test -f $OCI8_DIR/lib/libcore4.a; then 
+  elif test -f $OCI8_DIR/lib64/libclntsh.a; then 
+    if test -f $OCI8_DIR/lib64/libcore4.a; then 
       OCI8_VERSION=8.0
     else
       OCI8_VERSION=8.1
@@ -65877,7 +65877,7 @@
   echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
 echo "configure:65879: checking Oracle Instant Client directory" >&5
   if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
-    PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client/lib  2> /dev/null | tail -1`
+    PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib64/oracle/*/client/lib  2> /dev/null | tail -1`
     if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
       { echo "configure: error: Oracle Instant Client directory not found. Try --with-oci8-instant-client=DIR" 1>&2; exit 1; }
     fi
@@ -65889,7 +65889,7 @@
   echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
 echo "configure:65891: checking Oracle Instant Client SDK header directory" >&5
 
-  OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e 's!^/usr/lib/oracle/\(.*\)/client/lib[/]*$!/usr/include/oracle/\1/client!'`
+  OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e 's!^/usr/lib64/oracle/\(.*\)/client/lib[/]*$!/usr/include/oracle/\1/client!'`
 
   OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include
 
@@ -66545,7 +66545,7 @@
     
   fi
 
-    ODBC_OBJS="$withval/lib/odbclib.a"
+    ODBC_OBJS="$withval/lib64/odbclib.a"
     ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
     $srcdir/build/shtool mkdir -f -p ext/odbc
     rm -f "$ODBC_LIB"
@@ -67104,9 +67104,9 @@
     for I in $LIST
     do
         case $I in
-          $EMPRESSPATH/odbccl/lib/* | \
-          $EMPRESSPATH/rdbms/lib/* | \
-          $EMPRESSPATH/common/lib/*)
+          $EMPRESSPATH/odbccl/lib64/* | \
+          $EMPRESSPATH/rdbms/lib64/* | \
+          $EMPRESSPATH/common/lib64/*)
                 NEWLIST="$NEWLIST $I"
                 ;;
         esac
@@ -68294,9 +68294,9 @@
 
   fi
 
-  if test -f "$ORACLE_DIR/lib/sysliblist"; then
+  if test -f "$ORACLE_DIR/lib64/sysliblist"; then
   	
-  for ac_i in `cat $ORACLE_DIR/lib/sysliblist`; do
+  for ac_i in `cat $ORACLE_DIR/lib64/sysliblist`; do
     case $ac_i in
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
@@ -68367,9 +68367,9 @@
     esac
   done
 
-  elif test -f "$ORACLE_DIR/rdbms/lib/sysliblist"; then
+  elif test -f "$ORACLE_DIR/rdbms/lib64/sysliblist"; then
   	
-  for ac_i in `cat $ORACLE_DIR/rdbms/lib/sysliblist`; do
+  for ac_i in `cat $ORACLE_DIR/rdbms/lib64/sysliblist`; do
     case $ac_i in
     -l*)
       ac_ii=`echo $ac_i|cut -c 3-`
@@ -68448,14 +68448,14 @@
   if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
   	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
 	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
-  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
+  elif test -f $ORACLE_DIR/lib64/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
     ORACLE_VERSION=9.0
-  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
+  elif test -f $ORACLE_DIR/lib64/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
     ORACLE_VERSION=8.1
-  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
+  elif test -f $ORACLE_DIR/lib64/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
     ORACLE_VERSION=8.0
-  elif test -f $ORACLE_DIR/lib/libclntsh.a; then
-    if test -f $ORACLE_DIR/lib/libcore4.a; then
+  elif test -f $ORACLE_DIR/lib64/libclntsh.a; then
+    if test -f $ORACLE_DIR/lib64/libcore4.a; then
       ORACLE_VERSION=8.0
     else
       ORACLE_VERSION=8.1
@@ -68467,7 +68467,7 @@
 
   case $ORACLE_VERSION in
 	7.0|7.1)
-	  if test -f $ORACLE_DIR/lib/liboracle.$SHLIB_SUFFIX_NAME; then
+	  if test -f $ORACLE_DIR/lib64/liboracle.$SHLIB_SUFFIX_NAME; then
 	    
 
   if test "$ext_shared" = "yes"; then
@@ -69430,9 +69430,9 @@
 
 
 		if test "$ext_shared" = "yes"; then
-		  ORACLE_SHARED_LIBADD="$ORACLE_DIR/lib/osntab.o $ORACLE_SHARED_LIBADD";
+		  ORACLE_SHARED_LIBADD="$ORACLE_DIR/lib64/osntab.o $ORACLE_SHARED_LIBADD";
 		else
-		  LIBS="$ORACLE_DIR/lib/osntab.o $LIBS";
+		  LIBS="$ORACLE_DIR/lib64/osntab.o $LIBS";
 		fi
 		
 
@@ -69532,16 +69532,16 @@
 
 		if test "`uname -s 2>/dev/null`" = "AIX"; then
 		  if test "$ext_shared" = "yes"; then
-		  	ORACLE_SHARED_LIBADD="$ORACLE_SHARED_LIBADD -bI:$ORACLE_DIR/lib/mili.exp"
+		  	ORACLE_SHARED_LIBADD="$ORACLE_SHARED_LIBADD -bI:$ORACLE_DIR/lib64/mili.exp"
 		  else
-		  	LIBS="$LIBS -bI:$ORACLE_DIR/lib/mili.exp"
+		  	LIBS="$LIBS -bI:$ORACLE_DIR/lib64/mili.exp"
 		  fi
 		fi
 	  fi
 	  ;;
 
 	7.2)
-	  if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then
+	  if test -f $ORACLE_DIR/lib64/libclntsh.$SHLIB_SUFFIX_NAME; then
 	    
 
   if test "$ext_shared" = "yes"; then
@@ -70408,9 +70408,9 @@
 
 
 		if test "$ext_shared" = "yes"; then
-		  ORACLE_SHARED_LIBADD="$ORACLE_DIR/lib/osntab.o $ORACLE_SHARED_LIBADD";
+		  ORACLE_SHARED_LIBADD="$ORACLE_DIR/lib64/osntab.o $ORACLE_SHARED_LIBADD";
 		else
-		  LIBS="$ORACLE_DIR/lib/osntab.o $LIBS";
+		  LIBS="$ORACLE_DIR/lib64/osntab.o $LIBS";
 		fi
 	    
 
@@ -70512,7 +70512,7 @@
 	  ;;
 
 	7.3)
-	  if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then
+	  if test -f $ORACLE_DIR/lib64/libclntsh.$SHLIB_SUFFIX_NAME; then
 	    
 
   if test "$ext_shared" = "yes"; then
@@ -75668,7 +75668,7 @@
       PFPRO_INC_DIR=$i
     elif test -r $i/include/$PFPRO_HDR; then
       PFPRO_INC_DIR=$i/include
-    elif test -r $i/lib/$PFPRO_HDR; then
+    elif test -r $i/lib64/$PFPRO_HDR; then
       PFPRO_INC_DIR=$i/lib
     elif test -r $i/bin/$PFPRO_HDR; then
       PFPRO_INC_DIR=$i/bin
@@ -75676,7 +75676,7 @@
 
     if test -r $i/$PFPRO_LIB; then
       PFPRO_LIB_DIR=$i
-    elif test -r $i/lib/$PFPRO_LIB; then
+    elif test -r $i/lib64/$PFPRO_LIB; then
       PFPRO_LIB_DIR=$i/lib
     fi
 
@@ -78921,9 +78921,9 @@
       if test -f $QTDIR/include/qdom.h; then
         QTDOM_LIBDIR=$QTDIR/lib
         QTDOM_INCDIR=$QTDIR/include
-      elif test -f /usr/lib/qt2/include/qdom.h; then
+      elif test -f /usr/lib64/qt2/include/qdom.h; then
         QTDOM_LIBDIR=/usr/lib
-        QTDOM_INCDIR=/usr/lib/qt2/include
+        QTDOM_INCDIR=/usr/lib64/qt2/include
       fi
       ;;
     *)
@@ -79558,7 +79558,7 @@
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  CXXCPP=/lib/cpp
+  CXXCPP=/lib64/cpp
 fi
 rm -f conftest*
   ac_cv_prog_CXXCPP="$CXXCPP"
@@ -83448,7 +83448,7 @@
         test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
       done
       for i in /usr /usr/snmp /usr/local /usr/local/snmp; do
-        test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib
+        test -f $i/lib64/libsnmp.a -o -f $i/lib64/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib
       done
     else
       SNMP_INCDIR=$PHP_SNMP/include
@@ -83734,7 +83734,7 @@
       if test -r $i/include/openssl/evp.h; then
         OPENSSL_INCDIR=$i/include
       fi
-      if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
+      if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then
         OPENSSL_LIBDIR=$i/lib
       fi
       test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
@@ -86828,13 +86828,13 @@
 
 
 if test "$PHP_SWF" != "no"; then
-  if test -r $PHP_SWF/lib/libswf.a; then
+  if test -r $PHP_SWF/lib64/libswf.a; then
     SWF_DIR=$PHP_SWF
   else
     echo $ac_n "checking for libswf in default path""... $ac_c" 1>&6
 echo "configure:86836: checking for libswf in default path" >&5
     for i in /usr/local /usr; do
-      if test -r $i/lib/libswf.a; then
+      if test -r $i/lib64/libswf.a; then
         SWF_DIR=$i
         echo "$ac_t""found in $i" 1>&6
       fi
@@ -91247,7 +91247,7 @@
 
 
     for i in $PHP_XML $PHP_EXPAT_DIR; do
-      if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then
+      if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME ; then
         EXPAT_DIR=$i
       fi
     done
@@ -91511,7 +91511,7 @@
 
   testval=no
   for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
-    if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
+    if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then
       cat >> confdefs.h <<\EOF
 #define HAVE_LIBEXPAT2 1
 EOF
@@ -91809,8 +91809,8 @@
       { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
     fi
   
-    if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a ||
-       test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
+    if test -f $ICONV_DIR/lib64/lib$iconv_lib_name.a ||
+       test -f $ICONV_DIR/lib64/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
     then
       
   save_old_LDFLAGS=$LDFLAGS
@@ -93669,7 +93669,7 @@
 
     found_expat=no
     for i in $PHP_EXPAT_DIR $XSLT_DIR /usr/local /usr; do
-      if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME; then
+      if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then
         cat >> confdefs.h <<\EOF
 #define HAVE_LIBEXPAT2 1
 EOF
@@ -93967,8 +93967,8 @@
       { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=<DIR>" 1>&2; exit 1; }
     fi
   
-    if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a ||
-       test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
+    if test -f $ICONV_DIR/lib64/lib$iconv_lib_name.a ||
+       test -f $ICONV_DIR/lib64/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
     then
       
   save_old_LDFLAGS=$LDFLAGS
@@ -94387,7 +94387,7 @@
      
     if test "$PHP_SABLOT_JS" != "no"; then
       for i in $PHP_SABLOT_JS /usr/local /usr; do
-        if test -f $i/lib/libjs.a -o -f $i/lib/libjs.$SHLIB_SUFFIX_NAME; then
+        if test -f $i/lib64/libjs.a -o -f $i/lib64/libjs.$SHLIB_SUFFIX_NAME; then
           PHP_SABLOT_JS_DIR=$i
           break
         fi
@@ -98636,7 +98636,7 @@
   unset ac_new_flags
   for i in $PHP_LDFLAGS; do
     case $i in
-    -L/usr/lib|-L/usr/lib/) ;;
+    -L/usr/lib|-L/usr/lib64/) ;;
     *) ac_new_flags="$ac_new_flags $i" ;;
     esac
   done
@@ -98646,7 +98646,7 @@
   unset ac_new_flags
   for i in $LDFLAGS; do
     case $i in
-    -L/usr/lib|-L/usr/lib/) ;;
+    -L/usr/lib|-L/usr/lib64/) ;;
     *) ac_new_flags="$ac_new_flags $i" ;;
     esac
   done
@@ -99399,7 +99399,7 @@
     lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
     ;;
   *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+    lt_cv_file_magic_test_file='/usr/lib64/libSystem.dylib'
     ;;
   esac
   ;;
@@ -99412,7 +99412,7 @@
       # Let's accept both of them until this is cleared up.
       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      lt_cv_file_magic_test_file=`echo /usr/lib64/libc.so.*`
       ;;
     esac
   else
@@ -99427,7 +99427,7 @@
 hpux10.20*|hpux11*)
   lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+  lt_cv_file_magic_test_file=/usr/lib64/libc.sl
   ;;
 
 irix5* | irix6* | nonstopux*)
@@ -99460,7 +99460,7 @@
     # glibc up to 2.1.1 does not perform some relocations on ARM
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
   esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+  lt_cv_file_magic_test_file=`echo /lib64/libc.so* /lib64/libc-*.so`
   ;;
 
 netbsd*)
@@ -99474,12 +99474,12 @@
 newos6*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  lt_cv_file_magic_test_file=/usr/lib64/libnls.so
   ;;
 
 openbsd*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+  lt_cv_file_magic_test_file=`echo /usr/lib64/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
   else
@@ -99500,7 +99500,7 @@
 
 solaris*)
   lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
+  lt_cv_file_magic_test_file=/lib64/libc.so
   ;;
 
 sysv5* | sysv4*uw2*)
@@ -99512,7 +99512,7 @@
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    lt_cv_file_magic_test_file=`echo /usr/lib64/libc.so*`
     ;;
   ncr)
     lt_cv_deplibs_check_method=pass_all
@@ -99524,7 +99524,7 @@
   sni)
     lt_cv_file_magic_cmd='/bin/file'
     lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
+    lt_cv_file_magic_test_file=/lib64/libc.so
     ;;
   siemens)
     lt_cv_deplibs_check_method=pass_all
@@ -100337,7 +100337,7 @@
 	# AIX 5 now supports IA64 processor
 	lt_cv_prog_cc_static='-Bstatic'
       else
-	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+	lt_cv_prog_cc_static='-bnso -bI:/lib64/syscalls.exp'
       fi
       ;;
 
@@ -101122,7 +101122,7 @@
   # does not break anything, and helps significantly (at the cost of a little
   # extra space).
   freebsd2.2*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib64/c++rt0.o'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
@@ -101694,7 +101694,7 @@
   # before this can be enabled.
   hardcode_into_libs=yes
 
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # We used to test for /lib64/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
   # most powerpc-linux boxes support dynamic linking these days and
@@ -101783,7 +101783,7 @@
   soname_spec='${libname}${release}.so$major'
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
   shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib64/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
   hardcode_into_libs=yes
   ;;