derick Mon May 18 21:33:38 2009 UTC Modified files: (Branch: PHP_5_3) /php-src configure.in NEWS /php-src/scripts phpize.m4 /php-src/main php_ini.c Log: - MFH: Get rid of the four different versions of zend_extension* and only use zend_extension. Because of the API identifier change in PHP 5.3 you also get a proper warning message now. #- [DOC] http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.77.2.51&r2=1.579.2.52.2.77.2.52&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.77.2.51 php-src/configure.in:1.579.2.52.2.77.2.52 --- php-src/configure.in:1.579.2.52.2.77.2.51 Wed May 6 18:57:45 2009 +++ php-src/configure.in Mon May 18 21:33:38 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.77.2.51 2009/05/06 18:57:45 johannes Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.77.2.52 2009/05/18 21:33:38 derick Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -1332,15 +1332,7 @@ CPPFLAGS="$CPPFLAGS -DTHREAD=1" fi -if test "$PHP_DEBUG" = "1" && test "$PHP_THREAD_SAFETY" = "yes"; then - ZEND_EXT_TYPE="zend_extension_debug_ts" -elif test "$PHP_DEBUG" = "1"; then - ZEND_EXT_TYPE="zend_extension_debug" -elif test "$PHP_THREAD_SAFETY" = "yes"; then - ZEND_EXT_TYPE="zend_extension_ts" -else - ZEND_EXT_TYPE="zend_extension" -fi +ZEND_EXT_TYPE="zend_extension" PHP_SUBST(ZEND_EXT_TYPE) dnl http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.605&r2=1.2027.2.547.2.965.2.606&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.605 php-src/NEWS:1.2027.2.547.2.965.2.606 --- php-src/NEWS:1.2027.2.547.2.965.2.605 Sat May 16 20:34:48 2009 +++ php-src/NEWS Mon May 18 21:33:38 2009 @@ -5,6 +5,7 @@ - Upgraded bundled libmagic to 5.03 in the fileinfo extension. (Scott) - Added the ability for json_decode() to take a user specified depth. (Scott) +- Coalesce all the zend_extension_* variables into zend_extension. (Derick) - Disabled SQLite3::loadExtension for threaded SAPIs. (Scott) http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.6&r2=1.17.2.3.2.5.2.7&diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.6 php-src/scripts/phpize.m4:1.17.2.3.2.5.2.7 --- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.6 Wed Dec 3 19:52:59 2008 +++ php-src/scripts/phpize.m4 Mon May 18 21:33:38 2009 @@ -96,15 +96,7 @@ AC_MSG_RESULT([$PHP_DEBUG]) dnl Support for building and testing Zend extensions -if test "$PHP_DEBUG" = "yes" && test "$PHP_THREAD_SAFETY" = "yes; then - ZEND_EXT_TYPE="zend_extension_debug_ts" -elif test "$PHP_DEBUG" = "yes"; then - ZEND_EXT_TYPE="zend_extension_debug" -elif test "$PHP_THREAD_SAFETY" = "yes; then - ZEND_EXT_TYPE="zend_extension_ts" -else - ZEND_EXT_TYPE="zend_extension" -fi +ZEND_EXT_TYPE="zend_extension" PHP_SUBST(ZEND_EXT_TYPE) dnl Discard optimization flags when debugging is enabled http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.15.2.13&r2=1.136.2.4.2.15.2.14&diff_format=u Index: php-src/main/php_ini.c diff -u php-src/main/php_ini.c:1.136.2.4.2.15.2.13 php-src/main/php_ini.c:1.136.2.4.2.15.2.14 --- php-src/main/php_ini.c:1.136.2.4.2.15.2.13 Wed Dec 31 11:15:47 2008 +++ php-src/main/php_ini.c Mon May 18 21:33:38 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ini.c,v 1.136.2.4.2.15.2.13 2008/12/31 11:15:47 sebastian Exp $ */ +/* $Id: php_ini.c,v 1.136.2.4.2.15.2.14 2009/05/18 21:33:38 derick Exp $ */ #include "php.h" #include "ext/standard/info.h" @@ -170,19 +170,7 @@ /* php.ini support */ #define PHP_EXTENSION_TOKEN "extension" -#ifdef ZTS -# if (ZEND_DEBUG) -# define ZEND_EXTENSION_TOKEN "zend_extension_debug_ts" -# else -# define ZEND_EXTENSION_TOKEN "zend_extension_ts" -# endif -#else -# if (ZEND_DEBUG) -# define ZEND_EXTENSION_TOKEN "zend_extension_debug" -# else -# define ZEND_EXTENSION_TOKEN "zend_extension" -# endif -#endif +#define ZEND_EXTENSION_TOKEN "zend_extension" /* {{{ config_zval_dtor */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php