Index: ext/oci8/config.m4
===================================================================
RCS file: /repository/php-src/ext/oci8/config.m4,v
retrieving revision 1.55.2.3.2.11.2.1
diff -u -r1.55.2.3.2.11.2.1 config.m4
--- ext/oci8/config.m4	13 Nov 2007 11:09:42 -0000	1.55.2.3.2.11.2.1
+++ ext/oci8/config.m4	29 Nov 2007 22:43:58 -0000
@@ -308,12 +308,18 @@
   
 elif test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
 
+  AC_CHECK_SIZEOF(long int, 4)
+  LIBDIR_SUFFIX=""
+  if test "$ac_cv_sizeof_long_int" = "8" ; then
+    LIBDIR_SUFFIX=64
+  fi
+
   AC_MSG_CHECKING([Oracle Instant Client directory])
   if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then
 dnl Generally the Instant Client can be anywhere so the user must pass in the
 dnl directory to the libraries.  But on Linux we default to the most recent
 dnl version in /usr/lib
-    PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client/lib  2> /dev/null | tail -1`
+    PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${LIBDIR_SUFFIX}/lib 2> /dev/null | tail -1`
     if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
       AC_MSG_ERROR([Oracle Instant Client directory not found. Try --with-oci8=instantclient,DIR])
     fi
@@ -325,7 +331,7 @@
   AC_MSG_CHECKING([Oracle Instant Client SDK header directory])
 
 dnl Header directory for Instant Client SDK RPM install
-  OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client/lib[/]*$!/usr/include/oracle/\1/client!'`
+  OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client${LIBDIR_SUFFIX}/lib[/]*$!/usr/include/oracle/\1/client${LIBDIR_SUFFIX}!'`
 
 dnl Header directory for Instant Client SDK zip file install
   OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include