From 9366b5f84bae691640988939057703ec05082569 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Fri, 30 May 1997 05:42:15 +0000
Subject: [PATCH] really fixed redef bug

---
 Makefile.in       |  4 ----
 automake.in       | 12 ++++++------
 m4/Makefile.in    |  4 ----
 tests/Makefile.in |  4 ----
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index bb5cfdb..47b9467 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -49,10 +49,6 @@ POST_INSTALL = true
 NORMAL_UNINSTALL = true
 PRE_UNINSTALL = true
 POST_UNINSTALL = true
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
diff --git a/automake.in b/automake.in
index edeca68..200a831 100755
--- a/automake.in
+++ b/automake.in
@@ -4015,7 +4015,11 @@ sub scan_one_configure_file
 	{
 	    $configure_vars{$3} = 1;
 	}
-	if (/$AM_MISSING_PATTERN/o)
+	if (/$AM_MISSING_PATTERN/o
+	    && $1 ne 'ACLOCAL'
+	    && $1 ne 'AUTOCONF'
+	    && $1 ne 'AUTOMAKE'
+	    && $1 ne 'AUTOHEADER')
 	{
 	    $configure_vars{$1} = 1;
 	}
@@ -4027,11 +4031,7 @@ sub scan_one_configure_file
 	# FIXME.
 	if (/$AC_SUBST_PATTERN/o
 	    && $1 ne 'ANSI2KNR'
-	    && $1 ne 'INSTALL_SCRIPT'
-	    && $1 ne 'ACLOCAL'
-	    && $1 ne 'AUTOCONF'
-	    && $1 ne 'AUTOMAKE'
-	    && $1 ne 'AUTOHEADER')
+	    && $1 ne 'INSTALL_SCRIPT')
 	{
 	    $configure_vars{$1} = 1;
 	}
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 6f66535..4034aa6 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -49,10 +49,6 @@ POST_INSTALL = true
 NORMAL_UNINSTALL = true
 PRE_UNINSTALL = true
 POST_UNINSTALL = true
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4b89e19..ed85ae8 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -49,10 +49,6 @@ POST_INSTALL = true
 NORMAL_UNINSTALL = true
 PRE_UNINSTALL = true
 POST_UNINSTALL = true
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
-- 
2.7.4