Merge branch 'maint'

* maint:
  maintcheck: fix some failures, extend some checks

diff --cc ChangeLog
Simple merge

diff --cc Makefile.am
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc tests/depcomp8a.test
Simple merge

diff --cc tests/depcomp8b.test
Simple merge