MFB: PECL #13523 (x86_64 build) and versioning sync

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 6dfc647a26909440b02e0ac94cf7fbd4b5e7f6f9..78454fc83168f25d774d8fcfad92ae357648c053 100644 (file)
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -55,7 +55,7 @@ AC_DEFUN([AC_OCI8IC_VERSION],[
       if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
         AC_MSG_ERROR([Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.11.1 not found])
       fi
-      OCI8_VERSION=11.1
+      OCI8_ORACLE_VERSION=11.1
     else
       AC_MSG_ERROR([Oracle Instant Client library version not supported])
     fi
@@ -64,42 +64,42 @@ AC_DEFUN([AC_OCI8IC_VERSION],[
       if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
         AC_MSG_ERROR([Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found])
       fi
-      OCI8_VERSION=10.1
+      OCI8_ORACLE_VERSION=10.1
     else
       AC_MSG_ERROR([Oracle Instant Client library version not supported])
     fi
   else
     AC_MSG_ERROR([Oracle Instant Client libraries not found])
   fi
-  AC_MSG_RESULT([$OCI8_VERSION])
+  AC_MSG_RESULT([$OCI8_ORACLE_VERSION])
 ])
 
 
-AC_DEFUN([AC_OCI8_VERSION],[
+AC_DEFUN([AC_OCI8_ORACLE_VERSION],[
   AC_MSG_CHECKING([Oracle version])
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
-    OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
-    test -z "$OCI8_VERSION" && OCI8_VERSION=7.3
+    OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
+    test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3
   elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
-    OCI8_VERSION=11.1
+    OCI8_ORACLE_VERSION=11.1
   elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
-    OCI8_VERSION=10.1    
+    OCI8_ORACLE_VERSION=10.1    
   elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
-    OCI8_VERSION=9.0
+    OCI8_ORACLE_VERSION=9.0
   elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
-    OCI8_VERSION=8.1
+    OCI8_ORACLE_VERSION=8.1
   elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
-    OCI8_VERSION=8.0
+    OCI8_ORACLE_VERSION=8.0
   elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.a; then 
     if test -f $OCI8_DIR/$OCI8_LIB_DIR/libcore4.a; then 
-      OCI8_VERSION=8.0
+      OCI8_ORACLE_VERSION=8.0
     else
-      OCI8_VERSION=8.1
+      OCI8_ORACLE_VERSION=8.1
     fi
   else
     AC_MSG_ERROR(Oracle-OCI8 needed libraries not found)
   fi
-  AC_MSG_RESULT($OCI8_VERSION)
+  AC_MSG_RESULT($OCI8_ORACLE_VERSION)
 ])
 
 
@@ -134,8 +134,8 @@ if test "$PHP_OCI8" != "no"; then
   IFS=$ac_IFS
   oci8_php_version=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
 
-  if test "$oci8_php_version" -le "4003010"; then
-    AC_MSG_ERROR([You need at least PHP 4.3.10 to be able to use this version of OCI8. PHP $php_version found])
+  if test "$oci8_php_version" -lt "6000000"; then
+    AC_MSG_ERROR([You need at least PHP 6.0.0 to be able to use this version of OCI8. PHP $php_version found])
   else
     AC_MSG_RESULT([$php_version, ok])
   fi
@@ -200,14 +200,10 @@ if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
     PHP_EVAL_LIBLINE(`cat $OCI8_DIR/rdbms/$OCI8_LIB_DIR/sysliblist`, OCI8_SYSLIB)
   fi
 
-  AC_OCI8_VERSION($OCI8_DIR)
+  AC_OCI8_ORACLE_VERSION($OCI8_DIR)
 
-  case $OCI8_VERSION in
-    8.0)
-      AC_MSG_ERROR([Oracle client libraries < 9.0 are not supported any more. Please consider upgrading.])
-      ;;
-
-    8.1)
+  case $OCI8_ORACLE_VERSION in
+    7.3|8.0|8.1)
       AC_MSG_ERROR([Oracle client libraries < 9.0 are not supported any more. Please consider upgrading.])
       ;;
 
@@ -221,7 +217,7 @@ if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
         PHP_CHECK_LIBRARY(clntsh, OCINlsCharSetNameToId,
         [
           AC_DEFINE(HAVE_OCI_ENV_NLS_CREATE,1,[ ])
-          OCI8_VERSION=9.2
+          OCI8_ORACLE_VERSION=9.2
         ], [], [
           -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
         ])
@@ -249,7 +245,6 @@ if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
       ], [], [
         -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD
       ])
- 
       ;;
       
     11.1|10.1)
@@ -262,8 +257,9 @@ if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
       AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ])
       AC_DEFINE(PHP_OCI8_HAVE_COLLECTIONS,1,[ ])
       ;;
+
     *)
-      AC_MSG_ERROR([Oracle version $OCI8_VERSION is not supported])
+      AC_MSG_ERROR([Oracle version $OCI8_ORACLE_VERSION is not supported])
       ;;
   esac
 
@@ -304,7 +300,7 @@ if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
 
   PHP_SUBST_OLD(OCI8_SHARED_LIBADD)
   PHP_SUBST_OLD(OCI8_DIR)
-  PHP_SUBST_OLD(OCI8_VERSION)
+  PHP_SUBST_OLD(OCI8_ORACLE_VERSION)
   
 elif test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
 
@@ -332,7 +328,7 @@ dnl version in /usr/lib
   AC_MSG_CHECKING([Oracle Instant Client SDK header directory])
 
 dnl Header directory for Instant Client SDK RPM install
-  OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client/lib[/]*$!/usr/include/oracle/\1/client!'`
+  OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${LIBDIR_SUFFIX}'\)*/lib[/]*$!/usr/include/oracle/\1/client\2!'`
 
 dnl Header directory for Instant Client SDK zip file install
   OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include
@@ -362,7 +358,7 @@ dnl Header directory for manual installation
   fi
 
   AC_OCI8IC_VERSION($PHP_OCI8_INSTANT_CLIENT)
-  case $OCI8_VERSION in
+  case $OCI8_ORACLE_VERSION in
     11.1|10.1)
       PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
       PHP_ADD_LIBPATH($PHP_OCI8_INSTANT_CLIENT, OCI8_SHARED_LIBADD)
@@ -386,6 +382,6 @@ dnl Header directory for manual installation
 
   PHP_SUBST_OLD(OCI8_SHARED_LIBADD)
   PHP_SUBST_OLD(OCI8_DIR)
-  PHP_SUBST_OLD(OCI8_VERSION)
+  PHP_SUBST_OLD(OCI8_ORACLE_VERSION)
  
 fi