Merge branch 'maint'

diff --cc ChangeLog
index b231fe4,45fddf4..2356c38
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,27 -1,11 +1,35 @@@
  2010-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
+       Prefer AUTOMAKE_fails over `$AUTOMAKE | grep' in tests.
+       * tests/ldadd.test: Enable errexit.  Use AUTOMAKE_fails so
+       the verbose log contains all output.
+       * tests/mdate.test: Likewise.
+       Prompted by Stefano Lattarini's change to discover.test.
+ 
++2010-06-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
++
 +      More minor message fixes.
 +      * aclocal.in (scan_file): Fix recommended info command line.
 +      * automake.in (handle_lib_objects): No need to prepend function
 +      name to prog_error message.
 +      (handle_tags): Add missing word and missing space in error
 +      message.
 +      (handle_dist): Add missing closing single quote in message.
 +      Line-wrap one long message for readability.
 +
 +2010-06-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +          Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix distcheck failure with distributed generated parallel tests.
 +      * tests/Makefile.am ($(parallel_tests)): Cope with $(srcdir)
 +      being different from the value at developer `make dist' time.
 +      * tests/defs.in: Protect against mutiple inclusion, by using ...
 +      ($am_defs_included): ... this new variable.
 +      ($srcdir): Do not compute, but simply define to `@abs_srcdir@'
 +      as substituted by configure.
 +      Report, suggestions and first fix by Ralf Wildenhues, final
 +      patch by Stefano Lattarini.
 +
  2010-06-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Improve tests link*.test (enable `errexit' shell flag).