AC_OUTPUT_COMMANDS no longer uses a diversion.

* acgeneral.m4 (AC_DIVERSION_CMDS): Removed.
(_AC_OUTPUT_CONFIG_STATUS): Don't undivert it.

diff --git a/ChangeLog b/ChangeLog
index 2097d6a7832bfb5b2263c219f2a5b408f871a6d8..aa653e5d0eac7038c34cd43927f093fc91f877dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-03-08  Akim Demaille  <akim@epita.fr>
+
+       AC_OUTPUT_COMMANDS no longer uses a diversion.
+
+       * acgeneral.m4 (AC_DIVERSION_CMDS): Removed.
+       (_AC_OUTPUT_CONFIG_STATUS): Don't undivert it.
+
 2000-03-08  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (_AC_INIT_PARSE_ARGS): Fix quoted/non quoted here

diff --git a/acgeneral.m4 b/acgeneral.m4
index 9ddc48d19af468e9aa5eca7aa72c022a9a92f46e..81722ee841cb258ef2d2c7d2e460628ade72ac1a 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -59,8 +59,7 @@
 m4_namespace_push(autoconf)
 
 # m4 output diversions.  We let m4 output them all in order at the end,
-# except that we explicitly undivert AC_DIVERSION_CMDS,
-# and AC_DIVERSION_ICMDS.
+# except that we explicitly undivert AC_DIVERSION_ICMDS.
 
 define(AC_DIVERSION_KILL,    -1)# suppress output
 define(AC_DIVERSION_BINSH,    0)# AC_REQUIRE'd #! /bin/sh line
@@ -71,8 +70,7 @@ define(AC_DIVERSION_NORMAL_3, 4)# AC_REQUIRE'd code, 3 level deep
 define(AC_DIVERSION_NORMAL_2, 5)# AC_REQUIRE'd code, 2 level deep
 define(AC_DIVERSION_NORMAL_1, 6)# AC_REQUIRE'd code, 1 level deep
 define(AC_DIVERSION_NORMAL,   7)# the tests and output code
-define(AC_DIVERSION_CMDS,     8)# extra shell commands in config.status
-define(AC_DIVERSION_ICMDS,    9)# extra initialization in config.status
+define(AC_DIVERSION_ICMDS,    8)# extra initialization in config.status
 
 
 # AC_DIVERT_PUSH(STREAM)
@@ -3668,11 +3666,6 @@ ifset([AC_LIST_COMMANDS],
 
 cat >>$CONFIG_STATUS <<\EOF
 
-#
-# CONFIG_COMMANDS section.
-#
-
-undivert(AC_DIVERSION_CMDS)dnl
 exit 0
 EOF
 chmod +x $CONFIG_STATUS

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 9ddc48d19af468e9aa5eca7aa72c022a9a92f46e..81722ee841cb258ef2d2c7d2e460628ade72ac1a 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -59,8 +59,7 @@
 m4_namespace_push(autoconf)
 
 # m4 output diversions.  We let m4 output them all in order at the end,
-# except that we explicitly undivert AC_DIVERSION_CMDS,
-# and AC_DIVERSION_ICMDS.
+# except that we explicitly undivert AC_DIVERSION_ICMDS.
 
 define(AC_DIVERSION_KILL,    -1)# suppress output
 define(AC_DIVERSION_BINSH,    0)# AC_REQUIRE'd #! /bin/sh line
@@ -71,8 +70,7 @@ define(AC_DIVERSION_NORMAL_3, 4)# AC_REQUIRE'd code, 3 level deep
 define(AC_DIVERSION_NORMAL_2, 5)# AC_REQUIRE'd code, 2 level deep
 define(AC_DIVERSION_NORMAL_1, 6)# AC_REQUIRE'd code, 1 level deep
 define(AC_DIVERSION_NORMAL,   7)# the tests and output code
-define(AC_DIVERSION_CMDS,     8)# extra shell commands in config.status
-define(AC_DIVERSION_ICMDS,    9)# extra initialization in config.status
+define(AC_DIVERSION_ICMDS,    8)# extra initialization in config.status
 
 
 # AC_DIVERT_PUSH(STREAM)
@@ -3668,11 +3666,6 @@ ifset([AC_LIST_COMMANDS],
 
 cat >>$CONFIG_STATUS <<\EOF
 
-#
-# CONFIG_COMMANDS section.
-#
-
-undivert(AC_DIVERSION_CMDS)dnl
 exit 0
 EOF
 chmod +x $CONFIG_STATUS