mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

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 ddaddf6c2a
commit 9622d0050d
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@ -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)

8
build/buildcheck.sh
View File

@ -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

4
configure.in
View File

@ -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)

4
scripts/phpize.m4
View File

@ -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)