summaryrefslogtreecommitdiff
path: root/ext/oracle
diff options
context:
space:
mode:
authorStefan Roehrich <sr@php.net>1999-09-03 19:04:35 +0000
committerStefan Roehrich <sr@php.net>1999-09-03 19:04:35 +0000
commitc1a4861eb1b4b5c048bf2ca4cc1acc32fd47d227 (patch)
treea1e55125be11d939e527859103daae06e00a5dd1 /ext/oracle
parentf72897c29d6168b23399ff0c9721c815c7f7261c (diff)
downloadphp-git-c1a4861eb1b4b5c048bf2ca4cc1acc32fd47d227.tar.gz
Added detection of Oracle 8.1 (aka 8i) from PHP3.
Diffstat (limited to 'ext/oracle')
-rw-r--r--ext/oracle/config.m411
1 files changed, 10 insertions, 1 deletions
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=
;;