Added detection of Oracle 8.1 (aka 8i) from PHP3.

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 7ccd8be3888069015974d6fae0e4afd624ecf8fa..fe1420aefe2cf86a907b4b59439f71cc8787a5c7 100644 (file)
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -7,7 +7,12 @@ AC_DEFUN(AC_ORACLE_VERSION,[
        ORACLE_VERSION=`grep '"ocommon"' $ORACLEINST_TOP/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
     test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
   else
-    ORACLE_VERSION=8.0
+    if test -f "$ORACLEINST_TOP/lib/libclntsh.so.8.0"
+    then
+       ORACLE_VERSION=8.1
+    else
+       ORACLE_VERSION=8.0
+    fi
   fi
   AC_MSG_RESULT($ORACLE_VERSION)
 ])
@@ -143,6 +148,10 @@ AC_ARG_WITH(oci8,
        fi
         AC_DEFINE(HAVE_OCI8)
        ;;
+      8.1)
+       ORACLE_SHLIBS="-lclntsh $ORA_SYSLIB"
+       AC_DEFINE(HAVE_OCI8)
+       ;;
       *)
        ORACLE_SHLIBS=
        ;;

diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4
index d33b2f5f8832340416a45ff4fe3df9f9d5f48ce9..5cf465bee402a0d471603f1d643b64effd6b8435 100644 (file)
--- a/ext/oracle/config.m4
+++ b/ext/oracle/config.m4
@@ -7,7 +7,12 @@ AC_DEFUN(AC_ORACLE_VERSION,[
        ORACLE_VERSION=`grep '"ocommon"' $ORACLEINST_TOP/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
     test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
   else
-    ORACLE_VERSION=8.0
+    if test -f "$ORACLEINST_TOP/lib/libclntsh.so.8.0"
+    then
+       ORACLE_VERSION=8.1
+    else
+       ORACLE_VERSION=8.0
+    fi
   fi
   AC_MSG_RESULT($ORACLE_VERSION)
 ])
@@ -143,6 +148,10 @@ AC_ARG_WITH(oracle,
        fi
         AC_DEFINE(HAVE_OCI8)
        ;;
+      8.1)
+       ORACLE_SHLIBS="-lclntsh $ORA_SYSLIB"
+       AC_DEFINE(HAVE_OCI8)
+       ;;
       *)
        ORACLE_SHLIBS=
        ;;