Merge branch 'more-prefix-primary-diagnostic' into maint

diff --cc ChangeLog
index 77a7b6b4d76981e4b5338b81cf63f195089002fc,e54e01dad7941f4d46d912dc89d8d628cece60ca..bfe977163f6291c1362ccf73ef98efd9c451f0f1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,56 -1,14 +1,67 @@@
+ 2011-06-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: optimize tests on primary/prefix mismatch for speed
+       * tests/primary-prefix-invalid-couples.test: Partial rewrite, in
+       order to use just a single automake invocation rather than one
+       invocation for each invalid primary/prefix couple.  This improves
+       the test script execution time by an order of magnitude.
+       Since we are at it, throw in some other improvements to avoid
+       unrelated automake warnings and failures that could potentially
+       cause false positives w.r.t. the automake exit status.
+ 
 +2011-06-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      news: update w.r.t. introduction of AM_DISTCHECK_CONFIGURE_FLAGS
 +      * NEWS (Miscellaneous changes): Update.
 +
 +2011-06-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
 +      * Makefile.am (sc_tests_overriding_macros_on_cmdline): It's now
 +      acceptable that the test scripts override DISTCHECK_CONFIGURE_FLAGS
 +      on the make command line.  Update comments accordingly.  Since we
 +      are at it, make the relevant grepping rules slightly tighter.
 +
 +2011-06-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS
 +      * doc/automake.texi (Checking the Distribution): Suggest to use
 +      AM_DISTCHECK_CONFIGURE_FLAGS, not DISTCHECK_CONFIGURE_FLAGS, to
 +      define (in the top-level Makefile.am) extra flags to be passed
 +      to configure at "make distcheck" time; DISTCHECK_CONFIGURE_FLAGS
 +      should be reserved for the user.  Add proper `@vindex' directive.
 +      Document that AM_DISTCHECK_CONFIGURE_FLAGS is not honoured in a
 +      subpackage Makefile.am, but the flags in it are passed down to
 +      the configure script of the subpackage.
 +      * lib/am/distdir.am (distcheck): Also pass the flags in
 +      $(AM_DISTCHECK_CONFIGURE_FLAGS) to the configure invocation.
 +      Update comments.
 +      * tests/defs.in.test (AM_DISTCHECK_CONFIGURE_FLAGS,
 +      DISTCHECK_CONFIGURE_FLAGS): Unset in case they are exported in
 +      the environment, they might improperly influence our testsuite.
 +      * tests/distcheck-configure-flags.test: New test.
 +      * tests/distcheck-configure-flags-am.test: Likewise.
 +      * tests/distcheck-configure-flags-subpkg.test: Likewise.
 +      * distcheck-hook.test: Likewise.
 +      * distcheck-hook2.test: Likewise.
 +      * tests/Makefile.am (TESTS): Update.
 +      Closes automake bug#8784.
 +
 +2010-06-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      docs: better documentation for silent make rules
 +      * doc/automake.texi (Options): Detailed description of the
 +      automake option `silent-rules' moved from here ...
 +      (Silent Make): ... into this new chapter, expanded, improved,
 +      and subdivided into ...
 +      (Make verbosity, Tricks For Silencing Make,
 +      Automake silent-rules Option): ... these new sections.
 +      (@menu, @detailmenu): Update.
 +      * tests/silent-configsite.test: New test, checking that the
 +      user can control default mode of silent-rules from config.site,
 +      as is documented in the manual.
 +      * tests/Makefile.am (TESTS): Updated.
 +
  2011-06-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Warnings about primary/prefix mismatch fixed and extended.