diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2006-04-07 18:25:30 +0000 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2006-04-07 18:25:30 +0000 |
| commit | aefd74ee25e34e446e760bf39eba09dc02adaf05 (patch) | |
| tree | 51eef0463bb25a877b1373bb457e12d763248e6c /bin/autoupdate.in | |
| parent | 67b61ef7002fe8dde384b28508c12f0a92a1ca9c (diff) | |
| download | autoconf-aefd74ee25e34e446e760bf39eba09dc02adaf05.tar.gz | |
* 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>.
Diffstat (limited to 'bin/autoupdate.in')
| -rw-r--r-- | bin/autoupdate.in | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/bin/autoupdate.in b/bin/autoupdate.in index ef1e7bf6..2d6a9384 100644 --- 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; |