php-oracle-instantclient.patch

   1 --- php-5.3.3/ext/oci8/config.m4.orig   2010-06-25 23:18:09.000000000 +0200
   2 +++ php-5.3.3/ext/oci8/config.m4        2010-09-10 19:37:23.484315002 +0200
   3 @@ -304,6 +304,9 @@
   4
   5      AC_MSG_CHECKING([Oracle Instant Client SDK header directory])
   6
   7 +    dnl Header directory for Instant Client SDK PLD RPM install
   8 +    OCISDKPLDINC=$PHP_OCI8_INSTANT_CLIENT/../include/oracle/client
   9 +
  10      dnl Header directory for Instant Client SDK RPM install
  11      OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'`
  12
  13 @@ -313,7 +316,11 @@
  14      dnl Header directory for manual installation
  15      OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib[/]*$!\1/include!'`
  16
  17 -    if test -f "$OCISDKRPMINC/oci.h"; then
  18 +    if test -f "$OCISDKPLDINC/oci.h"; then
  19 +      AC_MSG_RESULT($OCISDKPLDINC)
  20 +      PHP_ADD_INCLUDE($OCISDKPLDINC)
  21 +      OCI8INCDIR=$OCISDKPLDINC
  22 +    elif test -f "$OCISDKRPMINC/oci.h"; then
  23        AC_MSG_RESULT($OCISDKRPMINC)
  24        PHP_ADD_INCLUDE($OCISDKRPMINC)
  25        OCI8INCDIR=$OCISDKRPMINC
  26 --- php-5.4.0alpha2/ext/pdo_oci/config.m4~      2011-08-07 12:46:31.000000000 +0300
  27 +++ php-5.4.0alpha2/ext/pdo_oci/config.m4       2011-08-07 12:48:24.712839499 +0300
  28 @@ -6,8 +6,10 @@
  29  AC_DEFUN([AC_PDO_OCI_VERSION],[
  30    AC_MSG_CHECKING([Oracle version])
  31    for OCI_VER in $SUPPORTED_LIB_VERS; do
  32 -    if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
  33 +    if test -f $1/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
  34        PDO_OCI_VERSION="$OCI_VER"
  35 +    elif test -f $1/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
  36 +      PDO_OCI_VERSION="$OCI_VER"
  37      fi
  38    done
  39    if test -z "$PDO_OCI_VERSION"; then
  40 @@ -103,6 +103,9 @@
  41      elif test -f $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include/oci.h ; then
  42        PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include)
  43        AC_MSG_RESULT($PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include)
  44 +    elif test -f $PDO_OCI_IC_PREFIX/../include/oracle/client/oci.h ; then
  45 +      PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/../include/oracle/client)
  46 +      AC_MSG_RESULT($PDO_OCI_IC_PREFIX/../include/oracle/client)
  47      else
  48        AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
  49      fi
  50 @@ -103,7 +103,12 @@
  51      else
  52        AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your Instant Client install])
  53      fi
  54 -    PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
  55 +    __PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
  56 +    if test -n "$__PDO_OCI_VERSION" ; then
  57 +      PDO_OCI_VERSION=$__PDO_OCI_VERSION
  58 +    else
  59 +      AC_PDO_OCI_VERSION($PDO_OCI_IC_PREFIX)
  60 +    fi
  61    else
  62      AC_PDO_OCI_CHECK_LIB_DIR($PDO_OCI_DIR)
  63