com php-src: fix arg order, CFLAGS is the fifth arg in m4: ext/filter/config.m4 ext/json/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4
ext/pcre/config0.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/reflection/config.m4 ext/session/config.m4 ext/soap/config.m4 ext/tidy/config.m4
ext/xml/config.m4

Commit: 7a6a3d923bfaac10a73e7ddf93eb5b7b7f2703e8 Author: Anatol Belski <ab@php.net> Fri, 17 Oct 2014 16:03:40 +0200 Parents: 4fce2ae2c64b61e5ef7cdbdb631b8d5691d1b31f Branches: native-tls Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7a6a3d923bfaac10a73e7ddf93eb5b7b7f2703e8 Log: fix arg order, CFLAGS is the fifth arg in m4 Changed paths: M ext/filter/config.m4 M ext/json/config..m4 M ext/libxml/config0.m4 M ext/mbstring/config.m4 M ext/pcre/config0.m4 M ext/pgsql/config.m4 M ext/phar/config.m4 M ext/reflection/config.m4 M ext/session/config.m4 M ext/soap/config.m4 M ext/tidy/config.m4 M ext/xml/config.m4 Diff: diff --git a/ext/filter/config.m4 b/ext/filter/config.m4 index 93ca2cb..d589b10 100644 --- a/ext/filter/config.m4 +++ b/ext/filter/config.m4 @@ -39,7 +39,7 @@ yes CPPFLAGS=$old_CPPFLAGS fi - PHP_NEW_EXTENSION(filter, filter.c sanitizing_filters.c logical_filters.c callback_filter.c, $ext_shared, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(filter, filter.c sanitizing_filters.c logical_filters.c callback_filter.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(FILTER_SHARED_LIBADD) PHP_INSTALL_HEADERS([ext/filter/php_filter.h]) diff --git a/ext/json/config.m4 b/ext/json/config.m4 index 6861a62..9c83a5d 100644 --- a/ext/json/config.m4 +++ b/ext/json/config.m4 @@ -9,7 +9,7 @@ if test "$PHP_JSON" != "no"; then AC_DEFINE([HAVE_JSON],1 ,[whether to enable JavaScript Object Serialization support]) AC_HEADER_STDC - PHP_NEW_EXTENSION(json, json.c utf8_decode.c JSON_parser.c, $ext_shared, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(json, json.c utf8_decode.c JSON_parser.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_INSTALL_HEADERS([ext/json], [php_json.h]) PHP_SUBST(JSON_SHARED_LIBADD) fi diff --git a/ext/libxml/config0.m4 b/ext/libxml/config0.m4 index 74dc6cb..79e94a4 100644 --- a/ext/libxml/config0.m4 +++ b/ext/libxml/config0.m4 @@ -17,7 +17,7 @@ if test "$PHP_LIBXML" != "no"; then PHP_SETUP_LIBXML(LIBXML_SHARED_LIBADD, [ AC_DEFINE(HAVE_LIBXML,1,[ ]) - PHP_NEW_EXTENSION(libxml, [libxml.c], $ext_shared, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(libxml, [libxml.c], $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_INSTALL_HEADERS([ext/libxml/php_libxml.h]) ], [ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4 index c7ae3f9..bd88ee4 100644 --- a/ext/mbstring/config.m4 +++ b/ext/mbstring/config.m4 @@ -31,7 +31,7 @@ AC_DEFUN([PHP_MBSTRING_ADD_INSTALL_HEADERS], [ ]) AC_DEFUN([PHP_MBSTRING_EXTENSION], [ - PHP_NEW_EXTENSION(mbstring, $PHP_MBSTRING_SOURCES, $ext_shared,, $PHP_MBSTRING_CFLAGS) + PHP_NEW_EXTENSION(mbstring, $PHP_MBSTRING_SOURCES, $ext_shared,, $PHP_MBSTRING_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(MBSTRING_SHARED_LIBADD) for dir in $PHP_MBSTRING_EXTRA_BUILD_DIRS; do @@ -47,7 +47,7 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES) out="php_config.h" else - PHP_ADD_SOURCES_X(PHP_EXT_DIR(mbstring),$PHP_MBSTRING_BASE_SOURCES, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,shared_objects_mbstring,yes) + PHP_ADD_SOURCES_X(PHP_EXT_DIR(mbstring),$PHP_MBSTRING_BASE_SOURCES,,shared_objects_mbstring,yes) if test -f "$ext_builddir/config.h.in"; then out="$abs_builddir/config.h" else diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 3c0875f..7749bb6 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -47,7 +47,7 @@ PHP_ARG_WITH(pcre-regex,, AC_DEFINE(HAVE_PCRE, 1, [ ]) PHP_ADD_INCLUDE($PCRE_INCDIR) - PHP_NEW_EXTENSION(pcre, php_pcre.c, no, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(pcre, php_pcre.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h]) else AC_MSG_CHECKING([for PCRE library to use]) diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index bd3470e..0ec34c4 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -105,7 +105,7 @@ if test "$PHP_PGSQL" != "no"; then PHP_ADD_INCLUDE($PGSQL_INCLUDE) - PHP_NEW_EXTENSION(pgsql, pgsql.c, $ext_shared, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(pgsql, pgsql.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) fi diff --git a/ext/phar/config.m4 b/ext/phar/config.m4 index 1ba7ecd..8b91caa 100644 --- a/ext/phar/config.m4 +++ b/ext/phar/config.m4 @@ -5,7 +5,7 @@ PHP_ARG_ENABLE(phar, for phar archive support, [ --disable-phar Disable phar support], yes) if test "$PHP_PHAR" != "no"; then - PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream..c phar.c phar_object.c phar_path_check.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) AC_MSG_CHECKING([for phar openssl support]) if test "$PHP_HASH_SHARED" != "yes"; then if test "$PHP_HASH" != "no"; then diff --git a/ext/reflection/config.m4 b/ext/reflection/config..m4 index 334d7dc..08f8e1e 100755 --- a/ext/reflection/config.m4 +++ b/ext/reflection/config.m4 @@ -2,4 +2,4 @@ dnl $Id$ dnl config.m4 for extension reflection AC_DEFINE(HAVE_REFLECTION, 1, [Whether Reflection is enabled]) -PHP_NEW_EXTENSION(reflection, php_reflection.c, no, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) +PHP_NEW_EXTENSION(reflection, php_reflection.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) diff --git a/ext/session/config.m4 b/ext/session/config.m4 index f3b7340..949306c 100644 --- a/ext/session/config.m4 +++ b/ext/session/config.m4 @@ -11,7 +11,7 @@ PHP_ARG_WITH(mm,for mm support, if test "$PHP_SESSION" != "no"; then PHP_PWRITE_TEST PHP_PREAD_TEST - PHP_NEW_EXTENSION(session, mod_user_class.c session.c mod_files.c mod_mm.c mod_user.c, $ext_shared, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(session, mod_user_class.c session.c mod_files.c mod_mm.c mod_user.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_ADD_EXTENSION_DEP(session, hash, true) PHP_ADD_EXTENSION_DEP(session, spl) PHP_SUBST(SESSION_SHARED_LIBADD) diff --git a/ext/soap/config.m4 b/ext/soap/config.m4 index eab3797..5fcb8bd 100644 --- a/ext/soap/config.m4 +++ b/ext/soap/config.m4 @@ -17,7 +17,7 @@ if test "$PHP_SOAP" != "no"; then PHP_SETUP_LIBXML(SOAP_SHARED_LIBADD, [ AC_DEFINE(HAVE_SOAP,1,[ ]) - PHP_NEW_EXTENSION(soap, soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c, $ext_shared, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(soap, soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(SOAP_SHARED_LIBADD) ], [ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4 index b09622a..ff27bd1 100644 --- a/ext/tidy/config.m4 +++ b/ext/tidy/config.m4 @@ -38,7 +38,7 @@ if test "$PHP_TIDY" != "no"; then ],[],[]) - PHP_NEW_EXTENSION(tidy, tidy.c, $ext_shared, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(tidy, tidy.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(TIDY_SHARED_LIBADD) AC_DEFINE(HAVE_TIDY,1,[ ]) fi diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 1019d91..812032b 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -52,7 +52,7 @@ if test "$PHP_XML" != "no"; then AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) fi - PHP_NEW_EXTENSION(xml, xml.c $xml_extra_sources, $ext_shared, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_NEW_EXTENSION(xml, xml.c $xml_extra_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) PHP_SUBST(XML_SHARED_LIBADD) PHP_INSTALL_HEADERS([ext/xml/]) AC_DEFINE(HAVE_XML, 1, [ ])