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

sniper Sat Oct 28 21:36:32 2000 EDT Modified files: /php4/ext/oci8 config.m4 /php4/ext/oracle config.m4 Log: Check also that the file isn't empty. Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.22 php4/ext/oci8/config.m4:1.23 --- php4/ext/oci8/config.m4:1.22 Sat Oct 28 21:10:06 2000 +++ php4/ext/oci8/config.m4 Sat Oct 28 21:36:32 2000 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.22 2000/10/29 04:10:06 sniper Exp $ +dnl $Id: config.m4,v 1.23 2000/10/29 04:36:32 sniper Exp $ AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) - if test -f "$OCI8_DIR/orainst/unix.rgs"; then + if test -s "$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 Index: php4/ext/oracle/config.m4 diff -u php4/ext/oracle/config.m4:1.16 php4/ext/oracle/config.m4:1.17 --- php4/ext/oracle/config.m4:1.16 Sat Oct 28 21:10:06 2000 +++ php4/ext/oracle/config.m4 Sat Oct 28 21:36:32 2000 @@ -1,8 +1,8 @@ -dnl $Id: config.m4,v 1.16 2000/10/29 04:10:06 sniper Exp $ +dnl $Id: config.m4,v 1.17 2000/10/29 04:36:32 sniper Exp $ AC_DEFUN(AC_ORACLE_VERSION,[ AC_MSG_CHECKING([Oracle version]) - if test -f "$ORACLE_DIR/orainst/unix.rgs"; then + 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.s?.8.0; then