Merge branch 'maint' into parallel-tests-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
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge