cvs: php4 /ext/oci8 config.m4

sniper Tue Aug 20 08:01:25 2002 EDT Modified files: /php4/ext/oci8 config.m4 Log: remove tabs Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.35 php4/ext/oci8/config.m4:1.36 --- php4/ext/oci8/config.m4:1.35 Tue Aug 20 03:26:50 2002 +++ php4/ext/oci8/config.m4 Tue Aug 20 08:01:24 2002 @@ -1,18 +1,18 @@ dnl -dnl $Id: config.m4,v 1.35 2002/08/20 07:26:50 edink Exp $ +dnl $Id: config.m4,v 1.36 2002/08/20 12:01:24 sniper Exp $ dnl AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) 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 + 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.$SHLIB_SUFFIX_NAME.9.0; then - OCI8_VERSION=9.0 + OCI8_VERSION=9.0 elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then - OCI8_VERSION=8.1 + OCI8_VERSION=8.1 elif test -f $OCI8_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.1.0; then - OCI8_VERSION=8.0 + 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 @@ -32,50 +32,50 @@ if test "$PHP_OCI8" != "no"; then AC_MSG_CHECKING([Oracle Install-Dir]) if test "$PHP_OCI8" = "yes"; then - OCI8_DIR=$ORACLE_HOME + OCI8_DIR=$ORACLE_HOME else - OCI8_DIR=$PHP_OCI8 + OCI8_DIR=$PHP_OCI8 fi AC_MSG_RESULT($OCI8_DIR) if test -d "$OCI8_DIR/rdbms/public"; then - PHP_ADD_INCLUDE($OCI8_DIR/rdbms/public) + PHP_ADD_INCLUDE($OCI8_DIR/rdbms/public) fi if test -d "$OCI8_DIR/rdbms/demo"; then - PHP_ADD_INCLUDE($OCI8_DIR/rdbms/demo) + PHP_ADD_INCLUDE($OCI8_DIR/rdbms/demo) fi if test -d "$OCI8_DIR/network/public"; then - PHP_ADD_INCLUDE($OCI8_DIR/network/public) + PHP_ADD_INCLUDE($OCI8_DIR/network/public) fi if test -d "$OCI8_DIR/plsql/public"; then - PHP_ADD_INCLUDE($OCI8_DIR/plsql/public) + PHP_ADD_INCLUDE($OCI8_DIR/plsql/public) fi if test -f "$OCI8_DIR/lib/sysliblist"; then - PHP_EVAL_LIBLINE(cat $OCI8_DIR/lib/sysliblist, OCI8_SYSLIB) + PHP_EVAL_LIBLINE(cat $OCI8_DIR/lib/sysliblist, OCI8_SYSLIB) elif test -f "$OCI8_DIR/rdbms/lib/sysliblist"; then - PHP_EVAL_LIBLINE(cat $OCI8_DIR/rdbms/lib/sysliblist, OCI8_SYSLIB) + PHP_EVAL_LIBLINE(cat $OCI8_DIR/rdbms/lib/sysliblist, OCI8_SYSLIB) fi AC_OCI8_VERSION($OCI8_DIR) case $OCI8_VERSION in - 8.0) - PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, "", OCI8_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(core4, "", OCI8_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(psa, "", OCI8_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(clntsh, $OCI8_DIR/lib, OCI8_SHARED_LIBADD) - ;; - - 8.1|9.0) - PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) - PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) - AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) - AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ]) - ;; + 8.0) + PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, "", OCI8_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(core4, "", OCI8_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(psa, "", OCI8_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(clntsh, $OCI8_DIR/lib, OCI8_SHARED_LIBADD) + ;; + + 8.1|9.0) + PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) + PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) + AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) + AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ]) + ;; - *) + *) AC_MSG_ERROR(Unsupported Oracle version!) - ;; + ;; esac PHP_NEW_EXTENSION(oci8, oci8.c, $ext_shared)