Merge branch 'PHP-7.4'

petk · petk · commit 80bebdd0e18f · 2019-03-07T21:00:36.000+01:00
* PHP-7.4:
  Clean *nix build system
diff --git a/TSRM/tsrm.m4 b/TSRM/tsrm.m4
@@ -3,7 +3,6 @@ m4_include([TSRM/m4/ax_func_which_gethostbyname_r.m4])
 AC_DEFUN([TSRM_BASIC_CHECKS],[
 
 AC_REQUIRE([AC_PROG_CC])dnl
-dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
 AC_REQUIRE([AC_PROG_RANLIB])dnl
 
 AC_CHECK_FUNCS(sigprocmask)
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,3 @@
-## -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 dnl include Zend specific macro definitions first
@@ -141,8 +140,6 @@ fi
 dnl Settings we want to make before the checks.
 dnl -------------------------------------------------------------------------
 
-cwd=`pwd`
-
 php_shtool=$srcdir/build/shtool
 T_MD=`$php_shtool echo -n -e %B`
 T_ME=`$php_shtool echo -n -e %b`
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
@@ -1,7 +1,5 @@
 dnl config.m4 for extension intl
 
-dnl ##########################################################################
-dnl Initialize the extension
 PHP_ARG_ENABLE([intl],
   [whether to enable internationalization support],
   [AS_HELP_STRING([--enable-intl],
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
@@ -1,5 +1,3 @@
-dnl -*- autoconf -*-
-
 dnl
 dnl Check if flush should be called explicitly after buffered io
 dnl
diff --git a/ext/tokenizer/config.m4 b/ext/tokenizer/config.m4
@@ -1,7 +1,5 @@
 dnl config.m4 for extension tokenizer
 
-dnl Otherwise use enable:
-
 PHP_ARG_ENABLE([tokenizer],
   [whether to enable tokenizer support],
   [AS_HELP_STRING([--disable-tokenizer],

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-dnl -- autoconf --`
`2`		`-`
`3`	`1`	`dnl`
`4`	`2`	`dnl Check if flush should be called explicitly after buffered io`
`5`	`3`	`dnl`