* doc/autoconf.texi (AU_DEFUN): Fix English,

suggested by Paul Eggert.
* lib/autoconf/autoupdate.m4: Correct reference to
acobsolete.m4, suggested by Alexandre Duret-Lutz.

diff --git a/ChangeLog b/ChangeLog
index 96ea5536811cc8eb689b5ecb88e6eee53ed0f77d..ef33f78e36745cfb871e5c3a0c6b15ae555c916f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,23 @@
-2004-01-30 Paolo Bonzini <bonzini@bogus.example.com>
+2004-02-04   Paolo Bonzini  <bonzini@gnu.org>
+
+       * doc/autoconf.texi (AU_DEFUN): Fix English,
+       suggested by Paul Eggert.
+       * lib/autoconf/autoupdate.m4: Correct reference to
+       acobsolete.m4, suggested by Alexandre Duret-Lutz.
+
+2004-02-02  Paolo Bonzini  <bonzini@gnu.org>
+
+       * bin/autoupdate.in: Define __file__ so that warnings
+       refer to the correct file.
+       * doc/autoconf.texi (AU_DEFUN): Describe more correctly
+       the behavior of the third argument.
+       * lib/autoconf/autoupdate.m4 (AU_DEFUN): Describe more
+       correctly the behavior of the third argument.  Document
+       what the three macros that AU_DEFUN defines do.  Fix
+       warning message when the third argument includes $0
+       (reported by Alexandre Duret-Lutz).
+
+2004-01-30 Paolo Bonzini <bonzini@gnu.org>
            Eric Sunshine <sunshine@sunshineco.com>
            Paul Eggert <eggert@twinsun.com>
 

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index b3ffb1398070b75144918a8c8355886aa746d2ad..3719112f849fb8026235b44e741abb4f026f6906 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -8941,9 +8941,9 @@ with @code{AC_DEFUN} is that the user will be warned that
 
 If she then uses @command{autoupdate}, the call to @var{old-macro} will be
 replaced by the modern @var{implementation}.  @var{message} should
-include information on what to do after running @command{autoupdate},
-and @command{autoupdate} will print it as a warning, @emph{and} include
-it in the updated @file{configure.ac} file.
+include information on what to do after running @command{autoupdate};
+@command{autoupdate} will print it as a warning, and include it
+in the updated @file{configure.ac} file.
 @end defmac
 
 @node Coding Style

diff --git a/lib/autoconf/autoupdate.m4 b/lib/autoconf/autoupdate.m4
index 8eaa388a7e3c1aeaeccaee0e40c79ddd3ce2e043..753b09328594e1531b6ba16794d7c2f0d6d382fe 100644 (file)
--- a/lib/autoconf/autoupdate.m4
+++ b/lib/autoconf/autoupdate.m4
@@ -75,7 +75,7 @@ m4_define([AU_DEFINE], [])
 #
 # This allows sharing the same code for both supporting obsoleted macros,
 # and to update a configure.ac.
-# See `acobsolete.m4' for a longer description.
+# See the end of `autoupdate.in' for a longer description.
 m4_define([AU_DEFUN],
 [# This is what autoupdate's m4 run will expand.  It fires
 # the warning (with _au_warn_XXX), outputs it into the