--- config.m4.bak       2008-07-30 15:11:36.521797900 -0400
+++ config.m4   2008-07-30 15:16:44.526444081 -0400
@@ -143,7 +143,21 @@
   fi
 fi

-PHP_OCI8_INSTANT_CLIENT="no"
+dnl PHP_OCI8_INSTANT_CLIENT="no"
+AC_CHECK_SIZEOF(long int, 4)
+LIBDIR_SUFFIX=""
+if test "$ac_cv_sizeof_long_int" = "8" ; then
+   LIBDIR_SUFFIX=64
+fi
+
+dnl Find the directory if user specified "instantclient" but did not give a dir.
+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${LIBDIR_SUFFIX}/lib 2> /dev/null | tail -1`
+if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
+       PHP_OCI8_INSTANT_CLIENT="no"
+fi

 if test "`echo $PHP_OCI8`" = "instantclient"; then
     PHP_OCI8_INSTANT_CLIENT="yes"