archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Relax autoconf support from 2.60 to 2.59. This is the version available on Centos/RHEL/Oracle Linux 5.6

Browse source
This commit is contained in:
Christopher Jones 2011-06-08 01:25:35 +00:00
parent 547ab48521
commit 2e235022e9
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
build/buildcheck.sh
View file

@ -28,18 +28,18 @@ if test -z "$PHP_AUTOCONF"; then
PHP_AUTOCONF='autoconf' PHP_AUTOCONF='autoconf'
fi 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]* *$//'` 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 if test -z "$ac_version"; then
echo "buildconf: autoconf not found." 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." echo " to build PHP from SVN."
exit 1 exit 1
fi fi
IFS=.; set $ac_version; IFS=' ' 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 "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." echo " to build PHP from SVN."
exit 1 exit 1
else else

4
configure.in
View file

@ -8,9 +8,9 @@ sinclude(Zend/acinclude.m4)
dnl Basic autoconf + automake initialization, generation of config.nice. dnl Basic autoconf + automake initialization, generation of config.nice.
dnl ------------------------------------------------------------------------- dnl -------------------------------------------------------------------------
AC_PREREQ(2.60) AC_PREREQ(2.59)
AC_INIT(README.SVN-RULES) AC_INIT(README.SVN-RULES)
AC_PRESERVE_HELP_ORDER ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
PHP_CONFIG_NICE(config.nice) PHP_CONFIG_NICE(config.nice)

4
scripts/phpize.m4
View file

@ -1,8 +1,8 @@
dnl This file becomes configure.in for self-contained extensions. dnl This file becomes configure.in for self-contained extensions.
AC_PREREQ(2.60) AC_PREREQ(2.59)
AC_INIT(config.m4) AC_INIT(config.m4)
AC_PRESERVE_HELP_ORDER ifdef([AC_PRESERVE_HELP_ORDER], [AC_PRESERVE_HELP_ORDER], [])
PHP_CONFIG_NICE(config.nice) PHP_CONFIG_NICE(config.nice)