1999-10-02 Akim Demaille <demaille@inf.enst.fr>

	* acgeneral.m4: Instead of just undefining eval, format, include
	and shift, rename them to m4_eval, etc.

diff --git a/acgeneral.m4 b/acgeneral.m4
index ff122f0dbae586c568ea703a425a0304bcd57d2a..2dc2f2798933e4596e866ca606e6cf00c385633b 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -62,10 +62,16 @@ Install it before installing Autoconf or set the
 M4 environment variable to its path name.
 )m4exit(2)])
 
-undefine([eval])
-undefine([include])
-undefine([shift])
-undefine([format])
+dnl Some m4 internals have names colliding with tokens we might use.
+dnl Rename them a` la `m4 --prefix-builtins'.
+define([m4_prefix],
+[define([m4_$1], defn([$1]))
+undefine([$1])])
+
+m4_prefix([eval])
+m4_prefix([include])
+m4_prefix([shift])
+m4_prefix([format])
 
 
 dnl ### Defining macros

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index ff122f0dbae586c568ea703a425a0304bcd57d2a..2dc2f2798933e4596e866ca606e6cf00c385633b 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -62,10 +62,16 @@ Install it before installing Autoconf or set the
 M4 environment variable to its path name.
 )m4exit(2)])
 
-undefine([eval])
-undefine([include])
-undefine([shift])
-undefine([format])
+dnl Some m4 internals have names colliding with tokens we might use.
+dnl Rename them a` la `m4 --prefix-builtins'.
+define([m4_prefix],
+[define([m4_$1], defn([$1]))
+undefine([$1])])
+
+m4_prefix([eval])
+m4_prefix([include])
+m4_prefix([shift])
+m4_prefix([format])
 
 
 dnl ### Defining macros