diff options
| author | Christopher Jones <sixd@php.net> | 2011-06-08 01:25:35 +0000 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2011-06-08 01:25:35 +0000 |
| commit | 2e235022e9ff618e66adb7352c15f489d05eac60 (patch) | |
| tree | e9e254874ef4dc56ce8e29b6e36fc28f781b8748 | |
| parent | 547ab485214d860551d20c2d8333f6bfbc85e54b (diff) | |
| download | php-git-2e235022e9ff618e66adb7352c15f489d05eac60.tar.gz | |
Relax autoconf support from 2.60 to 2.59. This is the version available on Centos/RHEL/Oracle Linux 5.6
| -rwxr-xr-x | build/buildcheck.sh | 8 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | scripts/phpize.m4 | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 2815e3e0e6..8754e3a292 100755 --- 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 a905cede23..0b0eb200ae 100644 --- 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 7faf6231da..d745ca7443 100644 --- 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) |