* automake.in (handle_aclocal_m4): exclude aclocal.m4 and

acinclude.m4 from the dependencies of aclocal.m4 to avoid
circular and duplicated dependencies. Strip "./" from the
dependencies.

diff --git a/ChangeLog b/ChangeLog
index d8254094802a5b0f0a1840a3f59851d631f0a98e..51122c0f4f24441df81e0b5bda45f1a6f9d5775e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-17  Pavel Roskin  <proski@gnu.org>
+
+       * automake.in (handle_aclocal_m4): exclude aclocal.m4 and
+       acinclude.m4 from the dependencies of aclocal.m4 to avoid
+       circular and duplicated dependencies. Strip "./" from the
+       dependencies.
+
 2000-10-17  Lars J. Aas  <larsa@sim.no>
 
        * aclocal.in (write_aclocal): Set up aclocal.m4 header with

diff --git a/automake.in b/automake.in
index f3c016f82a08c6da1448718c30bc23d82f1cb032..5d8d91a1f98b70eab0a59cb23f2d8733e0ec1d97 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3189,7 +3189,13 @@ sub handle_aclocal_m4
                    $examine_next = 0;
                    if ($amdir !~ /^\// && -d $amdir)
                    {
-                       push (@ac_deps, &my_glob ($amdir . '/*.m4'));
+                       foreach $ac_dep (&my_glob ($amdir . '/*.m4'))
+                       {
+                           $ac_dep =~ s/^\.\/*//;
+                           push (@ac_deps, $ac_dep)
+                               unless $ac_dep eq "aclocal.m4"
+                                   || $ac_dep eq "acinclude.m4";
+                       }
                    }
                }
                elsif ($amdir eq '-I')