diff options
| author | Eric Blake <eblake@redhat.com> | 2010-09-16 08:43:27 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2010-09-16 09:07:31 -0600 |
| commit | f6030a3204a9b87e9b346e6eff4ce1117382fc86 (patch) | |
| tree | 4cc3d4744f1631e4c2747f8c9b0b8f0756775ad5 /lib/m4sugar | |
| parent | 9144856609b28e8b4f58bca4d44489ddc23170a9 (diff) | |
| download | autoconf-f6030a3204a9b87e9b346e6eff4ce1117382fc86.tar.gz | |
m4sugar: fix regression in AC_MSG_ERROR expansion
AS_ERROR Regression introduced in commit cffdc3947, but the
underlying problem stems from the introduction of m4_defun_init
in commit d0c5f482.
* lib/m4sugar/m4sugar.m4 (m4_defun_init): Avoid macro
concatenation on subsequent expansions
* tests/m4sh.at (AS_WARN and AS_ERROR): New test.
* tests/m4sugar.at (m4@&t@_require: one-shot initialization):
Enhance test.
* NEWS: Document the fix.
* THANKS: Update.
Reported by Adrian Bunk and and Nishio Futoshi.
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'lib/m4sugar')
| -rw-r--r-- | lib/m4sugar/m4sugar.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4 index 95b7bcf7..d4401271 100644 --- a/lib/m4sugar/m4sugar.m4 +++ b/lib/m4sugar/m4sugar.m4 @@ -1973,7 +1973,7 @@ m4_define([m4_defun], # m4_defun'd, we can add a parameter, similar to the third parameter # to m4_defun. m4_define([m4_defun_init], -[m4_define([$1], [$3])m4_defun([$1], +[m4_define([$1], [$3[]])m4_defun([$1], [$2[]_m4_popdef(]m4_dquote($[0])[)m4_indir(]m4_dquote($[0])dnl [m4_if(]m4_dquote($[#])[, [0], [], ]m4_dquote([,$]@)[))], [m4_pushdef])]) |