really fixed redef bug

diff --git a/Makefile.in b/Makefile.in
index bb5cfdb6d2aea11ddc7fe51bd5c40122297862d2..47b9467cd17a6a1c4066fe8fece6b11c7c49744d 100644 (file)
--- 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 edeca68995f4867a531df74331e1e28072ea26e4..200a83186c068bfc3f71510b65957d8677d0aec4 100755 (executable)
--- 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 6f665355515697af8737efb3bd2dbd0d0b1cc0d4..4034aa696eafcfd0c6cae613c28be7202585bce4 100644 (file)
--- 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 4b89e194906b4139510356c7331cfe988ba2996b..ed85ae8e57ea0bd6bd3398899e53a9fd36e7f399 100644 (file)
--- 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@