From d366f0548ba781451a29936abc14b3a2000d13c7 Mon Sep 17 00:00:00 2001
From: Ben Elliston <bje+keyword+gnu.7caf74@air.net.au>
Date: Tue, 5 Oct 1999 04:55:15 +0000
Subject: [PATCH] 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.
---
 acgeneral.m4            | 14 ++++++++++----
 lib/autoconf/general.m4 | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/acgeneral.m4 b/acgeneral.m4
index ff122f0d..2dc2f279 100644
--- 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 ff122f0d..2dc2f279 100644
--- 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