com php-src: Merge branch 'PHP-7.1' into PHP-7.2: build/buildcheck.sh buildconf makedist

Commit: 0dc15e188558bdb3df201fc71d0a67ba0bb1eeb9 Author: Peter Kokot <peterkokot@gmail.com> Sat, 20 Oct 2018 09:51:22 +0200 Parents: b9d8e5d706e36b7e8bb8bdd26bc93374fd9a6020 1b936033b00cd223984122e6fad2cedf8e72f3f5 Branches: PHP-7.2 PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0dc15e188558bdb3df201fc71d0a67ba0bb1eeb9 Log: Merge branch 'PHP-7.1' into PHP-7.2 * PHP-7.1: [ci skip] Update NEWS Fix #77041: buildconf should output error messages to stderr Bugs: https://bugs.php.net/77041 Changed paths: MM build/buildcheck.sh MM buildconf MM makedist Diff: diff --cc build/buildcheck.sh index 5488145,515a45d..12a6b0e --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@@ -28,19 -28,19 +28,19 @@@ if test -z "$PHP_AUTOCONF"; the PHP_AUTOCONF='autoconf' fi -# autoconf 2.59 or newer +# autoconf 2.64 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.64 or newer installed" - echo " to build PHP from Git." + echo "buildconf: autoconf not found." >&2 -echo " You need autoconf version 2.59 or newer installed" >&2 ++echo " You need autoconf version 2.64 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 "59" || test "$1" -lt "2"; then +if test "$1" = "2" -a "$2" -lt "64" || test "$1" -lt "2"; then - echo "buildconf: autoconf version $ac_version found." - echo " You need autoconf version 2.64 or newer installed" - echo " to build PHP from Git." + echo "buildconf: autoconf version $ac_version found." >&2 -echo " You need autoconf version 2.59 or newer installed" >&2 ++echo " You need autoconf version 2.64 or newer installed" >&2 + echo " to build PHP from Git." >&2 exit 1 else echo "buildconf: autoconf version $ac_version (ok)"