Merge branch 'am-distcheck-configure-flags' into maint

* am-distcheck-configure-flags:
  maintcheck: DISTCHECK_CONFIGURE_FLAGS can be defined on make cmdline
  distcheck: add support for AM_DISTCHECK_CONFIGURE_FLAGS

diff --cc ChangeLog
index c3f6de0,6d8233e..39e4c8a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,56 -1,36 +1,89 @@@
+ 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.
 +      * automake.in (%standard_prefix): Add `doc' and `locale'.
 +      Rename `pkgdatadir' to `pkgdata'.  Similarly for`pkglibdir',
 +      `pkgincludedir' and `pkglibexecdir'.
 +      (handle_programs): List `pkglibexec', not `pkglib', among the
 +      prefixes valid for the `PROGRAMS' primary.
 +      (handle_data): List also `doc' among the prefixes valid for
 +      the `DATA' primary.  This is required by automake's own build
 +      system.
 +      * tests/dirforbid.test: Test removed, superseded by ...
 +      * tests/primary-prefix-invalid-couples.test: ... this new test.
 +      * tests/primary-prefix-valid-couples.test: New test.
 +      * tests/primary-prefix-couples-documented-valid.test: Likewise.
 +      * tests/primary-prefix-couples-force-valid.test: Likewise.
 +      * tests/java3.test: Adjusted, and extended a bit.
 +      * tests/Makefile.am (TESTS): Updated.
 +      * NEWS: Updated.
 +      From a report by Eric Blake.
 +
 +2011-06-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      test defs: new function 'fatal_', for hard errors
 +      Before this patch, the only way offered by tests/defs to
 +      properly signal a hard error was the `framework_failure_'
 +      function.  But the error message issued by that function,
 +      as its name would suggest, refers to a set-up failure in the
 +      testsuite, while hard errors can obviously also be due to
 +      other reasons.  The best way to fix this inconsistency is to
 +      introduce a new function with a more general error message.
 +      Inspired by a recent similar change to Gnulib's tests/init.sh.
 +      * tests/defs.in (fatal_): New function.
 +      * tests/README (Section "Writing test cases" subsection "Do"):
 +      Suggest the use of `fatal_', not of `framework_failure_', for
 +      generic hard errors.  The latter should be reserved for "real"
 +      set-up failures.
 +
  2011-06-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        maintcheck: fix some failures, extend some checks

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/defs.in
Simple merge