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

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

diff --git a/ChangeLog b/ChangeLog
index 85d9c4f55b98f0606c00f8937c54730453ebdfbc..fbb723d8836eea769eb7f710d154bf1022c33855 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-02  Tom Tromey  <tromey@redhat.com>
+
+       * tests/Makefile.am (TESTS): Removed dup.test.
+       * tests/dup.test: Removed.
+       * aclocal.in (scan_file): Don't give error for duplicate macro.
+
 2001-07-01  Tom Tromey  <tromey@redhat.com>
 
        * automake.texi (Program and Library Variables): Document

diff --git a/aclocal.in b/aclocal.in
index 7879806cf223efbca92972472103ce23dfb31d41..aba9db84739ac7734bc3f89c1fe32c7938fed190 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -423,13 +423,13 @@ sub scan_file
            {
                $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;
        }
     }

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6110f8b603c8f4e5cb7484fb8969b9da0b074952..74857ad0499f44cd1b5f0e749f8fa88343fb2e21 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -106,7 +106,6 @@ distcommon.test \
 distdir.test \
 distname.test \
 double.test \
-dup.test \
 dup2.test \
 dup3.test \
 else.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 67f7e88c0e54582b2de3b7389e628c21405c091a..175b08a92fb440ae30128034909730d46502e88c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -172,7 +172,6 @@ distcommon.test \
 distdir.test \
 distname.test \
 double.test \
-dup.test \
 dup2.test \
 dup3.test \
 else.test \

diff --git a/tests/dup.test b/tests/dup.test
deleted file mode 100755 (executable)
index ee26cae..0000000
--- a/tests/dup.test
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-# Make sure aclocal catches duplicate definitions in acinclude.m4.
-
-. $srcdir/defs || exit 1
-
-cat > configure.in << 'END'
-pkg_INTERNAL_MACRO
-END
-
-cat > acinclude.m4 << 'END'
-AC_DEFUN([pkg_INTERNAL_MACRO])
-AC_DEFUN([pkg_INTERNAL_MACRO])
-END
-
-$ACLOCAL && exit 1
-exit 0