Patch: no more duplicated macro error

[Tom Tromey]

I'm checking this in.  Nowadays I think the aclocal duplicated macro
error causes more bug reports than the problem it was meant to fix.
So, I'm checking this in.

If you have a reason to keep this error, feel free to speak up.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * tests/Makefile.am (TESTS): Removed dup.test.
        * tests/dup.test: Removed.
        * aclocal.in (scan_file): Don't give error for duplicate macro.

Index: aclocal.in
===================================================================
RCS file: /cvs/automake/automake/aclocal.in,v
retrieving revision 1.56
diff -u -r1.56 aclocal.in
--- aclocal.in 2001/06/15 00:41:29 1.56
+++ aclocal.in 2001/07/02 20:07:44
@@ -423,13 +423,13 @@
            {
                $map{$1} = $file;
            }
-           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;
-           }
+
+           # 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;
        }
     }
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.316
diff -u -r1.316 Makefile.am
--- tests/Makefile.am 2001/07/01 23:18:09 1.316
+++ tests/Makefile.am 2001/07/02 20:07:44
@@ -106,7 +106,6 @@
 distdir.test \
 distname.test \
 double.test \
-dup.test \
 dup2.test \
 dup3.test \
 else.test \
Index: tests/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.in,v
retrieving revision 1.415
diff -u -r1.415 Makefile.in
--- tests/Makefile.in 2001/07/01 23:18:09 1.415
+++ tests/Makefile.in 2001/07/02 20:07:44
@@ -172,7 +172,6 @@
 distdir.test \
 distname.test \
 double.test \
-dup.test \
 dup2.test \
 dup3.test \
 else.test \