Index: config.m4
===================================================================
RCS file: /repository/pecl/oci8/config.m4,v
retrieving revision 1.56
diff -u -p -d -r1.56 config.m4
--- config.m4	6 Sep 2005 19:31:59 -0000	1.56
+++ config.m4	29 Nov 2005 13:08:08 -0000
@@ -290,7 +290,11 @@ elif test "$PHP_OCI8" != "no" && test "$
 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`
+    if test -z "$PHP_LIBDIR"; then
+      PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/$PHP_LIBDIR/oracle/*/client/$PHP_LIBDIR  2> /dev/null | tail -1`
+    else
+      PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client/lib  2> /dev/null | tail -1`
+    fi
     if test -z "$PHP_OCI8_INSTANT_CLIENT"; then
       AC_MSG_ERROR([Oracle Instant Client directory not found. Try --with-oci8=instantclient,DIR])
     fi
@@ -302,14 +306,38 @@ dnl version in /usr/lib
   AC_MSG_CHECKING([Oracle Instant Client SDK header directory])
 
 dnl Header directory for Instant Client SDK RPM install
-  OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e 's!^/usr/lib/oracle/\(.*\)/client/lib[[/]]*$!/usr/include/oracle/\1/client!'`
+  if test -z "$PHP_LIBDIR"; then
+    include_regex='s!^/usr/lib/oracle/\(.*\)/client/lib[/]*$!/usr/include/oracle/\1/client!';
+    include64_regex='s!^/usr/lib64/oracle/\(.*\)/client/lib64[/]*$!/usr/include/oracle/\1/client!';
+  else
+    include_regex=`echo 's!^/usr/'${PHP_LIBDIR}'/oracle/\(.*\)/client/'${PHP_LIBDIR}'[/]*$!/usr/include/oracle/\1/client!'`;
+  fi
+
+  OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e "$include_regex"`
+ 
+dnl check lib64 too. this is valid only for PHP < 5.1
+  if test -z "$OCISDKRPMINC" && test -z "$PHP_LIBDIR"; then
+    OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e "$include64_regex"`
+  fi
 
 dnl Header directory for Instant Client SDK zip file install
   OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include
 
 dnl Header directory for manual installation
-  OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e 's!\(.*\)/lib[[/]]*$!\1/include!'`
+  if test -z "$PHP_LIBDIR"; then
+    include_regex='s!\(.*\)/lib[[/]]*$!\1/include!'
+    include64_regex='s!\(.*\)/lib64[[/]]*$!\1/include!'
+  else
+    include_regex=`echo 's!\(.*\)/'$PHP_LIBDIR'[[/]]*$!\1/include!'`
+  fi
   
+  OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e "$include_regex"`
+
+dnl check lib64 too. this is valid only for PHP < 5.1
+  if test -z "$OCISDKMANINC" && test -z "$PHP_LIBDIR"; then
+    OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | sed -e "$include64_regex"`
+  fi
+ 
   if test -f "$OCISDKRPMINC/oci.h"; then
     AC_MSG_RESULT($OCISDKRPMINC)
     PHP_ADD_INCLUDE($OCISDKRPMINC)