Merge branch 'maint'

* maint:
  check: don't use multi-line coloring for the report
  ansi2knr: deprecate, it will go away in the next major release
  docs: primary/prefix combination "pkglib_PROGRAMS" is now invalid
  docs: replace obsolete @vindex entry with a useful one
  docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases

diff --cc ChangeLog
index e09b24a,d79a848..8f03747
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,70 +1,80 @@@
+ 2011-06-20  Bert Wesarg <bert.wesarg@googlemail.com>  (tiny change)
+ 
+       check: don't use multi-line coloring for the report
+       "less -R" can't handle multi-line coloring as it is done for the
+       check reports of the serial and parallel testsuite, because of
+       performance reasons.  Thus, color each line of the check report
+       by its own.
+       * lib/am/check.am (am__text_box): Accept colors for lines, and
+       color each line by its own.
+       [%?PARALLEL_TESTS%] $(TEST_SUITE_LOG): Let am__text_box handle
+       the line coloring.
+       [!%?PARALLEL_TESTS%] $(check-TESTS): Color each report line by
+       its own.
+       * THANKS: Update.
+ 
+ 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-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: more checks on portable fd redirection in TESTS_ENVIRONMENT
 +      * tests/tests-environment-fd-redirect.test: Extend by also using
 +      a perl script among the tests.  Run the test shell script with
 +      the `errexit' flag active.  Export `VERBOSE' to yes when running
 +      "make check", to give more debugging information in case of
 +      failures.  Look for a Korn Shell also in `/usr/bin', not on only
 +      in `/bin'.
 +
  2011-06-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: optimize tests on primary/prefix mismatch for speed

diff --cc NEWS
index bdf3556,29c552b..35b223a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,20 -1,12 +1,25 @@@
 -New in 1.11.0a:
 +New in 1.11a:
 +
 +* Changes to automake:
 +
 +  - automake now generates silenced rules for texinfo outputs.
 +
 +  - The deprecated options `--output-dir', `--Werror' and `--Wno-error'
 +    have been removed.
 +
 +* New targets:
 +
 +  - New `cscope' target to build a cscope database for the source tree.
  
+ * WARNING: Future backward-incompatibilities!
+ 
+   - The Automake support for automatic de-ANSI-fication will be removed in
+     the next major Automake release (1.12).
+ 
  * Miscellaneous changes:
  
 +  - The `dist' and `dist-all' targets now can run compressors in parallel.
 +
    - The `lzma' compression scheme and associated automake option `dist-lzma'
      is obsoleted by `xz' and `dist-xz' due to upstream changes.
  

diff --cc THANKS
Simple merge

diff --cc doc/automake.texi
index 7e84fdd,18f65d3..59ddcfd
--- 1/doc/automake.texi
--- 2/doc/automake.texi
+++ b/doc/automake.texi
@@@ -2231,14 -2224,11 +2231,15 @@@ copies are updated before each release
  source in case you need more recent versions.
  
  @table @code
 +@item ar-lib
 +This is a wrapper primarily for the Microsoft lib archiver, to make
 +it more POSIX-like.
 +
  @item ansi2knr.c
  @itemx ansi2knr.1
- These two files are used for de-ANSI-fication support (obsolete
- @pxref{ANSI}).
+ These two files are used for de-ANSI-fication support (they are
+ deprecated now, and @emph{will be removed} in the next major Automake
+ release; @pxref{ANSI}).
  
  @item compile
  This is a wrapper for compilers that do not accept options @option{-c}

diff --cc lib/Automake/Options.pm
Simple merge

diff --cc lib/Automake/tests/Makefile.in
Simple merge

diff --cc lib/am/check.am
Simple merge

diff --cc tests/Makefile.am
index 9e93fab,28196f8..0ac3123
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -148,9 -88,8 +148,10 @@@ alpha2.test 
  amassign.test \
  ammissing.test \
  amopt.test \
 +amopts-location.test \
 +amopts-variable-expansion.test \
  amsubst.test \
+ ansi2knr-deprecation.test \
  ansi.test \
  ansi2.test \
  ansi3.test \

diff --cc tests/Makefile.in
index e97fa38,ba57aa2..46138b5
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -415,9 -365,8 +421,10 @@@ alpha2.test 
  amassign.test \
  ammissing.test \
  amopt.test \
 +amopts-location.test \
 +amopts-variable-expansion.test \
  amsubst.test \
+ ansi2knr-deprecation.test \
  ansi.test \
  ansi2.test \
  ansi3.test \

diff --cc tests/ansi.test
Simple merge

diff --cc tests/ansi10.test
Simple merge

diff --cc tests/ansi2.test
Simple merge

diff --cc tests/ansi3.test
Simple merge

diff --cc tests/ansi3b.test
Simple merge

diff --cc tests/ansi4.test
Simple merge

diff --cc tests/ansi5.test
index 09ffc50,d152be0..c9c0d23
--- 1/tests/ansi5.test
--- 2/tests/ansi5.test
+++ b/tests/ansi5.test
@@@ -63,9 -63,11 +63,9 @@@ main (int argc, char *argv[]
  }
  END
  
 -set -e
 -
  $ACLOCAL
- $AUTOCONF
- $AUTOMAKE -a
+ $AUTOCONF -Wno-obsolete
+ $AUTOMAKE -Wno-obsolete -a
  # Ignore user CFLAGS.
  CFLAGS=
  export CFLAGS

diff --cc tests/ansi6.test
index d6f637b,691614d..5b1eb0a
--- 1/tests/ansi6.test
--- 2/tests/ansi6.test
+++ b/tests/ansi6.test
@@@ -58,9 -58,11 +58,9 @@@ foo (
  }
  END
  
 -set -e
 -
  $ACLOCAL
- $AUTOCONF
- $AUTOMAKE -a
+ $AUTOCONF -Wno-obsolete
+ $AUTOMAKE -Wno-obsolete -a
  
  # Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do.
  test `grep -c ac_cv_prog_cc_stdc configure` -gt 1

diff --cc tests/ansi7.test
index 02a768b,9eae26b..966a860
--- 1/tests/ansi7.test
--- 2/tests/ansi7.test
+++ b/tests/ansi7.test
@@@ -60,9 -60,11 +60,9 @@@ foo (
  }
  END
  
 -set -e
 -
  $ACLOCAL
- $AUTOCONF
- $AUTOMAKE -a
+ $AUTOCONF -Wno-obsolete
+ $AUTOMAKE -Wno-obsolete -a
  
  # Sanity check: make sure it's ok to set ac_cv_prog_cc_stdc as we do.
  test `grep -c ac_cv_prog_cc_stdc configure` -gt 1

diff --cc tests/ansi8.test
Simple merge

diff --cc tests/ansi9.test
Simple merge

diff --cc tests/cxxansi.test
Simple merge

diff --cc tests/libobj8.test
index 97c8403,206bca6..0745f61
--- 1/tests/libobj8.test
--- 2/tests/libobj8.test
+++ b/tests/libobj8.test
@@@ -43,9 -44,7 +43,9 @@@ EN
  : > ansi2knr.1
  : > ansi2knr.c
  
 -$ACLOCAL || Exit 1
 -$AUTOMAKE  -Wno-obsolete || Exit 1
 +$ACLOCAL
- $AUTOMAKE
++$AUTOMAKE -Wno-obsolete
  
 -grep 'strsignal_.c:' Makefile.in
 +$FGREP 'strsignal_.c:' Makefile.in
 +
 +: