- 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.

diff --git a/configure.in b/configure.in
index f7a137676177cf5fef2a341c44ab4e44abb435e9..6c3f93d325fdcffa37bc5cd0beed556e726eacb7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1246,15 +1246,7 @@ if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
   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

diff --git a/main/php_ini.c b/main/php_ini.c
index d276c1a8be43e5fbab7c81fe27b0b1fc0ff1ee9f..c71f63816bd84b5dd89011fde7a418e7d6c7f2a8 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -170,19 +170,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module)
 
 /* 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
  */

diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index bf40948eed7d2e162442dd2dc9fae507569c1374..dcc9f6a2d274cb2a74c3e7d76458ec8028fcaa06 100644 (file)
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -96,15 +96,7 @@ CPPFLAGS=$old_CPPFLAGS
 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