sixd Mon Mar 9 17:40:59 2009 UTC Modified files: /php-src/ext/oci8 config.m4 oci8.c php_oci8.h Log: Bug #46623 (phpinfo doesn't show compile time ORACLE_HOME with phpize) http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.75&r2=1.76&diff_format=u Index: php-src/ext/oci8/config.m4 diff -u php-src/ext/oci8/config.m4:1.75 php-src/ext/oci8/config.m4:1.76 --- php-src/ext/oci8/config.m4:1.75 Thu Jun 5 23:40:42 2008 +++ php-src/ext/oci8/config.m4 Mon Mar 9 17:40:59 2009 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.75 2008/06/05 23:40:42 sixd Exp $ +dnl $Id: config.m4,v 1.76 2009/03/09 17:40:59 sixd Exp $ dnl if test -z "$SED"; then @@ -169,6 +169,8 @@ if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then +dnl Using an ORACLE_HOME install + AC_MSG_CHECKING([Oracle Install Directory]) if test "$PHP_OCI8" = "yes"; then OCI8_DIR=$ORACLE_HOME @@ -238,9 +240,15 @@ PHP_SUBST_OLD(OCI8_SHARED_LIBADD) PHP_SUBST_OLD(OCI8_DIR) PHP_SUBST_OLD(OCI8_ORACLE_VERSION) + +dnl Fix bug #46623 + AC_DEFINE_UNQUOTED(PHP_OCI8_DEF_DIR, "$OCI8_DIR", [ ]) + AC_DEFINE_UNQUOTED(PHP_OCI8_DEF_SHARED_LIBADD, "$OCI8_SHARED_LIBADD", [ ]) elif test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then +dnl Using an Oracle Instant Client directory + AC_CHECK_SIZEOF(long int, 4) LIBDIR_SUFFIX="" if test "$ac_cv_sizeof_long_int" = "8" ; then http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.359&r2=1.360&diff_format=u Index: php-src/ext/oci8/oci8.c diff -u php-src/ext/oci8/oci8.c:1.359 php-src/ext/oci8/oci8.c:1.360 --- php-src/ext/oci8/oci8.c:1.359 Wed Dec 31 11:12:33 2008 +++ php-src/ext/oci8/oci8.c Mon Mar 9 17:40:59 2009 @@ -26,7 +26,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.359 2008/12/31 11:12:33 sebastian Exp $ */ +/* $Id: oci8.c,v 1.360 2009/03/09 17:40:59 sixd Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1017,8 +1017,6 @@ return SUCCESS; } -/* ----------------------------------------------------------------- */ - PHP_RINIT_FUNCTION(oci) { OCI_G(debug_mode) = 0; /* start "fresh" */ @@ -1043,8 +1041,6 @@ PHP_RSHUTDOWN_FUNCTION(oci) { - /* Set this to indicate request shutdown for all further processing */ - #ifdef ZTS zend_hash_apply_with_argument(&EG(regular_list), (apply_func_arg_t) php_oci_list_helper, (void *)le_descriptor TSRMLS_CC); zend_hash_apply_with_argument(&EG(regular_list), (apply_func_arg_t) php_oci_list_helper, (void *)le_collection TSRMLS_CC); @@ -1076,7 +1072,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); php_info_print_table_row(2, "Version", PHP_OCI8_VERSION); - php_info_print_table_row(2, "Revision", "$Revision: 1.359 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.360 $"); snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent)); php_info_print_table_row(2, "Active Persistent Connections", buf); @@ -1087,18 +1083,16 @@ #ifdef PHP_OCI8_ORACLE_VERSION php_info_print_table_row(2, "Oracle Version", PHP_OCI8_ORACLE_VERSION); #endif -#ifdef PHP_OCI8_DIR - php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR); +#ifdef PHP_OCI8_DEF_DIR + php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DEF_DIR); #endif -#ifdef PHP_OCI8_SHARED_LIBADD - php_info_print_table_row(2, "Libraries Used", PHP_OCI8_SHARED_LIBADD); +#ifdef PHP_OCI8_DEF_SHARED_LIBADD + php_info_print_table_row(2, "Libraries Used", PHP_OCI8_DEF_SHARED_LIBADD); #endif -#else -#if defined(HAVE_OCI_INSTANT_CLIENT) && defined(OCI_MAJOR_VERSION) && defined(OCI_MINOR_VERSION) +#elif defined(HAVE_OCI_INSTANT_CLIENT) && defined(OCI_MAJOR_VERSION) && defined(OCI_MINOR_VERSION) snprintf(buf, sizeof(buf), "%d.%d", OCI_MAJOR_VERSION, OCI_MINOR_VERSION); php_info_print_table_row(2, "Oracle Instant Client Version", buf); #endif -#endif php_info_print_table_row(2, "Temporary Lob support", "enabled"); php_info_print_table_row(2, "Collections support", "enabled"); http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/php_oci8.h?r1=1.51&r2=1.52&diff_format=u Index: php-src/ext/oci8/php_oci8.h diff -u php-src/ext/oci8/php_oci8.h:1.51 php-src/ext/oci8/php_oci8.h:1.52 --- php-src/ext/oci8/php_oci8.h:1.51 Wed Dec 31 11:12:33 2008 +++ php-src/ext/oci8/php_oci8.h Mon Mar 9 17:40:59 2009 @@ -25,7 +25,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_oci8.h,v 1.51 2008/12/31 11:12:33 sebastian Exp $ */ +/* $Id: php_oci8.h,v 1.52 2009/03/09 17:40:59 sixd Exp $ */ #if HAVE_OCI8 # ifndef PHP_OCI8_H @@ -39,7 +39,7 @@ /* * The version of the OCI8 extension. */ -#define PHP_OCI8_VERSION "1.3.4" +#define PHP_OCI8_VERSION "1.3.5-dev" extern zend_module_entry oci8_module_entry; #define phpext_oci8_ptr &oci8_module_entry
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php