On Sunday 09 October 2011, Stefano Lattarini wrote: > This patch series is meant to fix Automake bugs 9546 and 9651. > > Stefano Lattarini (8): > dist: auxiliary files can be distributed from subdir Makefiles > dist: simplify automake code accordingly to the previous changes > dist: truly always distribute files in AC_REQUIRE_AUX_FILE > refactor: rename a subroutine to a more proper name > dist: separate auxiliary file instantiation from DIST_COMMON update > automake: refactor, break up 'require_file_internal' > threaded-am: better serialization for required config files > tests: fix spurious failure with Solaris /bin/sh > I've also pushed the attached fix-up patch to the `dist-refactor' branch. I will give another couple of days for objections and reviews before merging into the `test-protocols' branch.
Regards, Stefano
From b99f7a6a3a364c9db282468ee10baeb072ff1579 Mon Sep 17 00:00:00 2001 Message-Id: <b99f7a6a3a364c9db282468ee10baeb072ff1579.1318843056.git.stefano.lattar...@gmail.com> From: Stefano Lattarini <[email protected]> Date: Mon, 17 Oct 2011 11:17:23 +0200 Subject: [PATCH] cosmetics: remove obsolete comment * automake.in (push_required_file): Remove "FIXME" comment stating that the special handling of `$config_aux_dir' breaks threaded automake: this is not true anymore after the recent commits (see in particular commit `v1.11-1225-gf672944'). --- ChangeLog | 8 ++++++++ automake.in | 1 - 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f294dad..d88b142 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-10-17 Stefano Lattarini <[email protected]> + + cosmetics: remove obsolete comment + * automake.in (push_required_file): Remove "FIXME" comment stating + that the special handling of `$config_aux_dir' breaks threaded + automake: this is not true anymore after the recent commits (see + in particular commit `v1.11-1225-gf672944'). + 2011-10-08 Stefano Lattarini <[email protected]> tests: fix spurious failure with Solaris /bin/sh diff --git a/automake.in b/automake.in index 68a16da..b3a454f 100644 --- a/automake.in +++ b/automake.in @@ -7602,7 +7602,6 @@ sub push_required_file # of $am_config_aux_dir here is deliberate and necessary. elsif ($dir eq $config_aux_dir) { - # FIXME: this breaks serialization of threaded automake :-( push_dist_common ("$am_config_aux_dir/$file"); } # FIXME: another spacial case, for AC_LIBOBJ/AC_LIBSOURCE support. -- 1.7.2.3
