From ae5f42529172cdb1590ec9d8592d79e4e7fb852c Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Wed, 18 Oct 2000 03:26:55 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ automake.in | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d8254094..51122c0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2000-10-17 Pavel Roskin + + * 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 * aclocal.in (write_aclocal): Set up aclocal.m4 header with diff --git a/automake.in b/automake.in index f3c016f8..5d8d91a1 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') -- 2.43.5