cvs: php4 /ext/oracle config.m4
| From: | Thies C. Arntzen | Date: | Mon, 04 Feb 2002 12:08:40 +0000 |
| Subject: | cvs: php4 /ext/oracle config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9258@lists.php.net to get a copy of this message | ||
thies Mon Feb 4 07:08:40 2002 EDT
Modified files:
/php4/ext/oracle config.m4
Log:
add oracle 9 detection for oracle-module
Index: php4/ext/oracle/config.m4
diff -u php4/ext/oracle/config.m4:1.27 php4/ext/oracle/config.m4:1.28
--- php4/ext/oracle/config.m4:1.27 Fri Nov 30 13:59:49 2001
+++ php4/ext/oracle/config.m4 Mon Feb 4 07:08:39 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.27 2001/11/30 18:59:49 sniper Exp $
+dnl $Id: config.m4,v 1.28 2002/02/04 12:08:39 thies Exp $
dnl
AC_DEFUN(AC_ORACLE_VERSION,[
@@ -7,6 +7,8 @@
if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
ORACLE_VERSION=
grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed
's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4
test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
+ elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
+ ORACLE_VERSION=9.0
elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
ORACLE_VERSION=8.1
elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then
@@ -140,7 +142,7 @@
PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
;;
- 8.1)
+ 8.1|9.0)
PHP_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD)
PHP_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
;;