* 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.

diff --git a/ChangeLog b/ChangeLog
index 7e19259..36cb4a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/aclocal.in b/aclocal.in
index 472d1d0..1ac0f14 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -112,7 +112,7 @@ $ac_require_rx = "AC_REQUIRE\\(\\[?([^])]*)\\]?\\)";
 \f
 
 local (@dirlist) = &parse_arguments (@ARGV);
-&scan_m4_files ($acdir, @dirlist);
+&scan_m4_files (@dirlist);
 &scan_configure;
 if (! $exit_status)
 {
@@ -201,6 +201,9 @@ sub parse_arguments
        exit 0;
     }
 
+    # Search our install directory last.
+    push (@dirlist, $acdir);
+
     return @dirlist;
 }
 
@@ -392,13 +395,14 @@ sub scan_file
 
        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;
            }