Merge branch 'maint' into yacc-work

* maint:
  tests: fix spurious failure on fast machines
  aclocal: better URL reference in error message
  coverage: distcheck-hook to catch missing/outdated *.m4 files
  aclocal: more granularity in acdir overriding
  * tests/amhello-binpkg.test: Add missing $EXEEXT usage.
  fix: list test 'vala-vpath.test' in XFAIL_TESTS
  tests: simplify wrapper for aclocal
  fix: minor typo in ChangeLog
  coverage: vala support failing for VPATH from-scratch builds
  docs: report few more automake parsing limitations

diff --cc ChangeLog
Simple merge

diff --cc NEWS
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
index 6b08c42eb66662b7059770abd4bd4d433432aad3,2227ee86ae6db2ae288f6e44ce565e64f9852cac..b59252abe809ab29daa6fab7160ce2efa0b12eed
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1156,33 -1150,16 +1164,34 @@@ yacc5.test 
  yacc7.test \
  yacc8.test \
  yaccdry.test \
 +yacc-auxdir.test \
 +yacc-bison-skeleton-cxx.test \
 +yacc-bison-skeleton.test \
 +yacc-line.test \
 +yacc-depend.test \
 +yacc-depend2.test \
 +yacc-deleted-headers.test \
 +yacc-dist-nobuild.test \
 +yacc-dist-nobuild-subdir.test \
 +yacc-nodist.test \
 +yacc-pr204.test \
  yaccpp.test \
  yaccvpath.test \
 -yacc-dist-nobuild-subdir.test \
 +yacc-d-vpath.test \
 +yacc-mix-c-cxx.test \
 +yacc-weirdnames.test \
  yflags.test \
  yflags2.test \
 +yflags-cmdline-override.test \
 +yflags-conditional.test \
 +yflags-d-false-positives.test \
 +yflags-force-override.test \
 +yflags-force-conditional.test \
 +yflags-var-expand.test \
  $(parallel_tests)
  
- EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
+ EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS) \
+       distcheck-hook-m4.am
  
  # Each test case depends on defs, aclocal, and automake.
  check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)

diff --cc tests/defs.in
Simple merge