summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-09 21:06:10 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-09 21:06:10 +0200
commit0b0d4b5f0d5de7d3172e995c34e951790fedafb5 (patch)
tree0c956a259fb51bd1537a2d75ba765bbc5c044e0e
parent54e152cb92d86d32b0474b11f380c621ff0c03ea (diff)
downloadphp-git-0b0d4b5f0d5de7d3172e995c34e951790fedafb5.tar.gz
Bump minimum Autoconf requirement to 2.68
This patch syncs and bumps the minimum required version of Autoconf for the `phpize.m4` script and the main `configure.ac` from previously mixed 2.64 and 2.59 to 2.68. At the time of this writing Autoconf 2.63 is still the version on Centos 6, however by the PHP 7.3 release current systems out there should all have pretty much updated Autoconf versions to 2.64+ at least. Centos 7 already has Autoconf 2.69, for example. This provides more options to update and get current with the *nix build system and also avoids broken builds in certain cases as pointed out in the relevant discussion [1]. Additionally, phpize also already provides the `AX_CHECK_COMPILE_FLAG` Autoconf Archive m4 file that has Autoconf 2.64 minimum requirement. Autoconf 2.68 was released in 2010, 8 years ago, relative to this patch. [1] https://github.com/php/php-src/pull/3562
-rwxr-xr-xbuild/buildcheck.sh8
-rw-r--r--configure.ac2
-rw-r--r--scripts/phpize.m42
3 files changed, 6 insertions, 6 deletions
diff --git a/build/buildcheck.sh b/build/buildcheck.sh
index 7db31e2c0c..6601fc9943 100755
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@ -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
diff --git a/configure.ac b/configure.ac
index dafe25e529..562e26a067 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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], [])
diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index f234e68ea8..55fa08d7c4 100644
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -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], [])