Merge branch 'maint'

diff --cc ChangeLog
index 80a51b6,c26f1ab..35b88b8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,24 +1,31 @@@
+ 2011-01-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       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  <Ralf.Wildenhues@gmx.de>
+ 
+       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  <Ralf.Wildenhues@gmx.de>
+ 
+       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  <Ralf.Wildenhues@gmx.de>
 +
 +      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  <stefano.lattarini@gmail.com>
  
        tests: remove useless requirements from cond36.test

diff --cc m4/depend.m4
index 714bc9c,89d37b2..a5726c6
--- 1/m4/depend.m4
--- 2/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,

diff --cc tests/spy.test
Simple merge