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

Patch version 2011-04-02 10:04 UTC

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/Downloads/config.m4
  +++ /home/schkovich/NetBeansProjects/LazyLoad/config.m4
 @@ -208,20 +208,29 @@
 @@ -199,9 +199,9 @@
       -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
     ])
   
  -  ifdef([PHP_CHECK_PDO_INCLUDES],
Line 15 (now 15), was 26 lines, now 18 lines

  +    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
 @@ -210,6 +210,8 @@
         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
      elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
        pdo_inc_path=$prefix/include/php/ext
 +    elif test -f $prefix/include/php5/ext/pdo/php_pdo_driver.h; then
 +      pdo_inc_path=$prefix/include/php5/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)
    ])
 @@ -229,4 +231,3 @@
   
    AC_DEFINE_UNQUOTED(PHP_PDO_OCI_CLIENT_VERSION, "$PDO_OCI_VERSION", [ ])
  fi
 -