* 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 7167c6fd8df9bbe8fccd433f5934c3c6f7d09f07..d75cca26d26b41b5967ce749fab2b73bfebf4631 100644 (file)
--- 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 2491141d990e09d7947baf98cedb53e551d94b7e..4dbb2fc61f6dc253060258a420bbea9295295eee 100755 (executable)
--- 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', ''))
            {