- Partially revert the autoconf 2.6x "fix" to make configure work with release

4 files changed, 8 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index d6a17d2d8d..eba0855fd0 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,6 @@ PHP                                                                        NEWS
 - Changed "post_max_size" php.ini directive to allow unlimited post size by
   setting it to 0. (Rasmus)
 
-- Fixed the m4 scripts to support autoconf-2.64+. (Rasmus)
 - Fixed error_log() to be binary safe when using message_type 3. (Jani)
 
 - Fixed bug #50285 (xmlrpc does not preserve keys in encoded indexed arrays).
diff --git a/configure.in b/configure.in
index d918fadad2..73dd1fcc54 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 ## $Id$ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
-divert(1001)
+divert(1)
 
 dnl ## Diversion 1 is the autoconf + automake setup phase. We also
 dnl ## set the PHP version, deal with platform-specific compile
@@ -270,7 +270,7 @@ sinclude(TSRM/threads.m4)
 sinclude(TSRM/tsrm.m4)
 
 
-divert(1002)
+divert(2)
 
 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
@@ -309,7 +309,7 @@ if test "$enable_maintainer_zts" = "yes"; then
   PTHREADS_FLAGS
 fi
 
-divert(1003)
+divert(3)
 
 dnl ## In diversion 3 we check for compile-time options to the PHP
 dnl ## core and how to deal with different system dependencies.
@@ -670,7 +670,7 @@ if test "x$php_crypt_r" = "x1"; then
   PHP_CRYPT_R_STYLE
 fi
 
-divert(1004)
+divert(4)
 
 dnl ## In diversion 4 we check user-configurable general settings.
 
@@ -911,7 +911,7 @@ else
   AC_MSG_RESULT([using system default])
 fi
 
-divert(1005)
+divert(5)
 
 dnl ## In diversion 5 we check which extensions should be compiled.
 dnl ## All of these are normally in the extension directories.
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index e4ed45c94e..6009634b81 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -1,6 +1,6 @@
 dnl $Id$ -*- autoconf -*-
 
-divert(1003)dnl
+divert(3)dnl
 
 dnl
 dnl Check if flush should be called explicitly after buffered io
@@ -205,7 +205,7 @@ dnl
 AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
 AC_FUNC_FNMATCH	
 
-divert(1005)dnl
+divert(5)dnl
 
 dnl
 dnl Check for regex library type
diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index 7d483ae812..adf15811e2 100644
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -1,6 +1,6 @@
 dnl This file becomes configure.in for self-contained extensions.
 
-divert(1001)
+divert(1)
 
 AC_PREREQ(2.13)
 AC_INIT(config.m4)