rasmus Sat, 28 Nov 2009 17:56:03 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291392
Log:
Ok, new attempt. Require autoconf-2.60 in this branch.
This simplifies things quite a bit by entirely getting
rid of the m4 diversions which were messing things up.
Now we are using the built-in autoconf diversions the
way they were intended and the HELP output order is
preserved through the AC_PRESERVE_HELP_ORDER macro
which was introduced in autoconf-2.59c
The next thing to clean up are the template warnings
and I want to get to the bottom of the cache warning
we generate as well. Now that I fixed the _cv_ stuff,
I am not sure that is still a valid warning.
Changed paths:
U php/php-src/branches/PHP_5_3/configure.in
U php/php-src/branches/PHP_5_3/ext/standard/config.m4
Modified: php/php-src/branches/PHP_5_3/configure.in
===================================================================
--- php/php-src/branches/PHP_5_3/configure.in 2009-11-28 17:35:40 UTC (rev
291391)
+++ php/php-src/branches/PHP_5_3/configure.in 2009-11-28 17:56:03 UTC (rev
291392)
@@ -1,28 +1,6 @@
## $Id$ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
-divert(1001)
-
-dnl ## Diversion 1 is the autoconf + automake setup phase. We also
-dnl ## set the PHP version, deal with platform-specific compile
-dnl ## options and check for the basic compile tools.
-
-dnl ## Diversion 2 is the initial checking of OS features, programs,
-dnl ## libraries and so on.
-
-dnl ## In diversion 3 we check for compile-time options to the PHP
-dnl ## core and how to deal with different system dependencies.
-dnl ## This includes whether debugging or short tags are enabled
-dnl ## and the default behaviour of php.ini options.
-dnl ## This is also where an SAPI interface is selected (choosing between
-dnl ## Apache module, CGI etc.)
-
-dnl ## In diversion 4 we check user-configurable general settings.
-
-dnl ## In diversion 5 we check which extensions should be compiled.
-dnl ## All of these are normally in the extension directories.
-dnl ## Diversion 5 is the last one. Here we generate files and clean up.
-
dnl include Zend specific macro definitions first
dnl -------------------------------------------------------------------------
sinclude(Zend/acinclude.m4)
@@ -30,7 +8,8 @@
dnl Basic autoconf + automake initialization, generation of config.nice.
dnl -------------------------------------------------------------------------
-AC_PREREQ(2.13)
+AC_PREREQ(2.60)
+AC_PRESERVE_HELP_ORDER
AC_INIT(README.SVN-RULES)
PHP_CONFIG_NICE(config.nice)
@@ -304,16 +283,6 @@
sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
-
-divert(1002)
-
-dnl ## Diversion 2 is where we set PHP-specific options and come up
-dnl ## with reasonable default values for them. We check for pthreads here
-dnl ## because the information is needed by the SAPI configuration.
-dnl ## This is also where an SAPI interface is selected (choosing between
-dnl ## Apache module, CGI etc.)
-
-dnl .
dnl -------------------------------------------------------------------------
PTHREADS_CHECK
@@ -344,13 +313,6 @@
PTHREADS_FLAGS
fi
-divert(1003)
-
-dnl ## In diversion 3 we check for compile-time options to the PHP
-dnl ## core and how to deal with different system dependencies.
-dnl ## This includes whether debugging or short tags are enabled
-dnl ## and the default behaviour of php.ini options.
-
dnl Starting system checks.
dnl -------------------------------------------------------------------------
@@ -691,8 +653,6 @@
PHP_CRYPT_R_STYLE
fi
-divert(1004)
-
dnl ## In diversion 4 we check user-configurable general settings.
dnl General settings.
@@ -932,8 +892,6 @@
AC_MSG_RESULT([using system default])
fi
-divert(1005)
-
dnl ## In diversion 5 we check which extensions should be compiled.
dnl ## All of these are normally in the extension directories.
Modified: php/php-src/branches/PHP_5_3/ext/standard/config.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/config.m4 2009-11-28 17:35:40 UTC
(rev 291391)
+++ php/php-src/branches/PHP_5_3/ext/standard/config.m4 2009-11-28 17:56:03 UTC
(rev 291392)
@@ -1,7 +1,5 @@
dnl $Id$ -*- autoconf -*-
-divert(1003)dnl
-
dnl
dnl Check if flush should be called explicitly after buffered io
dnl
@@ -220,8 +218,6 @@
AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice
fpclass isinf isnan)
AC_FUNC_FNMATCH
-divert(1005)dnl
-
dnl
dnl Check if there is a support means of creating a new process
dnl and defining which handles it receives
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
