From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Fri, 14 Mar 2003 21:46:57 +0000 (+0000)
Subject: * automake.in (scan_aclocal_m4): Define ACLOCAL_M4 even in
X-Git-Tag: Release-1-7-3b~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de27dcb6915b1193f62ea5dec206155d4a2075f3;p=thirdparty%2Fautomake.git

* automake.in (scan_aclocal_m4): Define ACLOCAL_M4 even in
subdirectories.  Makefile.in depends on that variable.
---

diff --git a/ChangeLog b/ChangeLog
index 89270809b..8a35c2b09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-14  Jim Meyering  <jim@meyering.net>
+
+	* automake.in (scan_aclocal_m4): Define ACLOCAL_M4 even in
+	subdirectories.  Makefile.in depends on that variable.
+
 2003-03-13  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* m4/init.m4: Remove a leftover comment from the pre-1.7 era.
diff --git a/automake.in b/automake.in
index 20c4c15f0..4f9df1e90 100755
--- a/automake.in
+++ b/automake.in
@@ -4356,6 +4356,13 @@ sub scan_aclocal_m4
 {
     my $regen_aclocal = 0;
 
+    if (-f 'aclocal.m4')
+    {
+	# When using aclocal.m4, define this variable even in subdirectories,
+	# because every Makefile.in depends on $(ACLOCAL_M4).
+	&define_variable ("ACLOCAL_M4", '$(top_srcdir)/aclocal.m4', INTERNAL);
+    }
+
     return (0, ())
       unless $relative_dir eq '.';
 
@@ -4364,7 +4371,6 @@ sub scan_aclocal_m4
 
     if (-f 'aclocal.m4')
     {
-	&define_variable ("ACLOCAL_M4", '$(top_srcdir)/aclocal.m4', INTERNAL);
 	&push_dist_common ('aclocal.m4');
 
 	my $aclocal = new Automake::XFile "< aclocal.m4";