From: Stefan Roehrich <sr@php.net>
Date: Fri, 3 Sep 1999 19:04:35 +0000 (+0000)
Subject: Added detection of Oracle 8.1 (aka 8i) from PHP3.
X-Git-Tag: PRE_DELAYED_ARRAY_FETCH_PATCH~238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1a4861eb1b4b5c048bf2ca4cc1acc32fd47d227;p=php

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

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 7ccd8be388..fe1420aefe 100644
--- 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 d33b2f5f88..5cf465bee4 100644
--- 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=
   	;;