cvs: php4(PHP_4_3) /ext/oci8 config.m4

sniper Fri Jan 24 12:51:40 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/oci8 config.m4 Log: MFH: Fix bug #21795, Undeclared statement in oci8.c (OCI_ATTR_STATEMENT) Index: php4/ext/oci8/config.m4 diff -u php4/ext/oci8/config.m4:1.37 php4/ext/oci8/config.m4:1.37.2.1 --- php4/ext/oci8/config.m4:1.37 Mon Sep 9 15:03:51 2002 +++ php4/ext/oci8/config.m4 Fri Jan 24 12:51:40 2003 @@ -1,7 +1,23 @@ dnl -dnl $Id: config.m4,v 1.37 2002/09/09 19:03:51 kalowsky Exp $ +dnl $Id: config.m4,v 1.37.2.1 2003/01/24 17:51:40 sniper Exp $ dnl +AC_DEFUN(PHP_OCI_IF_DEFINED,[ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=$3 + AC_EGREP_CPP(yes,[ +#include <oci.h> +#if defined($1) + yes +#endif + ],[ + CPPFLAGS=$old_CPPFLAGS + $2 + ],[ + CPPFLAGS=$old_CPPFLAGS + ]) +]) + AC_DEFUN(AC_OCI8_VERSION,[ AC_MSG_CHECKING([Oracle version]) if test -s "$OCI8_DIR/orainst/unix.rgs"; then @@ -40,15 +56,19 @@ if test -d "$OCI8_DIR/rdbms/public"; then PHP_ADD_INCLUDE($OCI8_DIR/rdbms/public) + OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/public" fi if test -d "$OCI8_DIR/rdbms/demo"; then PHP_ADD_INCLUDE($OCI8_DIR/rdbms/demo) + OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/rdbms/demo" fi if test -d "$OCI8_DIR/network/public"; then PHP_ADD_INCLUDE($OCI8_DIR/network/public) + OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/network/public" fi if test -d "$OCI8_DIR/plsql/public"; then PHP_ADD_INCLUDE($OCI8_DIR/plsql/public) + OCI8_INCLUDES="$OCI8_INCLUDES -I$OCI8_DIR/plsql/public" fi if test -f "$OCI8_DIR/lib/sysliblist"; then @@ -72,8 +92,12 @@ PHP_ADD_LIBRARY(ocijdbc8, 1, OCI8_SHARED_LIBADD) fi PHP_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD) + + dnl + dnl OCI_ATTR_STATEMENT is not always available + dnl + PHP_OCI_IF_DEFINED(OCI_ATTR_STATEMENT, [AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ])], $OCI8_INCLUDES) AC_DEFINE(HAVE_OCI8_TEMP_LOB,1,[ ]) - AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ]) ;; *)