--- aclocal	Sat Jun 29 00:28:56 2002
+++ aclocal	Fri Jun 28 23:23:31 2002
@@ -397,17 +420,18 @@
 
 	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')
-	    {
-		warn "aclocal: $file: $.: duplicated macro \`$1'\n";
-		$exit_status = 1;
-	    }
-	    print STDERR "Found macro $1 in $file: $.\n" if $verbosity;
+
+	    # Note: we used to give an error here if we saw a
+	    # duplicated macro.  However, this turns out to be
+	    # extremely unpopular.  It causes actual problems which
+	    # are hard to work around, especially when you must
+	    # mix-and-match tool versions.
+
+	    print STDERR "aclocal: found macro $1 in $file: $.\n" if $verbose;
 	}
     }
     close (FILE);