From: Pavel Roskin <proski@gnu.org>
Date: Wed, 18 Oct 2000 03:26:55 +0000 (+0000)
Subject: * automake.in (handle_aclocal_m4): exclude aclocal.m4 and
X-Git-Tag: Release-1-4b~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d10b9069fb87680b48d746e5e1744d70746e81da;p=thirdparty%2Fautomake.git

* 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 d82540948..51122c0f4 100644
--- 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 f3c016f82..5d8d91a1f 100755
--- 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')