* bin/autoupdate.in (handle_autoconf_patches): Change the way we

distinguish m4sugar macros.
* tests/tools.at (autoupdating with aclocal and m4_include):
New test.  Bug reported by Gary V. Vaughan <gary@gnu.org>,
test case by Noah Misch <noah@cs.caltech.edu>.

diff --git a/ChangeLog b/ChangeLog
index a4ba4b0c8e07bbe5ffbe26e8eb3498084b00c0e4..b5acaa3f35afa05f28ef0fd1f50f23d4ad9012c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-07  Stepan Kasal  <kasal@ucw.cz>,
+           Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * bin/autoupdate.in (handle_autoconf_patches): Change the way we
+       distinguish m4sugar macros.
+       * tests/tools.at (autoupdating with aclocal and m4_include):
+       New test.  Bug reported by Gary V. Vaughan <gary@gnu.org>,
+       test case by Noah Misch <noah@cs.caltech.edu>.
+
 2006-04-07  Stepan Kasal  <kasal@ucw.cz>
 
        Revert my change from 2006-03-17, in other words:

diff --git a/bin/autoupdate.in b/bin/autoupdate.in
index ef1e7bf633d08d9da879f50ea1731febbca29e02..2d6a9384b78a9795f30c746e30f5daa913438a00 100644 (file)
--- a/bin/autoupdate.in
+++ b/bin/autoupdate.in
@@ -145,21 +145,11 @@ sub handle_autoconf_macros ()
     {
       chomp;
       my ($domain, $file, $macro) = /^(AC|AU):(.*):([^:]*)$/ or next;
-      # ../lib/m4sugar/m4sugar.m4  -> m4sugar
-      # ../lib/m4sugar/version.m4  -> m4sugar
-      # ../lib/autoconf/general.m4 -> autoconf
-      # aclocal.m4 -> aclocal
-      # ../lib/m4sugar/m4sh.m4     -> m4sh
-      my $set = basename (dirname ($file));
-      $set = 'aclocal' if $file eq 'aclocal.m4';
-      $set = 'm4sh' if basename($file) eq 'm4sh.m4';
-      error "unknown set: $set: $_"
-       unless $set =~ /^(m4sugar|m4sh|aclocal|autoconf)$/;
       if ($domain eq "AU")
        {
          $au_macros{$macro} = 1;
        }
-      elsif ($set eq "m4sugar")
+      elsif ($file =~ /(^|\/)m4sugar\/(m4sugar|version)\.m4$/)
        {
          # Add the m4sugar macros to m4_builtins.
          $m4_builtins{$macro} = 1;

diff --git a/tests/tools.at b/tests/tools.at
index 78f9936097c9c88312059a71ed779341fb1a3108..29eb658a4531a299d5c72b281555ffb786786112 100644 (file)
--- a/tests/tools.at
+++ b/tests/tools.at
@@ -719,3 +719,32 @@ AT_CHECK_CONFIGURE([], [0], [stdout])
 AT_CHECK([[grep ' 1 2 3 4 5 6' stdout]], 0, [ignore], [ignore])
 
 AT_CLEANUP
+
+
+# autoupdating with aclocal and m4_include
+# ----------------------------------------
+AT_SETUP([autoupdating with aclocal and m4@&t@_include])
+
+# We use aclocal.
+AT_CHECK([aclocal --version || exit 77], [], [ignore], [ignore])
+
+mkdir m4 aclocal
+AT_DATA([configure.in],
+[[AC_INIT(x,0)
+AC_UNCHANGED_MACRO
+AC_OLD_MACRO
+AC_OUTPUT
+]])
+AT_DATA([m4/stuff.m4],
+[[AU_ALIAS([AC_OLD_MACRO], [AC_NEW_MACRO])
+AC_DEFUN([AC_NEW_MACRO], [echo hi])
+AC_DEFUN([AC_UNCHANGED_MACRO], [echo one])
+]])
+cp m4/stuff.m4 aclocal/stuff.m4
+AT_CHECK([aclocal -I aclocal], [0], [ignore], [ignore])
+# Checking `autoupdate'.
+AT_CHECK_AUTOUPDATE
+AT_CHECK([aclocal -I m4], [0], [ignore], [ignore])
+AT_CHECK_AUTOUPDATE
+
+AT_CLEANUP