Skip to content

Commit

Permalink
Relax autoconf support from 2.60 to 2.59. This is the version availab…
Browse files Browse the repository at this point in the history
…le on Centos/RHEL/Oracle Linux 5.6
  • Loading branch information
cjbj committed Jun 8, 2011
1 parent 547ab48 commit 2e23502
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions build/buildcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions scripts/phpize.m4
Original file line number Diff line number Diff line change
@@ -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)

Expand Down

0 comments on commit 2e23502

Please sign in to comment.