06-au-builtins.patch

[Akim Demaille]

This patch and the next one are needed for patch 08.

Index: 0.472/ChangeLog
from  Akim Demaille  <address@hidden>
        
        Autoupdate should not depend upon foreign macros.
        
        * autoupdate.sh (ac.m4): Use `_au_define', not `define'.
        (input.m4): Use `_au_BUILTIN' not `BUILTIN'.
        
Index: 0.472/autoupdate.sh
--- 0.472/autoupdate.sh Thu, 26 Oct 2000 21:03:04 +0200 akim (ace/11_autoupdate 
1.26 666)
+++ 0.473/autoupdate.sh Sun, 29 Oct 2000 22:50:40 +0100 akim (ace/11_autoupdate 
1.27 664)
@@ -257,7 +257,7 @@
   >$tmp/ac.txt
 
 # ac.m4 -- autoquoting definitions of the AC macros.
-$sed -n -e '/m4sugar.m4/!s/^[^:]*:\(.*\)$/define([\1], [[$0($@)]])/p' \
+$sed -n -e '/m4sugar.m4/!s/^[^:]*:\(.*\)$/_au_define([\1], [[$0($@)]])/p' \
   $tmp/ac.txt \
   >$tmp/ac.m4
 
@@ -291,14 +291,14 @@
     # _au_defun(NAME, BODY)
     # ---------------------
     # Define NAME to BODY, plus AU activation/deactivation.
-    define([_au_defun],
-    [define([\$1],
+    _au_define([_au_defun],
+    [_au_define([\$1],
     [_au_enable()dnl
     \$2[]dnl
     _au_disable()])])
 
     # Import the definition of the obsolete macros.
-    include([$tmp/au.m4])
+    _au_include([$tmp/au.m4])
 
 
     ## ------------------------ ##
@@ -317,7 +317,7 @@
     # __au_enable
     # -----------
     # Reenable the builtins, and m4sugar.
-    define([__au_enable],
+    _au_define([__au_enable],
     [_au_divert(-1)
     # Enable special characters.
     _au_changecom([#])
@@ -333,7 +333,7 @@
     # ----------
     # Called at the beginning of all the obsolete macros.  Reenable the
     # builtins, and m4sugar if needed.
-    define([_au_enable],
+    _au_define([_au_enable],
     [_au_ifdef([_au_enabled],
                [],
                [__au_enable()])_au_dnl
@@ -343,7 +343,7 @@
     # __au_disable
     # ------------
     # Disable the builtins, and m4sugar.
-    define([__au_disable],
+    _au_define([__au_disable],
     [_au_divert(-1)
     # Disable m4sugar, the AC autoquoting macros, and m4.
     _au_include([$tmp/disable.m4])
@@ -359,7 +359,7 @@
     # -----------
     # Called at the end of all the obsolete macros.  Disable the
     # builtins, and m4sugar if needed..
-    define([_au_disable],
+    _au_define([_au_disable],
     [_au_popdef([_au_enabled])_au_dnl
     _au_ifdef([_au_enabled],
               [],