From: Ralf Wildenhues Date: Wed, 19 Jan 2011 18:49:12 +0000 (+0100) Subject: Merge branch 'maint' X-Git-Tag: ng-0.5a~246 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3474cdc9ff394c7b01db380c4ca2cd42620ff076;p=thirdparty%2Fautomake.git Merge branch 'maint' --- 3474cdc9ff394c7b01db380c4ca2cd42620ff076 diff --cc ChangeLog index 80a51b65e,c26f1ab8a..35b88b8d5 --- a/ChangeLog +++ b/ChangeLog @@@ -1,10 -1,24 +1,31 @@@ + 2011-01-19 Ralf Wildenhues + + Allow _AM_DEPENDENCIES to be used later in configure. + * m4/depend.m4 (_AM_DEPENDENCIES): Remove a previously existing + conftest.dir before recreating it. + Fixes bug#7864. + Report by Eric Blake, from report by Scott McCreary against M4. + + 2011-01-18 Ralf Wildenhues + + tests: avoid failure on w32 file systems. + * tests/parallel-tests-unreadable-log.test: SKIP if file cannot + be turned unreadable. + + 2011-01-17 Ralf Wildenhues + + tests: allow double-colon spy.test to work with HP-UX make. + * tests/spy.test: Fix comment typos. Ensure prerequisites we + do not want to depend on are strictly older than the target. + Also test with a target out of date wrt. more than one rule. + +2011-01-17 Ralf Wildenhues + + Avoid local $_ perl variable, for Perl before 5.9.1. + * lib/Automake/Options.pm (_process_option_list): Do not + lexically localize $_. Fixes bootstrap on AIX 5.1. + Bug introduced in commit `v1.11-622-gf90a06c'. + 2011-01-16 Stefano Lattarini tests: remove useless requirements from cond36.test diff --cc m4/depend.m4 index 714bc9c9b,89d37b26d..a5726c646 --- a/m4/depend.m4 +++ b/m4/depend.m4 @@@ -6,7 -6,7 +6,7 @@@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --# serial 12 ++# serial 13 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4,