cvs: php4 /ext/oci8/ config.m4 /ext/oracle/ config.m4

thies Mon May 15 12:01:51 2000 EDT Modified files: /php4/ext/oci8 config.m4 /php4/ext/oracle config.m4 Log: fix .sl <-> .so recognition Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.16 php4/ext/oci8/config.m4:1.17 --- php4/ext/oci8/config.m4:1.16 Mon May 15 09:24:08 2000 +++ php4/ext/oci8/config.m4 Mon May 15 12:01:50 2000 @@ -1,15 +1,15 @@ -dnl $Id: config.m4,v 1.16 2000/05/15 07:24:08 thies Exp $ +dnl $Id: config.m4,v 1.17 2000/05/15 10:01:50 thies Exp $ AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) 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.s?.8.0"; then + elif test -f $OCI8_DIR/lib/libclntsh.s?.8.0; then OCI8_VERSION=8.1 - elif test -f "$OCI8_DIR/lib/libclntsh.s?.1.0"; then + 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? + elif test -f $OCI8_DIR/lib/libclntsh.a; then # AIX - XXX is this check still right for 8.1? OCI8_VERSION=8.0 else AC_MSG_ERROR(Oracle-OCI8 needed libraries not found) Index: php4/ext/oracle/config.m4 diff -u php4/ext/oracle/config.m4:1.10 php4/ext/oracle/config.m4:1.11 --- php4/ext/oracle/config.m4:1.10 Mon May 15 09:24:08 2000 +++ php4/ext/oracle/config.m4 Mon May 15 12:01:51 2000 @@ -1,15 +1,15 @@ -dnl $Id: config.m4,v 1.10 2000/05/15 07:24:08 thies Exp $ +dnl $Id: config.m4,v 1.11 2000/05/15 10:01:51 thies Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) if test -f "$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.s?.8.0"; then + elif test -f $ORACLE_DIR/lib/libclntsh.s?.8.0; then ORACLE_VERSION=8.1 - elif test -f "$ORACLE_DIR/lib/libclntsh.s?.1.0"; then + 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? + elif test -f $ORACLE_DIR/lib/libclntsh.a; then # AIX - XXX is this check still right for 8.1? ORACLE_VERSION=8.0 else AC_MSG_ERROR(Oracle needed libraries not found)