com php-src: Merge branch 'PHP-7.4': TSRM/tsrm.m4 Zend/Zend.m4 build/php.m4 configure.ac ext/hash/config.m4 ext/ldap/config.m4 ext/mysqli/config.m4
ext/opcache/config.m4 ext/pcre/config0.m4 ext/pdo_mysql/confi g.m4 ext/session/config.m4 ext/sqlite3/config0 .m4 sapi/apache2handler/config.m4

Commit: 2cf90bb2f006e2973b666426b18596e2e67ccfd9 Author: Peter Kokot <peterkokot@gmail.com> Sun, 12 May 2019 18:51:50 +0200 Parents: 3005d6c21d8a4d6115a8159934b604e10b8a1136 75fb74860da7decd94432a4d211795310308a4a8 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2cf90bb2f006e2973b666426b18596e2e67ccfd9 Log: Merge branch 'PHP-7.4' * PHP-7.4: Normalize comments in *nix build system m4 files Changed paths: MM TSRM/tsrm.m4 MM Zend/Zend.m4 MM build/php.m4 MM configure.ac MM ext/hash/config.m4 MM ext/ldap/config.m4 MM ext/mysqli/config.m4 MM ext/opcache/config.m4 MM ext/pcre/config0.m4 MM ext/pdo_mysql/config.m4 MM ext/session/config.m4 MM ext/sqlite3/config0.m4 MM sapi/apache2handler/config.m4 Diff: diff --cc TSRM/tsrm.m4 index 0fb9861,f269abf..8cc53a1 --- a/TSRM/tsrm.m4 +++ b/TSRM/tsrm.m4 @@@ -6,8 -10,48 +10,10 @@@ AC_REQUIRE([AC_PROG_RANLIB])dn AC_CHECK_FUNCS(sigprocmask) ]) + dnl -dnl TSRM_CHECK_PTH -dnl -AC_DEFUN([TSRM_CHECK_PTH],[ -AC_MSG_CHECKING(for GNU Pth) -PTH_PREFIX="$1 --prefix" -if test -z "$PTH_PREFIX"; then - AC_MSG_RESULT(Please check your Pth installation) -fi - -CPPFLAGS="$CPPFLAGS $1 --cflags" -LDFLAGS="$LDFLAGS $1 --ldflags" -LIBS="$LIBS $1 --libs" - -AC_DEFINE(GNUPTH, 1, [Whether you use GNU Pth]) -AC_MSG_RESULT(yes - installed in $PTH_PREFIX) -]) - -dnl -dnl TSRM_CHECK_ST -dnl -AC_DEFUN([TSRM_CHECK_ST],[ - if test -r "$1/include/st.h"; then - CPPFLAGS="$CPPFLAGS -I$1/include" - LDFLAGS="$LDFLAGS -L$1/lib" - elif test -r "$1/st.h"; then - CPPFLAGS="$CPPFLAGS -I$1" - LDFLAGS="$LDFLAGS -L$1" - fi - AC_CHECK_HEADERS(st.h,[],[ - AC_MSG_ERROR([Sorry[,] I was unable to locate the State Threads header file. Please specify the prefix using --with-tsrm-st=/prefix]) - ]) - LIBS="$LIBS -lst" - AC_MSG_CHECKING(for SGI's State Threads) - AC_MSG_RESULT(yes) - AC_DEFINE(TSRM_ST, 1, [ ]) -]) - -dnl + dnl TSRM_CHECK_PTHREADS + dnl AC_DEFUN([TSRM_CHECK_PTHREADS],[ - PTHREADS_CHECK if test "$pthreads_working" != "yes"; then diff --cc Zend/Zend.m4 index c7e410b,0c6014b..163b14e --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@@ -186,13 -195,16 +195,16 @@@ int main( ]) + dnl + dnl LIBZEND_OTHER_CHECKS + dnl AC_DEFUN([LIBZEND_OTHER_CHECKS],[ -AC_ARG_ENABLE([maintainer-zts], - [AS_HELP_STRING([--enable-maintainer-zts], - [Enable thread safety - for code maintainers only!!])], - [ZEND_MAINTAINER_ZTS=$enableval], - [ZEND_MAINTAINER_ZTS=no]) +AC_ARG_ENABLE([zts], + [AS_HELP_STRING([--enable-zts], + [Enable thread safety])], + [ZEND_ZTS=$enableval], + [ZEND_ZTS=no]) AC_ARG_ENABLE([inline-optimization], [AS_HELP_STRING([--disable-inline-optimization], diff --cc build/php.m4 index dc0f95f,da0db4b..bec4adf --- a/build/php.m4 +++ b/build/php.m4 @@@ -2201,22 -2221,22 +2221,22 @@@ AC_DEFUN([PHP_CHECK_CONFIGURE_OPTIONS], ;; esac case $arg_name in - # Allow --disable-all / --enable-all + dnl Allow --disable-all / --enable-all enable-all[)];; - # Allow certain libtool options + dnl Allow certain libtool options enable-libtool-lock | with-pic | with-tags | enable-shared | enable-static | enable-fast-install | with-gnu-ld[)];; - # Allow certain TSRM options + dnl Allow certain TSRM options with-tsrm-pth | with-tsrm-st | with-tsrm-pthreads [)];; - # Allow certain Zend options + dnl Allow certain Zend options - with-zend-vm | enable-maintainer-zts | enable-inline-optimization[)];; + with-zend-vm | enable-zts | enable-inline-optimization[)];; - # All the rest must be set using the PHP_ARG_* macros - # PHP_ARG_* macros set php_enable_<arg_name> or php_with_<arg_name> + dnl All the rest must be set using the PHP_ARG_* macros. PHP_ARG_* macros + dnl set php_enable_<arg_name> or php_with_<arg_name>. *[)] - # Options that exist before PHP 6 + dnl Options that exist before PHP 6 if test "$PHP_MAJOR_VERSION" -lt "6"; then case $arg_name in enable-zend-multibyte[)] continue;; diff --cc configure.ac index f95426e,f4a01e1..e169f4a --- a/configure.ac +++ b/configure.ac @@@ -12,10 -12,10 +12,10 @@@ m4_include([build/php.m4] m4_include([build/pkg.m4]) dnl Basic autoconf initialization, generation of config.nice. - dnl ------------------------------------------------------------------------- + dnl ---------------------------------------------------------------------------- AC_PREREQ([2.68]) -AC_INIT([PHP],[7.4.0-dev],[https://bugs.php.net],[php],[https://www.php.net]) +AC_INIT([PHP],[8.0.0-dev],[https://bugs.php.net],[php],[https://www.php.net]) AC_CONFIG_SRCDIR([main/php_version.h]) AC_CONFIG_AUX_DIR([build]) AC_PRESERVE_HELP_ORDER @@@ -362,8 -357,8 +358,8 @@@ if test -z "$PHP_INSTALLED_SAPIS"; the AC_MSG_ERROR([Nothing to build.]) fi - dnl force ZTS + dnl Force ZTS. -if test "$enable_maintainer_zts" = "yes"; then +if test "$enable_zts" = "yes"; then PTHREADS_ASSIGN_VARS PTHREADS_FLAGS fi @@@ -1577,11 -1561,11 +1562,11 @@@ PHP_ADD_SOURCES(Zend, zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \ zend_closures.c zend_weakrefs.c zend_float.c zend_string.c zend_signal.c zend_generators.c \ zend_virtual_cwd.c zend_ast.c zend_objects.c zend_object_handlers.c zend_objects_API.c \ - zend_default_classes.c zend_inheritance.c zend_smart_str.c zend_cpuinfo.c, \ + zend_default_classes.c zend_inheritance.c zend_smart_str.c zend_cpuinfo.c zend_gdb.c, \ -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) - dnl Selectively disable optimization due to high RAM usage during - dnl compiling the executor. + dnl Selectively disable optimization due to high RAM usage during compiling the + dnl executor. if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then flag=-O0 else