diff options
| author | Christopher Jones <sixd@php.net> | 2007-08-10 07:01:47 +0000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2007-08-10 07:01:47 +0000 |
| commit | decd278a8da73bd21d1bd759eeef367a8dbc2c7c (patch) | |
| tree | 892ff8d7209049b09570d8b5ce41287b4ad7a9b3 | |
| parent | 9bdaf6ab5577226451e73122cc088758a332c69a (diff) | |
| download | php-git-decd278a8da73bd21d1bd759eeef367a8dbc2c7c.tar.gz | |
pdo_oci: MFH with Ilia's OK: changes to build with Oracle Database 11g
| -rwxr-xr-x | ext/pdo_oci/config.m4 | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4 index ff927ed520..294257e1b6 100755 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -7,6 +7,8 @@ AC_DEFUN([AC_PDO_OCI_VERSION],[ if test -s "$PDO_OCI_DIR/orainst/unix.rgs"; then PDO_OCI_VERSION=`grep '"ocommon"' $PDO_OCI_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$PDO_OCI_VERSION" && PDO_OCI_VERSION=7.3 + elif test -f $PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then + PDO_OCI_VERSION=11.1 elif test -f $PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then PDO_OCI_VERSION=10.1 elif test -f $PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then @@ -152,13 +154,19 @@ You need to tell me where to find your oracle SDK, or set ORACLE_HOME. 9.0) PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) ;; - + 10.1) PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) ;; + 10.2) PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) ;; + + 11.1) + PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) + ;; + *) AC_MSG_ERROR(Unsupported Oracle version! $PDO_OCI_VERSION) ;; @@ -243,7 +251,6 @@ You need to tell me where to find your oracle SDK, or set ORACLE_HOME. [ PHP_ADD_EXTENSION_DEP(pdo_oci, pdo) ]) - fi fi |