Patch: FYI: YA 1.4.x patch

[Tom Tromey]

I'm checking this in.

This removes an old error from aclocal that was removed from the trunk
quite a while ago.  This is another change for the Gnome guys.  I hope
to release the "really" final 1.4.x automake soon.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * automake.in: Changed cygnus.com to redhat.com.
        * aclocal.in: Changed cygnus.com to redhat.com.
        (scan_file): Don't give error for duplicate macro.

Index: aclocal.in
===================================================================
RCS file: /cvs/automake/automake/aclocal.in,v
retrieving revision 1.40.4.5
diff -u -r1.40.4.5 aclocal.in
--- aclocal.in 14 Jul 2002 17:38:55 -0000 1.40.4.5
+++ aclocal.in 25 Jul 2002 16:53:47 -0000
@@ -20,7 +20,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# Written by Tom Tromey <address@hidden>.
+# Written by Tom Tromey <address@hidden>.
 
 eval 'exec @PERL@ -S $0 ${1+"$@"}'
     if 0;
@@ -177,7 +177,7 @@
            print "Copyright (C) 1999, 2001 Free Software Foundation, Inc.\n";
            print "This is free software; see the source for copying 
conditions.  There is NO\n";
            print "warranty; not even for MERCHANTABILITY or FITNESS FOR A 
PARTICULAR PURPOSE.\n\n";
-           print "Written by Tom Tromey <address@hidden>\n";
+           print "Written by Tom Tromey <address@hidden>\n";
            exit 0;
        }
        elsif ($arglist[0] eq '--help')
@@ -411,12 +411,13 @@
            {
                $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;
-           }
+
+           # 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 "Found macro $1 in $file: $.\n" if $verbosity;
        }
     }
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.644.4.21
diff -u -r1.644.4.21 automake.in
--- automake.in 14 Jul 2002 17:38:55 -0000 1.644.4.21
+++ automake.in 25 Jul 2002 16:53:52 -0000
@@ -24,7 +24,7 @@
 # 02111-1307, USA.
 
 # Originally written by David Mackenzie <address@hidden>.
-# Perl reimplementation by Tom Tromey <address@hidden>.
+# Perl reimplementation by Tom Tromey <address@hidden>.
 
 
 # Parameters set by configure.  Not to be changed.  NOTE: assign
@@ -404,7 +404,7 @@
            print "Copyright (C) 1999, 2001 Free Software Foundation, Inc.\n";
            print "This is free software; see the source for copying 
conditions.  There is NO\n";
            print "warranty; not even for MERCHANTABILITY or FITNESS FOR A 
PARTICULAR PURPOSE.\n\n";
-           print "Written by Tom Tromey <address@hidden>\n";
+           print "Written by Tom Tromey <address@hidden>\n";
 
            exit 0;
        }
Index: tests/ChangeLog
from  Tom Tromey  <address@hidden>

        * Makefile.am (TESTS): Removed dup.test.
        * dup.test: Removed.

Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.170.4.1
diff -u -r1.170.4.1 Makefile.am
--- tests/Makefile.am 9 Jun 2001 13:04:24 -0000 1.170.4.1
+++ tests/Makefile.am 25 Jul 2002 16:53:54 -0000
@@ -14,7 +14,7 @@
 cxxcpp.test cxxlibobj.test cxxlink.test cxxnoc.test cxxo.test \
 cygwin32.test defun.test defun2.test dejagnu.test depacl.test \
 depacl2.test depend.test depend2.test depend3.test discover.test \
-distdir.test dup.test dup2.test else.test empty.test error.test        \
+distdir.test dup2.test else.test empty.test error.test \
 exdir.test exdir2.test exsource.test extra.test extra3.test \
 extra4.test flibs.test fnoc.test fo.test fonly.test fpinst2.test \
 fpinstall.test gnits.test implicit.test include.test info.test \