From 5fb9f9c1a2a310caf37d45d2bc7640723e40c311 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 11 Jul 2008 08:55:15 -0600 Subject: [PATCH] Work around M4 1.6 warning on undefined macros. * lib/m4sugar/m4sugar.m4 (changeword, symbols): Don't rename if not already available as builtins. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ lib/m4sugar/m4sugar.m4 | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 822e2ca82..4df6dc32b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-11 Eric Blake + + Work around M4 1.6 warning on undefined macros. + * lib/m4sugar/m4sugar.m4 (changeword, symbols): Don't rename if + not already available as builtins. + 2008-07-06 Ralf Wildenhues * doc/autoconf.texi (@dvar): Remove trailing newline. diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4 index 4f86546f9..faa86ee99 100644 --- a/lib/m4sugar/m4sugar.m4 +++ b/lib/m4sugar/m4sugar.m4 @@ -117,11 +117,16 @@ m4_define([m4_copy_unm4], # Some m4 internals have names colliding with tokens we might use. -# Rename them a` la `m4 --prefix-builtins'. +# Rename them a` la `m4 --prefix-builtins'. Conditionals first, since +# some subsequent renames are conditional. +m4_rename_m4([ifdef]) +m4_rename([ifelse], [m4_if]) + m4_rename_m4([builtin]) m4_rename_m4([changecom]) m4_rename_m4([changequote]) -m4_undefine([changeword]) +m4_ifdef([changeword],dnl conditionally available in 1.4.x +[m4_undefine([changeword])]) m4_rename_m4([debugfile]) m4_rename_m4([debugmode]) m4_rename_m4([decr]) @@ -132,8 +137,6 @@ m4_rename_m4([errprint]) m4_rename_m4([esyscmd]) m4_rename_m4([eval]) m4_rename_m4([format]) -m4_rename_m4([ifdef]) -m4_rename([ifelse], [m4_if]) m4_undefine([include]) m4_rename_m4([incr]) m4_rename_m4([index]) @@ -154,7 +157,8 @@ m4_rename([regexp], [m4_bregexp]) m4_rename_m4([shift]) m4_undefine([sinclude]) m4_rename_m4([substr]) -m4_rename_m4([symbols]) +m4_ifdef([symbols],dnl present only in alpha-quality 1.4o +[m4_rename_m4([symbols])]) m4_rename_m4([syscmd]) m4_rename_m4([sysval]) m4_rename_m4([traceoff]) -- 2.47.3