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

diff --cc ChangeLog
index fb96549,9fabd7d..c5652da
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,56 -1,13 +1,66 @@@
+ 2011-06-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases
+       * doc/automake.texi (Checking the Distribution): Explain that the
+       developers should take care of making their code buildable without
+       requiring any special configure options, so that in general
+       AM_DISTCHECK_CONFIGURE_FLAGS shouldn't be used.  Give an example
+       of where its use is legitimate.
+       Suggestions from Ralf Wildenhues and Eric Blake.
+ 
 +2011-06-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      ansi2knr: deprecate, it will go away in the next major release
 +      * doc/automake.texi: Loudly and repeatedly state that the old
 +      de-ANSI-fication features are now deprecated and will be removed
 +      in the next major Automake release.  Other related adjustments.
 +      * lib/Automake/Options.pm (_process_option_list ): Give a warning
 +      in the `obsolete' category when the `ansi2knr' option is used.
 +      * m4/protos.m4 (AM_C_PROTOTYPES): Deprecate this macro: a warning
 +      in the `obsolete' category will be emitted it if is used.
 +      * tests/ansi2knr-deprecation.test: New test.
 +      * tests/Makefile.am (TESTS): Update.
 +      * tests/ansi.test: Adjust, by calling autoconf and/or automake
 +      with the `-Wno-obsolete' flag.
 +      * tests/ansi10.test: Likewise.
 +      * tests/ansi2.test: Likewise.
 +      * tests/ansi3.test: Likewise.
 +      * tests/ansi3b.test: Likewise.
 +      * tests/ansi4.test: Likewise.
 +      * tests/ansi5.test: Likewise.
 +      * tests/ansi6.test: Likewise.
 +      * tests/ansi7.test: Likewise.
 +      * tests/ansi8.test: Likewise.
 +      * tests/ansi9.test: Likewise.
 +      * tests/cxxansi.test: Likewise.
 +      * tests/libobj8.test: Likewise.
 +      * NEWS: Update about the future planned backward-incompatibility
 +      due to the removal of de-ANSI-fication feature.
 +
 +2011-06-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      docs: primary/prefix combination "pkglib_PROGRAMS" is now invalid
 +      * doc/automake.texi (Program Sources): pkglib_PROGRAMS is not a
 +      valid combination anymore, so don't document it.  Inconsistency
 +      introduced in commit `v1.11-373-g9ca6326'.
 +
 +2011-06-19  Jim Meyering  <meyering@redhat.com>
 +
 +      docs: replace obsolete @vindex entry with a useful one
 +      * doc/automake.texi (Program Sources): Do not index obsolete
 +      pkglib_PROGRAMS here.  Do index pkglibexec_PROGRAMS.
 +
 +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

diff --cc doc/automake.texi
Simple merge