diff options
author | Thies C. Arntzen <thies@php.net> | 2000-05-08 09:41:37 +0000 |
---|---|---|
committer | Thies C. Arntzen <thies@php.net> | 2000-05-08 09:41:37 +0000 |
commit | 7436c0791bbea1591bd2eeb4ca5bca1cc38ccc74 (patch) | |
tree | ccb401a6ec3c896394e4c98d3c2a646679a9fd22 /ext | |
parent | aaaaf468468c57b414becedeb4a4614e5f097c22 (diff) | |
download | php-git-7436c0791bbea1591bd2eeb4ca5bca1cc38ccc74.tar.gz |
imporved version detection
Diffstat (limited to 'ext')
-rw-r--r-- | ext/oci8/config.m4 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 309ffc0695..d467a0fe0d 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -2,17 +2,20 @@ dnl $Id$ AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) - if test -f "$OCI8_DIR/lib/libclntsh.so.8.0"; then - OCI8_VERSION=8.1 + if test -f "$OCI8_DIR/orainst/unix.rgs"; then + OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` + test -z "$OCI8_VERSION" && OCI8_VERSION=7.3 + elif test -f "$OCI8_DIR/lib/libclntsh.so.8.0"; then + OCI8_VERSION=8.1 elif test -f "$OCI8_DIR/lib/libclntsh.so.1.0"; then - OCI8_VERSION=8.0 + 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 + OCI8_VERSION=8.0 else - AC_MSG_ERROR(Oracle-OCI8 needed libraries not found) + AC_MSG_ERROR(Oracle-OCI8 needed libraries not found) fi AC_MSG_RESULT($OCI8_VERSION) -]) +]) PHP_ARG_WITH(oci8, for Oracle-OCI8 support, [ --with-oci8[=DIR] Include oci8 support. DIR is the ORACLE_HOME.]) |