php.net |  support |  documentation |  report a bug |  advanced search |  search howto |  statistics |  random bug |  login
Return to Bug #44989
Patch pdo_oci-64bit-5.3 revision 2010-08-16 21:11 UTC by jbnance at tresgeek dot net
Patch pdo_oci-64bit revision 2010-08-03 23:15 UTC by jbnance at tresgeek dot net
revision 2010-08-03 23:13 UTC by jbnance at tresgeek dot net
revision 2010-08-03 22:57 UTC by jbnance at tresgeek dot net

Patch pdo_oci-64bit for PDO OCI Bug #44989

Patch version 2010-08-03 23:15 UTC

Return to Bug #44989 | Download this patch
This patch renders other patches obsolete

Obsolete patches:

Patch Revisions: 2010-08-03 23:15 UTC | 2010-08-03 23:13 UTC | 2010-08-03 22:57 UTC

Developer: jbnance@tresgeek.net



  --- php-5.2.12/ext/pdo_oci/config.m4-no64	2009-11-29 06:13:22.000000000 +0000
 +++ php-5.2.12/ext/pdo_oci/config.m4	2010-08-03 22:28:44.000000000 +0000
 @@ -79,32 +79,40 @@
 +++ php-5.2.12/ext/pdo_oci/config.m4	2010-08-03 23:12:07.000000000 +0000
 @@ -79,28 +79,34 @@
     fi
   
     if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
  +    AC_CHECK_SIZEOF(long int, 4)
Line 34 (now 34), was 11 lines, now 9 lines

  +    elif test -f $PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include/oci.h ; then
  +      PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include)
  +      AC_MSG_RESULT($PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/include)
       else
 -      AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
 +dnl      AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
 +      AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install 1 $PDO_OCI_CLIENT_DIR])
        AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
       fi
  -    if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.so" ; then
  -      PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
  -    elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then
Line 49 (now 47), was 10 lines, now 4 lines

  +      PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/$PDO_OCI_CLIENT_DIR/lib"
       elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then
         PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX"
       else
 -      AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your Instant Client install])
 +dnl      AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your Instant Client install])
 +      AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your Instant Client install 2 $PDO_OCI_CLIENT_DIR])
      fi
      PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
    else
 
PHP Copyright © 2001-2024 The PHP Group
All rights reserved.
Last updated: Fri Mar 29 05:01:28 2024 UTC