Patch config.m4.deb.patch for PDO OCI Bug #54451

Patch version 2011-04-05 19:00 UTC

• 2011-04-05 19:00 UTC [diff to current]
• 2011-04-02 10:04 UTC [diff to current]

Developer: schkovich@gmail.com

# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
--- /home/schkovich/NetBeansProjects/pdo_oci/config.m4
+++ /home/schkovich/NetBeansProjects/LazyLoad/config.m4
@@ -208,20 +208,29 @@
     -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
   ])
 
-  ifdef([PHP_CHECK_PDO_INCLUDES],
+  ifdef([PHP_CHECK_PDO_INCLUDES_CV],
   [
-    PHP_CHECK_PDO_INCLUDES
+    PHP_CHECK_PDO_INCLUDES_CV
   ],[
     AC_MSG_CHECKING([for PDO includes])
     if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
       pdo_inc_path=$abs_srcdir/ext
     elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
       pdo_inc_path=$abs_srcdir/ext
-    elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-      pdo_inc_path=$prefix/include/php/ext
     else
+      AC_MSG_CHECKING(for PDO in default path)
+      for i in $prefix/include/ph??; do
+        if test -r $i/ext/pdo/php_pdo_driver.h; then
+          pdo_inc_path=$i/ext
+          AC_MSG_RESULT(found in $i)
+          break
+        fi
+      done
+      if test -z "$pdo_inc_path"; then
+        AC_MSG_RESULT(not found)
       AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
     fi
+    fi
     AC_MSG_RESULT($pdo_inc_path)
   ])