From: Pavel Roskin <proski@gnu.org>
Date: Tue, 10 Oct 2000 01:03:42 +0000 (+0000)
Subject: * automake.in (handle_aclocal_m4): If ACLOCAL_M4_SOURCES is
X-Git-Tag: Release-1-4b~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d71309a336c067a435da6fdc6775e97718a1036;p=thirdparty%2Fautomake.git

* automake.in (handle_aclocal_m4): If ACLOCAL_M4_SOURCES is
defined use it as the list of M4 files aclocal.m4 depends on.
---

diff --git a/ChangeLog b/ChangeLog
index 7167c6fd8..d75cca26d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 	assignments changing $? - it's broken in ash-0.2.
 	* m4/missing.m4 (AM_MISSING_HAS_RUN): Likewise.
 
+	* automake.in (handle_aclocal_m4): If ACLOCAL_M4_SOURCES is
+	defined use it as the list of M4 files aclocal.m4 depends on.
+
 2000-10-06  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
 	* aclocal.in (add_file): Strip comments while scanning for
diff --git a/automake.in b/automake.in
index 2491141d9..4dbb2fc61 100755
--- a/automake.in
+++ b/automake.in
@@ -3172,10 +3172,14 @@ sub handle_aclocal_m4
 			    ($acinclude ? ' acinclude.m4' : '')
 			    );
 
-	# Scan all -I directories for m4 files.  These are our
-	# dependencies.
-	if (&variable_defined ('ACLOCAL_AMFLAGS'))
+	if (&variable_defined ('ACLOCAL_M4_SOURCES'))
 	{
+	    push (@ac_deps, "\$(ACLOCAL_M4_SOURCES)");
+	}
+	elsif (&variable_defined ('ACLOCAL_AMFLAGS'))
+	{
+	    # Scan all -I directories for m4 files.  These are our
+	    # dependencies.
 	    local ($examine_next, $amdir) = 0;
 	    foreach $amdir (&variable_value_as_list ('ACLOCAL_AMFLAGS', ''))
 	    {