cvs: /php4/ext/oci8 config.m4 /php4/ext/oracle config.m4

sr Fri Sep 3 15:04:34 1999 EDT Modified files: /php4/ext/oci8 config.m4 /php4/ext/oracle config.m4 Log: Added detection of Oracle 8.1 (aka 8i) from PHP3. Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.1 php4/ext/oci8/config.m4:1.2 --- php4/ext/oci8/config.m4:1.1 Wed May 12 10:21:37 1999 +++ php4/ext/oci8/config.m4 Fri Sep 3 15:04:34 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1 1999/05/12 14:21:37 thies Exp $ +dnl $Id: config.m4,v 1.2 1999/09/03 19:04:34 sr Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -7,7 +7,12 @@ 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 @@ fi AC_DEFINE(HAVE_OCI8) ;; + 8.1) + ORACLE_SHLIBS="-lclntsh $ORA_SYSLIB" + AC_DEFINE(HAVE_OCI8) + ;; *) ORACLE_SHLIBS= ;; Index: php4/ext/oracle/config.m4 diff -u php4/ext/oracle/config.m4:1.2 php4/ext/oracle/config.m4:1.3 --- php4/ext/oracle/config.m4:1.2 Fri Apr 30 14:02:08 1999 +++ php4/ext/oracle/config.m4 Fri Sep 3 15:04:34 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/04/30 18:02:08 thies Exp $ +dnl $Id: config.m4,v 1.3 1999/09/03 19:04:34 sr Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) @@ -7,7 +7,12 @@ 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 @@ fi AC_DEFINE(HAVE_OCI8) ;; + 8.1) + ORACLE_SHLIBS="-lclntsh $ORA_SYSLIB" + AC_DEFINE(HAVE_OCI8) + ;; *) ORACLE_SHLIBS= ;;