Merge branch 'PHP-7.3'

* PHP-7.3:
  [ci skip] Update UPGRADING about Autoconf version
  Bump minimum Autoconf requirement to 2.68
This commit is contained in:
Peter Kokot 2018-10-09 21:17:19 +02:00
commit 77c85b3119
3 changed files with 6 additions and 6 deletions

View File

@ -25,18 +25,18 @@ if test -z "$PHP_AUTOCONF"; then
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.64 or newer installed"
echo " You need autoconf version 2.68 or newer installed"
echo " to build PHP from Git."
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.64 or newer installed"
echo " You need autoconf version 2.68 or newer installed"
echo " to build PHP from Git."
exit 1
else

View File

@ -8,7 +8,7 @@ sinclude(Zend/acinclude.m4)
dnl Basic autoconf + automake initialization, generation of config.nice.
dnl -------------------------------------------------------------------------
AC_PREREQ([2.64])
AC_PREREQ([2.68])
AC_INIT(README.GIT-RULES)
ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])

View File

@ -1,6 +1,6 @@
dnl This file becomes configure.ac for self-contained extensions.
AC_PREREQ(2.59)
AC_PREREQ([2.68])
AC_INIT(config.m4)
ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])