* acgeneral.m4 (AU_ALIAS): Do not use `defn' since then autoupdate

would replace an old macro call with the new macro body instead of
the new macro call.
* tests/tools.m4 (autoupdate): Test an AU_ALIAS'd macro update.

diff --git a/ChangeLog b/ChangeLog
index 5e115f44c8d59acad6dbf96be0d899f9c6936795..125e3d6df931f5bb4de7d7ca05827c2ab862e14d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-19  Pavel Roskin  <proski@gnu.org>
+
+       * acgeneral.m4 (AU_ALIAS): Do not use `defn' since then autoupdate
+       would replace an old macro call with the new macro body instead of
+       the new macro call.
+       * tests/tools.m4 (autoupdate): Test an AU_ALIAS'd macro update.
+
 2000-09-19  Pavel Roskin  <proski@gnu.org>
 
        * tests/atspecific.m4 (_AT_CHECK_AC_MACRO): New macro.

diff --git a/acgeneral.m4 b/acgeneral.m4
index 4de6c09bef450f7a578329e406212f93125995e9..5c93b6e0f751199eafab4518d4ec31b71464cd94 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -682,8 +682,11 @@ $2],
 # little difference with using AU_DEFUN but the fact there is little
 # interest in running the test suite on both OLD-NAME and NEW-NAME.
 # This macro makes it possible to distinguish such cases.
+#
+# Do not use `defn' since then autoupdate would replace an old macro
+# call with the new macro body instead of the new macro call.
 define([AU_ALIAS],
-[AU_DEFUN([$1], defn([$2]))])
+[AU_DEFUN([$1], [$2])])
 
 
 

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 4de6c09bef450f7a578329e406212f93125995e9..5c93b6e0f751199eafab4518d4ec31b71464cd94 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -682,8 +682,11 @@ $2],
 # little difference with using AU_DEFUN but the fact there is little
 # interest in running the test suite on both OLD-NAME and NEW-NAME.
 # This macro makes it possible to distinguish such cases.
+#
+# Do not use `defn' since then autoupdate would replace an old macro
+# call with the new macro body instead of the new macro call.
 define([AU_ALIAS],
-[AU_DEFUN([$1], defn([$2]))])
+[AU_DEFUN([$1], [$2])])
 
 
 

diff --git a/tests/tools.m4 b/tests/tools.m4
index 4529116f52b13339a3238ff9fb6e3d9f3289488f..e9f75a70fc5bf6a8889f794516dd09b9bf727949 100644 (file)
--- a/tests/tools.m4
+++ b/tests/tools.m4
@@ -159,11 +159,11 @@ AT_CLEANUP
 ## ------------ ##
 
 # Check that AC_LINK_FILES and AC_OUTPUT are properly updated.
-# actest.m4 AU_ defines OSBOLETE to UPDATED.
 AT_SETUP(autoupdate)
 
 AT_DATA(configure.in,
 [[AC_INIT
+AC_CANONICAL_SYSTEM
 dnl The doc says 27 is a valid fubar.
 fubar=27
 AC_OUTPUT(Makefile, echo $fubar, fubar=$fubar)
@@ -172,6 +172,7 @@ AC_OUTPUT(Makefile, echo $fubar, fubar=$fubar)
 # Checking `autoupdate'.
 AT_CHECK([../autoupdate --autoconf-dir $top_srcdir -<configure.in], 0,
 [[AC_INIT
+AC_CANONICAL_TARGET()
 dnl The doc says 27 is a valid fubar.
 fubar=27
 AC_CONFIG_FILES([Makefile])