summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2001-02-14 21:41:40 +0000
committerfoobar <sniper@php.net>2001-02-14 21:41:40 +0000
commit28b2869ac863efb2477a9410b7ec6c9ccef6b58d (patch)
tree6ff9505f5b5ba49941e8abb7efeae0fdd7f49c54
parent0450aecb8c758692f49dda06b9c91b252fec35cb (diff)
downloadphp-git-28b2869ac863efb2477a9410b7ec6c9ccef6b58d.tar.gz
This should make detecting the version of Oracle libs a bit more accurate
to avoid the 'missing libcore4' errors. (e.g. on AIX) Bug reports: #9027, #8905
-rw-r--r--ext/oci8/config.m412
-rw-r--r--ext/oracle/config.m48
2 files changed, 14 insertions, 6 deletions
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index b9c79df155..d832b52d8b 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -9,8 +9,12 @@ AC_DEFUN(AC_OCI8_VERSION,[
OCI8_VERSION=8.1
elif test -f $OCI8_DIR/lib/libclntsh.s?.1.0; then
OCI8_VERSION=8.0
- elif test -f $OCI8_DIR/lib/libclntsh.a; then # AIX - XXX is this check still right for 8.1?
- OCI8_VERSION=8.0
+ elif test -f $OCI8_DIR/lib/libclntsh.a; then
+ if test -f $OCI8_DIR/lib/libcore4.a; then
+ OCI8_VERSION=8.0
+ else
+ OCI8_VERSION=8.1
+ fi
else
AC_MSG_ERROR(Oracle-OCI8 needed libraries not found)
fi
@@ -78,7 +82,7 @@ if test "$PHP_OCI8" != "no"; then
PHP_EXTENSION(oci8, $ext_shared)
AC_DEFINE(HAVE_OCI8,1,[ ])
- PHP_SUBST(OCI8_SHARED_LIBADD)
- PHP_SUBST(OCI8_DIR)
+ PHP_SUBST_OLD(OCI8_SHARED_LIBADD)
+ PHP_SUBST_OLD(OCI8_DIR)
PHP_SUBST_OLD(OCI8_VERSION)
fi
diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4
index 7fed23f385..1a720108cf 100644
--- a/ext/oracle/config.m4
+++ b/ext/oracle/config.m4
@@ -9,8 +9,12 @@ AC_DEFUN(AC_ORACLE_VERSION,[
ORACLE_VERSION=8.1
elif test -f $ORACLE_DIR/lib/libclntsh.s?.1.0; then
ORACLE_VERSION=8.0
- elif test -f $ORACLE_DIR/lib/libclntsh.a; then # AIX - XXX is this check still right for 8.1?
- ORACLE_VERSION=8.0
+ elif test -f $OCI8_DIR/lib/libclntsh.a; then
+ if test -f $OCI8_DIR/lib/libcore4.a; then
+ OCI8_VERSION=8.0
+ else
+ OCI8_VERSION=8.1
+ fi
else
AC_MSG_ERROR(Oracle needed libraries not found)
fi