From fded798b7dbca6ec151bf039d882bbd0ad008933 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Tue, 10 Oct 2000 01:03:42 +0000 Subject: [PATCH] * automake.in (handle_aclocal_m4): If ACLOCAL_M4_SOURCES is defined use it as the list of M4 files aclocal.m4 depends on. --- ChangeLog | 3 +++ automake.in | 10 +++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7167c6fd..d75cca26 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 * aclocal.in (add_file): Strip comments while scanning for diff --git a/automake.in b/automake.in index 2491141d..4dbb2fc6 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', '')) { -- 2.43.5