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

Commit: b7cef2b008f3d02e345b2ddf45fa322047ee9367 Author: Peter Kokot <peterkokot@gmail.com> Sat, 20 Oct 2018 09:54:00 +0200 Parents: 2224277d7d7efb06adcb512427e299295876fb87 3b8be227bd070da0acffdae9a3bd8043c08ec2d3 Branches: PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b7cef2b008f3d02e345b2ddf45fa322047ee9367 Log: 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 Bugs: https://bugs.php.net/77041 Changed paths: MM build/buildcheck.sh MM build/genif.sh MM buildconf MM makedist Diff: diff --cc build/buildcheck.sh index 6601fc9,12a6b0e..8857a34 --- a/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)"