I've applied the attached patch.  It treats include & sinclude like the
other macros that are about to be redefined, undefining the originals
rather than renaming them into the m4_ namespace.

2005-06-08  Derek Price  <[EMAIL PROTECTED]>

        * lib/m4sugar/m4sugar.m4: Undefine include & sinclude rather than
        renaming them since they are about to be redefined anyhow.

Cheers,

Derek
Index: lib/m4sugar/m4sugar.m4
===================================================================
RCS file: /cvsroot/autoconf/autoconf/lib/m4sugar/m4sugar.m4,v
retrieving revision 2.90
diff -u -p -r2.90 m4sugar.m4
--- lib/m4sugar/m4sugar.m4      6 Jun 2005 08:47:02 -0000       2.90
+++ lib/m4sugar/m4sugar.m4      8 Jun 2005 18:49:36 -0000
@@ -133,7 +133,7 @@ m4_rename_m4([eval])
 m4_rename_m4([format])
 m4_rename_m4([ifdef])
 m4_rename([ifelse], [m4_if])
-m4_rename_m4([include])
+m4_undefine([include])
 m4_rename_m4([incr])
 m4_rename_m4([index])
 m4_rename_m4([indir])
@@ -146,7 +146,7 @@ m4_undefine([popdef])
 m4_rename_m4([pushdef])
 m4_rename([regexp], [m4_bregexp])
 m4_rename_m4([shift])
-m4_rename_m4([sinclude])
+m4_undefine([sinclude])
 m4_rename_m4([substr])
 m4_rename_m4([symbols])
 m4_rename_m4([syscmd])

Reply via email to