Commit: de6dfe5bbd197e6387f0044b857b518e29e27283 Author: David Soria Parra <d...@php.net> Fri, 13 Apr 2012 16:33:25 +0200 Parents: 676f0deb38910bcc859924f871c284b73a9dd13d e9b978c374e0b8f2afd32ff07920f419fce4b9fb Branches: PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=de6dfe5bbd197e6387f0044b857b518e29e27283 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: configure.in: Check for README.GIT-RULES instead of README.SVN-RULES Conflicts: configure.in Changed paths: MM configure.in Diff: diff --cc configure.in index 49a88b1,f038f87..76f3598 --- a/configure.in +++ b/configure.in @@@ -8,9 -30,8 +8,9 @@@ sinclude(Zend/acinclude.m4 dnl Basic autoconf + automake initialization, generation of config.nice. dnl ------------------------------------------------------------------------- -AC_PREREQ(2.13) +AC_PREREQ(2.59) - AC_INIT(README.SVN-RULES) + AC_INIT(README.GIT-RULES) +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
