+1999-12-15 Tom Tromey <tromey@cygnus.com>
+
+ * aclocal.in: Don't pass $acdir to scan_m4_files.
+ (parse_arguments): Push $acdir on end of dirlist.
+ (scan_file): Don't warn if duplicate macro seen.
+
1999-12-13 Tom Tromey <tromey@cygnus.com>
Fix for PR automake/30 and PR automake/23. Fixes test
\f
local (@dirlist) = &parse_arguments (@ARGV);
-&scan_m4_files ($acdir, @dirlist);
+&scan_m4_files (@dirlist);
&scan_configure;
if (! $exit_status)
{
exit 0;
}
+ # Search our install directory last.
+ push (@dirlist, $acdir);
+
return @dirlist;
}
if (/$ac_defun_rx/)
{
- if (!defined $map{$1})
+ if (! defined $map{$1})
{
$map{$1} = $file;
}
- # Allow acinclude.m4 to override other macro files.
- elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4')
+ elsif ($map{$1} eq $file)
{
+ # You basically never want a macro in the same .m4
+ # file twice.
warn "aclocal: $file: $.: duplicated macro \`$1'\n";
$exit_status = 1;
}