Skip to content

Commit 77c85b3

Browse files
committed
Merge branch 'PHP-7.3'
* PHP-7.3: [ci skip] Update UPGRADING about Autoconf version Bump minimum Autoconf requirement to 2.68
2 parents f2856da + 1386b02 commit 77c85b3

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build/buildcheck.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ if test -z "$PHP_AUTOCONF"; then
2525
PHP_AUTOCONF='autoconf'
2626
fi
2727

28-
# autoconf 2.64 or newer
28+
# autoconf 2.68 or newer
2929
ac_version=`$PHP_AUTOCONF --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
3030
if test -z "$ac_version"; then
3131
echo "buildconf: autoconf not found."
32-
echo " You need autoconf version 2.64 or newer installed"
32+
echo " You need autoconf version 2.68 or newer installed"
3333
echo " to build PHP from Git."
3434
exit 1
3535
fi
3636
IFS=.; set $ac_version; IFS=' '
37-
if test "$1" = "2" -a "$2" -lt "64" || test "$1" -lt "2"; then
37+
if test "$1" = "2" -a "$2" -lt "68" || test "$1" -lt "2"; then
3838
echo "buildconf: autoconf version $ac_version found."
39-
echo " You need autoconf version 2.64 or newer installed"
39+
echo " You need autoconf version 2.68 or newer installed"
4040
echo " to build PHP from Git."
4141
exit 1
4242
else

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sinclude(Zend/acinclude.m4)
88
dnl Basic autoconf + automake initialization, generation of config.nice.
99
dnl -------------------------------------------------------------------------
1010

11-
AC_PREREQ([2.64])
11+
AC_PREREQ([2.68])
1212
AC_INIT(README.GIT-RULES)
1313
ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
1414

scripts/phpize.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dnl This file becomes configure.ac for self-contained extensions.
22

3-
AC_PREREQ(2.59)
3+
AC_PREREQ([2.68])
44
AC_INIT(config.m4)
55
ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
66

0 commit comments

Comments
 (0)