Merge branch 'maint'

diff --cc ChangeLog
Simple merge

diff --cc tests/README
Simple merge

diff --cc tests/acloca18.test
index 6f2de7e,c38fac4..dbd0bfb
--- 1/tests/acloca18.test
--- 2/tests/acloca18.test
+++ b/tests/acloca18.test
@@@ -117,15 -106,13 +117,19 @@@ AC_DEFUN([AM_MACRO1], [echo macro1d >> 
  AC_DEFUN([AM_MACRO2], [echo macro2d >> foo])
  EOF
  rm -f foo
- $ACLOCAL --diff=diff >output 2>stderr
- cat stderr
- cat output
- grep '#serial 456' output
+ $ACLOCAL --diff=diff >stdout 2>stderr || {
+   cat stderr >&2
+   cat stdout
+   Exit 1
+ }
+ cat stderr >&2
+ cat stdout
+ grep '#serial 456' stdout
  test ! -f 4/m1.m4
  grep 'installing.*4/m1.m4' stderr
 +
 +$ACLOCAL -I 5 2>stderr && { cat stderr >&2; Exit 1; }
 +test `grep -c 'ill-formed serial' stderr` -eq 3
 +
 +$ACLOCAL -I 6 2>stderr && { cat stderr >&2; Exit 1; }
 +grep 'serial.*before any macro definition' stderr

diff --cc tests/vars3.test
Simple merge