diff options
| author | Christopher Jones <sixd@php.net> | 2013-06-25 12:00:08 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-06-25 12:00:08 -0700 |
| commit | a52258ae175ea49ac03b8aea21d20c36a67c61e2 (patch) | |
| tree | c0e39de5d0587927129175a9865120d47f994d95 | |
| parent | 38eb909d064ecbbf51d5869a629dae91a6ed9dcf (diff) | |
| parent | 423b132a7a076ff641bd3ab4dc2aa03cd8e4fd1b (diff) | |
| download | php-git-a52258ae175ea49ac03b8aea21d20c36a67c61e2.tar.gz | |
Merge branch 'configure12c' into PHP-5.4
* configure12c:
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
| -rwxr-xr-x | ext/pdo_oci/config.m4 | 4 | ||||
| -rw-r--r-- | ext/pdo_oci/tests/pdo_oci_attr_client.phpt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4 index 309bde8a5f..0e42d1f9a9 100755 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -2,7 +2,7 @@ dnl $Id$ dnl config.m4 for extension pdo_oci dnl vim:et:sw=2:ts=2: -SUPPORTED_LIB_VERS="9.0 10.1 11.1" # This caters for all Oracle 9.x, 10.x and 11.1 installs +SUPPORTED_LIB_VERS="9.0 10.1 11.1 12.1" # The lib vers are not bumped when the DB version is bumped AC_DEFUN([AC_PDO_OCI_VERSION],[ AC_MSG_CHECKING([Oracle version]) for OCI_VER in $SUPPORTED_LIB_VERS; do @@ -147,7 +147,7 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_ fi case $PDO_OCI_VERSION in - 9.0|10.1|10.2|11.1|11.2) + 9.0|10.1|10.2|11.1|11.2|12.1) PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) ;; diff --git a/ext/pdo_oci/tests/pdo_oci_attr_client.phpt b/ext/pdo_oci/tests/pdo_oci_attr_client.phpt index 372ccec8e1..eadb028e0f 100644 --- a/ext/pdo_oci/tests/pdo_oci_attr_client.phpt +++ b/ext/pdo_oci/tests/pdo_oci_attr_client.phpt @@ -18,7 +18,7 @@ $cv = $dbh->getAttribute(PDO::ATTR_CLIENT_VERSION); var_dump($cv); $s = explode(".", $cv); -if ($s[0] >= 10 && count($s) > 1 && $s[1] >= 2) { +if (count($s) > 1 && (($s[0] == 10 && $s[1] >= 2) || $s[0] >= 11)) { if (count($s) != 5) { echo "Wrong number of values in array\nVersion was: "; var_dump($cv); |