From e5e52a1a2c2534c3e499b00b0ce53019e7fce12a Mon Sep 17 00:00:00 2001 From: Stepan Kasal Date: Tue, 5 Jul 2005 11:25:47 +0000 Subject: [PATCH] Fix my previous m4_foreach_w patch. --- ChangeLog | 15 +++++++++++++++ lib/autoconf/status.m4 | 9 ++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7d88b18..be9f6b03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-07-05 Stepan Kasal + + * 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 * 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 + + * 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 * doc/autoconf.texi (Configuration Headers): Change the explanation diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4 index ed88066b..a7769362 100644 --- 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],