Merge branch 'master' into testsuite-work

* master:
  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
  tests: more checks on portable fd redirection in TESTS_ENVIRONMENT
  docs: AM_DISTCHECK_CONFIGURE_FLAGS is for corner cases

diff --cc ChangeLog
Simple merge

diff --cc THANKS
Simple merge

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

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/ansi.test
Simple merge

diff --cc tests/ansi10.test
Simple merge

diff --cc tests/ansi3.test
index 4aca8a250e53415bc3a77b5d3afb4d0b491077e6,23d8194b38f1360f6285316a08b56aa1c648ef5d..dccc7f80f36c95d74602114fe634421c9f3900a7
--- 1/tests/ansi3.test
--- 2/tests/ansi3.test
+++ b/tests/ansi3.test
@@@ -41,11 -42,17 +41,11 @@@ main (int argc, char *argv[]
  }
  END
  
 -# Ignore user CFLAGS.
 -CFLAGS=
 -export CFLAGS
 -
 -# We use gcc and not gcc -traditional as the latter fails on some
 -# Linux boxes (Red Hat 5.1 in particular).
  $ACLOCAL
- $AUTOCONF
- $AUTOMAKE -a 2>stderr || { cat stderr >&2; Exit 1; }
+ $AUTOCONF -Wno-obsolete
+ $AUTOMAKE -Wno-obsolete -a 2>stderr || { cat stderr >&2; Exit 1; }
  cat stderr >&2
  grep 'Makefile.am:1:.*ansi2knr\.c' stderr
 -CC='gcc' ./configure
 +./configure
  ANSI2KNR=./ansi2knr U=_ $MAKE -e
  ./hello

diff --cc tests/ansi3b.test
index 48ca7cbe731e033880f6fc2a9da03e15db39accb,5b8f4721b221deb05f112d96f3b4ff701bb98016..df9000ff81351007db4102634aac406d94d34c07
--- 1/tests/ansi3b.test
--- 2/tests/ansi3b.test
+++ b/tests/ansi3b.test
@@@ -43,11 -43,17 +43,11 @@@ main (int argc, char *argv[]
  }
  END
  
 -# Ignore user CFLAGS.
 -CFLAGS=
 -export CFLAGS
 -
 -# We use gcc and not gcc -traditional as the latter fails on some
 -# Linux boxes (Red Hat 5.1 in particular).
  $ACLOCAL
- $AUTOCONF
- $AUTOMAKE -a 2>stderr || { cat stderr >&2; Exit 1; }
+ $AUTOCONF -Wno-obsolete
+ $AUTOMAKE -Wno-obsolete -a 2>stderr || { cat stderr >&2; Exit 1; }
  cat stderr >&2
  grep 'configure.in:2:.*ansi2knr\.1' stderr
 -CC='gcc' ./configure
 +./configure
  ANSI2KNR=./ansi2knr U=_ $MAKE -e
  ./hello

diff --cc tests/ansi5.test
index 4490d8b5e9b7e56601b542edd04007744a464054,c9c0d234ab8513cf6f36f60d0a10088b38f6d34a..55c41f9179a1f01b0c3947eda76ff375340784ec
--- 1/tests/ansi5.test
--- 2/tests/ansi5.test
+++ b/tests/ansi5.test
@@@ -64,9 -64,12 +64,9 @@@ main (int argc, char *argv[]
  END
  
  $ACLOCAL
- $AUTOCONF
- $AUTOMAKE -a
+ $AUTOCONF -Wno-obsolete
+ $AUTOMAKE -Wno-obsolete -a
 -# Ignore user CFLAGS.
 -CFLAGS=
 -export CFLAGS
 -CC=gcc ./configure
 +./configure
  
  # This is ugly!  If we set U at make time then the "wrong" file gets
  # included.

diff --cc tests/ansi6.test
Simple merge

diff --cc tests/ansi7.test
Simple merge

diff --cc tests/ansi9.test
Simple merge