sniper Wed Feb 14 13:41:40 2001 EDT
Modified files:
/php4/ext/oci8 config.m4
/php4/ext/oracle config.m4
Log:
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
Index: php4/ext/oci8/config.m4
diff -u php4/ext/oci8/config.m4:1.24 php4/ext/oci8/config.m4:1.25
--- php4/ext/oci8/config.m4:1.24 Wed Dec 20 09:21:36 2000
+++ php4/ext/oci8/config.m4 Wed Feb 14 13:41:39 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.24 2000/12/20 17:21:36 sas Exp $
+dnl $Id: config.m4,v 1.25 2001/02/14 21:41:39 sniper Exp $
AC_DEFUN(AC_OCI8_VERSION,[
AC_MSG_CHECKING([Oracle version])
@@ -9,8 +9,12 @@
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 @@
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
Index: php4/ext/oracle/config.m4
diff -u php4/ext/oracle/config.m4:1.18 php4/ext/oracle/config.m4:1.19
--- php4/ext/oracle/config.m4:1.18 Wed Dec 20 09:21:36 2000
+++ php4/ext/oracle/config.m4 Wed Feb 14 13:41:39 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.18 2000/12/20 17:21:36 sas Exp $
+dnl $Id: config.m4,v 1.19 2001/02/14 21:41:39 sniper Exp $
AC_DEFUN(AC_ORACLE_VERSION,[
AC_MSG_CHECKING([Oracle version])
@@ -9,8 +9,12 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
