Merge branch 'maint' into yacc-work

* maint:
  test defs: new function 'fatal_', for hard errors
  maintcheck: fix some failures, extend some checks
  automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE
  build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too
  remake: behave better with non-GNU make in subdirectories
  tests/README: fix example about `make -e' usage

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index f8618680d421cc57954a2e50010131d1d5cdea80,b7f9b541c67d623c4b886baacd4a77c1529bff36..3f8a357f7a87f4a1e63d7660cb1d4fbff56ab77e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -76,14 -62,9 +76,19 @@@ Bugs fixed in 1.11.0a
    - Java sources specified with check_JAVA are not compiled anymore upon
      "make all", but only upon "make check".
  
 +  - Automake now detects the presence of the `-d' flag in the various
 +    `*YFLAGS' variables even when their definitions involve indirections
 +    through other variables, such as in:
 +      foo_opts = -d
 +      AM_YFLAGS = $(foo_opts)
 +
 +  - Automake now complains if a `*YFLAGS' variable has any conditional
 +    content, not only a conditional definition.
++
+   - Now aclocal and automake, when they've to spawn autoconf or autom4te
+     processes, honour the configure-time definitions of AUTOCONF and
+     AUTOM4TE.
++
  \f
  New in 1.11:
  

diff --cc automake.in
Simple merge

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc tests/defs.in
index 736c4277290ecb25f71c80768c5b058ee7653869,5849fbdbea0b3491359cc0b6d700ad193e376d3e..5cf3d9a42d793e2cb74dc300533d9c7cf1a33743
--- 1/tests/defs.in
--- 2/tests/defs.in
+++ b/tests/defs.in
@@@ -96,12 -96,12 +96,14 @@@ SHELL='@SHELL@
  export SHELL
  # User can override various tools used.
  test -z "$PERL" && PERL='@PERL@'
 +test -z "$YACC" && YACC='@YACC@'
 +test -z "$LEX" && LEX='@LEX@'
  test -z "$MAKE" && MAKE=make
  test -z "$AUTOCONF" && AUTOCONF="@am_AUTOCONF@"
+ test -z "$AUTOM4TE" && AUTOM4TE="@am_AUTOM4TE@"
+ test -z "$AUTORECONF" && AUTORECONF="@am_AUTORECONF@"
  test -z "$AUTOHEADER" && AUTOHEADER="@am_AUTOHEADER@"
- test -z "$AUTOUPDATE" && AUTOUPDATE=autoupdate
+ test -z "$AUTOUPDATE" && AUTOUPDATE="@am_AUTOUPDATE@"
  test -z "$MISSING" && MISSING=`pwd`/../lib/missing
  # Use -Werror because this also turns some Perl warnings into error.
  # (Tests for which this is inappropriate should use -Wno-error.)