Relax autoconf support from 2.60 to 2.59. This is the version available on Centos...

diff --git a/NEWS b/NEWS
index d551e0d59e185c24ae18c9fcf3cb51bc5f99e539..93ec4116c612ec4d68f569a08041fa77121753e9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,8 +3,9 @@ PHP                                                                        NEWS
 ?? ??? 201?, PHP 5.4.0
 - Upgraded bundled Sqlite3 to version 3.7.4. (Ilia)
 - Upgraded bundled PCRE to version 8.10. (Ilia)
-- autoconf 2.60+ is now supported (and required) for generating the configure
-  script with ./buildconf (Rasmus)
+- autoconf 2.59+ is now supported (and required) for generating the
+  configure script with ./buildconf. Autoconf 2.60+ is desirable
+  otherwise the configure help order may be incorrect.  (Rasmus, Chris Jones)
 
 - Removed legacy features:
   . break/continue $var syntax. (Dmitry)

diff --git a/build/buildcheck.sh b/build/buildcheck.sh
index 2815e3e0e6118dc2105f96bd4ed8577c0c4bb5ae..8754e3a292aec15266ae41ed8bffdb09d11deed8 100755 (executable)
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@ -28,18 +28,18 @@ if test -z "$PHP_AUTOCONF"; then
   PHP_AUTOCONF='autoconf'
 fi
 
-# autoconf 2.60 or newer
+# autoconf 2.59 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.60 or newer installed"
+echo "           You need autoconf version 2.59 or newer installed"
 echo "           to build PHP from SVN."
 exit 1
 fi
 IFS=.; set $ac_version; IFS=' '
-if test "$1" = "2" -a "$2" -lt "60" || test "$1" -lt "2"; then
+if test "$1" = "2" -a "$2" -lt "59" || test "$1" -lt "2"; then
 echo "buildconf: autoconf version $ac_version found."
-echo "           You need autoconf version 2.60 or newer installed"
+echo "           You need autoconf version 2.59 or newer installed"
 echo "           to build PHP from SVN."
 exit 1
 else

diff --git a/configure.in b/configure.in
index e5826f190dd11e34d2a89e58d7c71f0da6f3224f..fce281e24e017f1f0686d8c3c48cc6b61c7f36bd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,9 +8,9 @@ sinclude(Zend/acinclude.m4)
 dnl Basic autoconf + automake initialization, generation of config.nice.
 dnl -------------------------------------------------------------------------
 
-AC_PREREQ(2.60)
+AC_PREREQ(2.59)
 AC_INIT(README.SVN-RULES)
-AC_PRESERVE_HELP_ORDER
+ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
 
 PHP_CONFIG_NICE(config.nice)
 

diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index 7faf6231da07fa20ef18bb23c8010131381c4a3f..d745ca744381eaaa39a3ba6040212df79bb0dc74 100644 (file)
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -1,8 +1,8 @@
 dnl This file becomes configure.in for self-contained extensions.
 
-AC_PREREQ(2.60)
+AC_PREREQ(2.59)
 AC_INIT(config.m4)
-AC_PRESERVE_HELP_ORDER
+ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
 
 PHP_CONFIG_NICE(config.nice)