Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix #77041: buildconf should output error messages to stderr

diff --cc build/buildcheck.sh
index 6601fc9943ce1fa94b57425c96af30aabdf72750,12a6b0eaed39f7464ab44485a877135f58a8aaab..8857a34b18f0b9fc4cbbe640dc301c456fa25d15
--- 1/build/buildcheck.sh
--- 2/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@@ -25,19 -28,19 +25,19 @@@ if test -z "$PHP_AUTOCONF"; the
    PHP_AUTOCONF='autoconf'
  fi
  
 -# autoconf 2.64 or newer
 +# autoconf 2.68 or newer
  ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
  if test -z "$ac_version"; then
- echo "buildconf: autoconf not found."
- echo "           You need autoconf version 2.68 or newer installed"
- echo "           to build PHP from Git."
+ echo "buildconf: autoconf not found." >&2
 -echo "           You need autoconf version 2.64 or newer installed" >&2
++echo "           You need autoconf version 2.68 or newer installed" >&2
+ echo "           to build PHP from Git." >&2
  exit 1
  fi
  IFS=.; set $ac_version; IFS=' '
 -if test "$1" = "2" -a "$2" -lt "64" || test "$1" -lt "2"; then
 +if test "$1" = "2" -a "$2" -lt "68" || test "$1" -lt "2"; then
- echo "buildconf: autoconf version $ac_version found."
- echo "           You need autoconf version 2.68 or newer installed"
- echo "           to build PHP from Git."
+ echo "buildconf: autoconf version $ac_version found." >&2
 -echo "           You need autoconf version 2.64 or newer installed" >&2
++echo "           You need autoconf version 2.68 or newer installed" >&2
+ echo "           to build PHP from Git." >&2
  exit 1
  else
  echo "buildconf: autoconf version $ac_version (ok)"

diff --cc build/genif.sh
Simple merge

diff --cc buildconf
Simple merge

diff --cc makedist
Simple merge