jani Thu Jul 31 00:45:17 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/scripts phpize.m4
Log:
MFH:- Applied the missing parts to phpize.m4 for zend extension builds
http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.5.2.4&r2=1.17.2.3.2.5.2.5&diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.17.2.3.2.5.2.4
php-src/scripts/phpize.m4:1.17.2.3.2.5.2.5
--- php-src/scripts/phpize.m4:1.17.2.3.2.5.2.4 Wed Jul 30 23:56:05 2008
+++ php-src/scripts/phpize.m4 Thu Jul 31 00:45:17 2008
@@ -59,7 +59,7 @@
AC_MSG_CHECKING([for PHP installed headers prefix])
AC_MSG_RESULT([$phpincludedir])
-dnl Check for PHP_DEBUG / ZEND_DEBUG
+dnl Checks for PHP_DEBUG / ZEND_DEBUG / ZTS
AC_MSG_CHECKING([if debug is enabled])
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS="-I$phpincludedir"
@@ -73,9 +73,37 @@
],[
PHP_DEBUG=no
])
+AC_MSG_RESULT([$PHP_DEBUG])
+
+AC_MSG_CHECKING([if zts is enabled])
+old_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="-I$phpincludedir"
+AC_EGREP_CPP(php_zts_is_enabled,[
+#include <main/php_config.h>
+#if ZTS
+php_zts_is_enabled
+#endif
+],[
+ PHP_THREAD_SAFETY=yes
+],[
+ PHP_THREAD_SAFETY=no
+])
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
+PHP_SUBST(ZEND_EXT_TYPE)
+
+dnl Discard optimization flags when debugging is enabled
if test "$PHP_DEBUG" = "yes"; then
PHP_DEBUG=1
ZEND_DEBUG=yes
@@ -115,7 +143,7 @@
])
AC_PROG_LIBTOOL
-all_targets='$(PHP_MODULES)'
+all_targets='$(PHP_MODULES) $(PHP_ZEND_EX)'
install_targets="install-modules install-headers"
phplibdir="`pwd`/modules"
CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H"
@@ -126,6 +154,8 @@
test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
PHP_SUBST(PHP_MODULES)
+PHP_SUBST(PHP_ZEND_EX)
+
PHP_SUBST(all_targets)
PHP_SUBST(install_targets)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
