Fix my previous m4_foreach_w patch.

diff --git a/ChangeLog b/ChangeLog
index a7d88b1886779cad523fdcd99c44488e9c7bd99b..be9f6b03566635e92c0b135e6568dea5c6829d68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-05  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/autoconf/status.m4 (_AC_CONFIG_DEPENDENCIES): Fix the
+       description, the macro now accepts only a single tag.
+       (_AC_CONFIG_UNIQUE): Likewise; s/AC_File/[$1]/
+
 2005-07-05  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/autoconf/autotest.m4 (AC_CONFIG_TESTDIR): Set also
@@ -36,6 +42,15 @@
        report a name for the working directory.
        * NEWS: Remove the claim that we test for funny chars in dir names.
 
+2005-07-01  Stepan Kasal  <kasal@ucw.cz>
+
+       * lib/autoconf/general.m4 (AC_FOREACH): Make obsolete; it's
+       replaced ...
+       * lib/m4sugar/m4sugar.m4 (m4_foreach_w): ... by this new macro.
+       * lib/autoconf/status.m4 (_AC_CONFIG_DEPENDENCIES, _AC_CONFIG_UNIQUE):
+       Now accept a single tag, not whitespace separated list.
+       (AC_CONFIG_SUBDIRS): Call _AC_CONFIG_UNIQUE in a m4_foreach_w loop.
+
 2005-06-30  Stepan Kasal  <kasal@ucw.cz>
 
        * doc/autoconf.texi (Configuration Headers): Change the explanation

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index ed88066b9b63ec9c69ef1e8c9ff22312b6b80a3a..a77693628e9e8fbf193a6f439d123c3d1e85cc74 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -213,7 +213,7 @@ m4_define([_AC_CONFIG_DEPENDENCY],
 
 # _AC_CONFIG_DEPENDENCIES(DEST[:SOURCE1[:SOURCE2...]])
 # ----------------------------------------------------
-# Declare the DESTs depend upon their SOURCE1 etc.
+# Declare the DEST depends upon SOURCE1 etc.
 m4_define([_AC_CONFIG_DEPENDENCIES],
 [_AC_CONFIG_DEPENDENCY(m4_bpatsubst([$1], [:], [,]))dnl
 ])
@@ -224,12 +224,11 @@ m4_define([_AC_CONFIG_DEPENDENCIES],
 #
 # Verify that there is no double definition of an output file
 # (precisely, guarantees there is no common elements between
-# CONFIG_HEADERS, CONFIG_FILES, CONFIG_LINKS, and CONFIG_SUBDIRS).
+# CONFIG_FILES, CONFIG_HEADERS, CONFIG_LINKS, CONFIG_COMMANDS and
+# CONFIG_SUBDIRS).
 #
-# Note that this macro does not check if the list $[1] itself
-# contains doubles.
 m4_define([_AC_CONFIG_UNIQUE],
-[m4_pushdef([AC_Dest], m4_bpatsubst(AC_File, [:.*]))dnl
+[m4_pushdef([AC_Dest], m4_bpatsubst([$1], [:.*]))dnl
   AC_CONFIG_IF_MEMBER(AC_Dest, [AC_LIST_FILES],
      [AC_FATAL(`AC_Dest' [is already registered with AC_CONFIG_FILES.])])dnl
   AC_CONFIG_IF_MEMBER(AC_Dest, [AC_LIST_HEADERS],