Permalink
Browse files

Relax autoconf support from 2.60 to 2.59. This is the version availab…

…le on Centos/RHEL/Oracle Linux 5.6
  • Loading branch information...
1 parent ddaddf6 commit 9622d0050d6143da338ce9fc518ee8475f4f3613 Christopher Jones committed Jun 8, 2011
Showing with 11 additions and 10 deletions.
  1. +3 −2 NEWS
  2. +4 −4 build/buildcheck.sh
  3. +2 −2 configure.in
  4. +2 −2 scripts/phpize.m4
View
@@ -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)
View
@@ -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
View
@@ -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)
View
@@ -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)

0 comments on commit 9622d00

Please sign in to comment.