* lib/autoconf/status.m4 (_AC_CONFIG_FOOS): Do not append normalized

TAGS to ac_config_<foo>s.
(AC_CONFIG_FILES, AC_CONFIG_HEADERS, AC_CONFIG_LINKS): Do so here.
(AC_CONFIG_COMMANDS): Append NAME to ac_config_commands without
normalizing it, consistent it with previous releases.
* tests/torture.at (Macro calls in AC_CONFIG_COMMANDS tags): New test.

diff --git a/ChangeLog b/ChangeLog
index b27a1f986ad1fefabf3c478234d8289da70e8690..e5dca75db5e32030cd09f807789603f6ad959747 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-05  Noah Misch  <noah@cs.caltech.edu>
+
+       * lib/autoconf/status.m4 (_AC_CONFIG_FOOS): Do not append normalized
+       TAGS to ac_config_<foo>s.
+       (AC_CONFIG_FILES, AC_CONFIG_HEADERS, AC_CONFIG_LINKS): Do so here.
+       (AC_CONFIG_COMMANDS): Append NAME to ac_config_commands without
+       normalizing it, consistent it with previous releases.
+       * tests/torture.at (Macro calls in AC_CONFIG_COMMANDS tags): New test.
+
 2006-04-05  Paul Eggert  <eggert@cs.ucla.edu>
 
        * lib/m4sugar/m4sh.m4 (AS_BASENAME_EXPR, AS_DIRNAME_EXPR):

diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
index 7ba7860bd9db197b9dbcc06f860e6780c9ea344c..b29b94fa6c14fa4ae926c5ebb55b726b6d60c701 100644 (file)
--- a/lib/autoconf/status.m4
+++ b/lib/autoconf/status.m4
@@ -233,7 +233,6 @@ m4_define([_AC_CONFIG_FOOS],
 m4_define([_AC_SEEN_CONFIG(ANY)])dnl
 m4_define([_AC_SEEN_CONFIG($1)])dnl
 _AC_CONFIG_COMMANDS_INIT([$4])dnl
-ac_config_[]m4_tolower([$1])="$ac_config_[]m4_tolower([$1]) m4_normalize([$2])"
 ])
 
 
@@ -293,7 +292,9 @@ m4_ifval([$4],
 # -------------------------------------------------
 # Specify output files, i.e., files that are configured with AC_SUBST.
 #
-AC_DEFUN([AC_CONFIG_FILES], [_AC_CONFIG_FOOS([FILES], $@)])
+AC_DEFUN([AC_CONFIG_FILES],
+[_AC_CONFIG_FOOS([FILES], $@)
+ac_config_files="$ac_config_files m4_normalize([$1])"])
 
 
 # _AC_SED_CMD_LIMIT
@@ -539,7 +540,9 @@ dnl  fi
 # Specify that the HEADERS are to be created by instantiation of the
 # AC_DEFINEs.
 #
-AC_DEFUN([AC_CONFIG_HEADERS], [_AC_CONFIG_FOOS([HEADERS], $@)])
+AC_DEFUN([AC_CONFIG_HEADERS],
+[_AC_CONFIG_FOOS([HEADERS], $@)
+ac_config_headers="$ac_config_headers m4_normalize([$1])"])
 
 
 # AC_CONFIG_HEADER(HEADER-TO-CREATE ...)
@@ -691,7 +694,9 @@ m4_ifdef([_AC_AM_CONFIG_HEADER_HOOK],
 # Reject DEST=., because it is makes it hard for ./config.status
 # to guess the links to establish (`./config.status .').
 #
-AC_DEFUN([AC_CONFIG_LINKS], [_AC_CONFIG_FOOS([LINKS], $@)])
+AC_DEFUN([AC_CONFIG_LINKS],
+[_AC_CONFIG_FOOS([LINKS], $@)
+ac_config_links="$ac_config_links m4_normalize([$1])"])
 
 
 # AC_LINK_FILES(SOURCE..., DEST...)
@@ -769,7 +774,13 @@ m4_define([_AC_OUTPUT_LINK],
 # commands must be associated with a NAME, which should be thought
 # as the name of a file the COMMANDS create.
 #
-AC_DEFUN([AC_CONFIG_COMMANDS], [_AC_CONFIG_FOOS([COMMANDS], $@)])
+# Unlike other _AC_CONFIG_FOOS, we do not m4_normalize NAME before storing it in
+# ac_config_commands.  This difference is historical, and it allows macro calls
+# in NAME.
+#
+AC_DEFUN([AC_CONFIG_COMMANDS],
+[_AC_CONFIG_FOOS([COMMANDS], $@)
+ac_config_commands="$ac_config_commands $1"])
 
 
 # AC_OUTPUT_COMMANDS(EXTRA-CMDS, INIT-CMDS)

diff --git a/tests/torture.at b/tests/torture.at
index 79095f755fcb933435ae58abb1f22b3ea2c27f4f..2ee9ad712b4d896223e82750b75a0f4ffd8ed324 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -204,6 +204,25 @@ AT_CLEANUP
 
 
 
+## ---------------------------------------- ##
+## Macro calls in AC_CONFIG_COMMANDS tags.  ##
+## ---------------------------------------- ##
+
+AT_SETUP([Macro calls in AC_CONFIG_COMMANDS tags])
+
+AT_DATA_M4SUGAR([configure.ac],
+[[AC_INIT
+AC_CONFIG_COMMANDS([m4_if(1,1,mytag)])
+AC_OUTPUT
+]])
+
+AT_CHECK_AUTOCONF
+AT_CHECK_CONFIGURE
+
+AT_CLEANUP
+
+
+
 ## ------------------- ##
 ## Missing templates.  ##
 ## ------------------- ##