sixd                                     Wed, 08 Jun 2011 01:25:35 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=311908

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

Changed paths:
    U   php/php-src/branches/PHP_5_4/NEWS
    U   php/php-src/branches/PHP_5_4/build/buildcheck.sh
    U   php/php-src/branches/PHP_5_4/configure.in
    U   php/php-src/branches/PHP_5_4/scripts/phpize.m4
    U   php/php-src/trunk/build/buildcheck.sh
    U   php/php-src/trunk/configure.in
    U   php/php-src/trunk/scripts/phpize.m4

Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS   2011-06-08 00:53:55 UTC (rev 311907)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-06-08 01:25:35 UTC (rev 311908)
@@ -3,8 +3,9 @@
 ?? ??? 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)

Modified: php/php-src/branches/PHP_5_4/build/buildcheck.sh
===================================================================
--- php/php-src/branches/PHP_5_4/build/buildcheck.sh    2011-06-08 00:53:55 UTC 
(rev 311907)
+++ php/php-src/branches/PHP_5_4/build/buildcheck.sh    2011-06-08 01:25:35 UTC 
(rev 311908)
@@ -28,18 +28,18 @@
   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

Modified: php/php-src/branches/PHP_5_4/configure.in
===================================================================
--- php/php-src/branches/PHP_5_4/configure.in   2011-06-08 00:53:55 UTC (rev 
311907)
+++ php/php-src/branches/PHP_5_4/configure.in   2011-06-08 01:25:35 UTC (rev 
311908)
@@ -8,9 +8,9 @@
 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)


Modified: php/php-src/branches/PHP_5_4/scripts/phpize.m4
===================================================================
--- php/php-src/branches/PHP_5_4/scripts/phpize.m4      2011-06-08 00:53:55 UTC 
(rev 311907)
+++ php/php-src/branches/PHP_5_4/scripts/phpize.m4      2011-06-08 01:25:35 UTC 
(rev 311908)
@@ -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)


Modified: php/php-src/trunk/build/buildcheck.sh
===================================================================
--- php/php-src/trunk/build/buildcheck.sh       2011-06-08 00:53:55 UTC (rev 
311907)
+++ php/php-src/trunk/build/buildcheck.sh       2011-06-08 01:25:35 UTC (rev 
311908)
@@ -28,18 +28,18 @@
   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

Modified: php/php-src/trunk/configure.in
===================================================================
--- php/php-src/trunk/configure.in      2011-06-08 00:53:55 UTC (rev 311907)
+++ php/php-src/trunk/configure.in      2011-06-08 01:25:35 UTC (rev 311908)
@@ -8,9 +8,9 @@
 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)


Modified: php/php-src/trunk/scripts/phpize.m4
===================================================================
--- php/php-src/trunk/scripts/phpize.m4 2011-06-08 00:53:55 UTC (rev 311907)
+++ php/php-src/trunk/scripts/phpize.m4 2011-06-08 01:25:35 UTC (rev 311908)
@@ -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)


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to