The Associated Rewriters are proud to present...

^
/   U  T  O  U  P  D  A  T  E    I I I
/===+	/           It bells, It whistles...

* autoupdate.sh: Complete rewrite.  See that file for a detailed
explanation.
* acgeneral.sh: Don't use AU_DEFINE, but AU_DEFUN.
(AC_OUTPUT_COMMANDS_CNT): Renamed as...
(_AC_OUTPUT_COMMANDS_CNT): this.

diff --git a/ChangeLog b/ChangeLog
index 6ae8a81ccb7a619f3e4d7d1f3833bcafb2bfee7f..4e6a2e49cb4e5489bf21bae228ab9eaa381ba92a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2000-05-11  Akim Demaille  <akim@epita.fr>
+
+       The Associated Rewriters are proud to present...
+
+       ^
+       / \  U  T  O  U  P  D  A  T  E    I I I
+       /===\
+       /     \      It bells, It whistles...
+
+       * autoupdate.sh: Complete rewrite.  See that file for a detailed
+       explanation.
+       * acgeneral.sh: Don't use AU_DEFINE, but AU_DEFUN.
+       (AC_OUTPUT_COMMANDS_CNT): Renamed as...
+       (_AC_OUTPUT_COMMANDS_CNT): this.
+
 2000-05-11  Akim Demaille  <akim@epita.fr>
 
        Get rid of the m4 name spaces.

diff --git a/acgeneral.m4 b/acgeneral.m4
index f53bc9705cb2dcee043e54b5d555c7ebd94ec689..6608918261a6e40286ead9de4839c04764cbbcee 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -3549,13 +3549,13 @@ define([AC_LIST_COMMANDS_COMMANDS])
 # clashes :(  On the other hand, I'd like to avoid weird keys (e.g.,
 # depending upon __file__ or the pid).
 AU_DEFUN(AC_OUTPUT_COMMANDS,
-[define([AC_OUTPUT_COMMANDS_CNT], incr(AC_OUTPUT_COMMANDS_CNT))dnl
+[define([_AC_OUTPUT_COMMANDS_CNT], incr(_AC_OUTPUT_COMMANDS_CNT))dnl
 dnl Double quoted since that was the case in the original macro.
-AC_CONFIG_COMMANDS([default-]AC_OUTPUT_COMMANDS_CNT, [[$1]], [[$2]])dnl
+AC_CONFIG_COMMANDS([default-]_AC_OUTPUT_COMMANDS_CNT, [[$1]], [[$2]])dnl
 ])
 
-# Initialize both in `autoconf::' and `autoupdate::'.
-AU_DEFINE([AC_OUTPUT_COMMANDS_CNT], 0)
+# Initialize.
+AU_DEFUN([_AC_OUTPUT_COMMANDS_CNT], 0)
 
 
 # AC_CONFIG_COMMANDS_PRE(CMDS)
@@ -3681,8 +3681,8 @@ AC_CONFIG_LINKS($[ac_config_links_]_AC_LINK_FILES_CNT)dnl
   update, you should probably tune the result yourself.])# AC_LINK_FILES
 
 
-# Initialize both in `autoconf::' and `autoupdate::'.
-AU_DEFINE([_AC_LINK_FILES_CNT], 0)
+# Initialize.
+AU_DEFUN([_AC_LINK_FILES_CNT], 0)
 
 
 
@@ -3738,7 +3738,7 @@ define([AC_LIST_SUBDIRS])
 # If there are arguments given to AC_OUTPUT, dispatch them to the
 # proper modern macros.
 
-AU_DEFINE([AC_OUTPUT],
+AU_DEFUN([AC_OUTPUT],
 [ifval([$1],
       [AC_CONFIG_FILES([$1])
 ])dnl

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index f53bc9705cb2dcee043e54b5d555c7ebd94ec689..6608918261a6e40286ead9de4839c04764cbbcee 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -3549,13 +3549,13 @@ define([AC_LIST_COMMANDS_COMMANDS])
 # clashes :(  On the other hand, I'd like to avoid weird keys (e.g.,
 # depending upon __file__ or the pid).
 AU_DEFUN(AC_OUTPUT_COMMANDS,
-[define([AC_OUTPUT_COMMANDS_CNT], incr(AC_OUTPUT_COMMANDS_CNT))dnl
+[define([_AC_OUTPUT_COMMANDS_CNT], incr(_AC_OUTPUT_COMMANDS_CNT))dnl
 dnl Double quoted since that was the case in the original macro.
-AC_CONFIG_COMMANDS([default-]AC_OUTPUT_COMMANDS_CNT, [[$1]], [[$2]])dnl
+AC_CONFIG_COMMANDS([default-]_AC_OUTPUT_COMMANDS_CNT, [[$1]], [[$2]])dnl
 ])
 
-# Initialize both in `autoconf::' and `autoupdate::'.
-AU_DEFINE([AC_OUTPUT_COMMANDS_CNT], 0)
+# Initialize.
+AU_DEFUN([_AC_OUTPUT_COMMANDS_CNT], 0)
 
 
 # AC_CONFIG_COMMANDS_PRE(CMDS)
@@ -3681,8 +3681,8 @@ AC_CONFIG_LINKS($[ac_config_links_]_AC_LINK_FILES_CNT)dnl
   update, you should probably tune the result yourself.])# AC_LINK_FILES
 
 
-# Initialize both in `autoconf::' and `autoupdate::'.
-AU_DEFINE([_AC_LINK_FILES_CNT], 0)
+# Initialize.
+AU_DEFUN([_AC_LINK_FILES_CNT], 0)
 
 
 
@@ -3738,7 +3738,7 @@ define([AC_LIST_SUBDIRS])
 # If there are arguments given to AC_OUTPUT, dispatch them to the
 # proper modern macros.
 
-AU_DEFINE([AC_OUTPUT],
+AU_DEFUN([AC_OUTPUT],
 [ifval([$1],
       [AC_CONFIG_FILES([$1])
 ])dnl

diff --git a/man/autoupdate.1 b/man/autoupdate.1
index 1e473ceb8d8fb0274ae6b65624a58d84a953ad64..5836323b4fca8525613584199e91ad7f6ea07cdd 100644 (file)
--- a/man/autoupdate.1
+++ b/man/autoupdate.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.020.
-.TH AUTOUPDATE "1" "March 2000" "GNU autoconf 2.14a" FSF
+.TH AUTOUPDATE "1" "May 2000" "GNU autoconf 2.14a" FSF
 .SH NAME
 autoupdate \- Update a configure.in to a newer Autoconf
 .SH SYNOPSIS