]> git.ipfire.org Git - thirdparty/autoconf.git/commitdiff
Work around M4 1.6 warning on undefined macros.
authorEric Blake <ebb9@byu.net>
Fri, 11 Jul 2008 14:55:15 +0000 (08:55 -0600)
committerEric Blake <ebb9@byu.net>
Fri, 11 Jul 2008 16:10:53 +0000 (10:10 -0600)
* lib/m4sugar/m4sugar.m4 (changeword, symbols): Don't rename if
not already available as builtins.

Signed-off-by: Eric Blake <ebb9@byu.net>
ChangeLog
lib/m4sugar/m4sugar.m4

index 822e2ca82a52db1b37ca2e1eefbddd170813f6e5..4df6dc32b4e006543cc054c60cc2f1fb5f9f36f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-11  Eric Blake  <ebb9@byu.net>
+
+       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  <Ralf.Wildenhues@gmx.de>
 
        * doc/autoconf.texi (@dvar): Remove trailing newline.
index 4f86546f945061d6e4213967ea74305e0e5fced3..faa86ee99e93037dba42aee48d4535c45eb439e8 100644 (file)
@@ -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])