Merge branch 'maint' into yacc-work

* maint:
  maint-mode: fix botched configure messages
  fix: regenerate Makefiles
  info: allow user to inhibit creation/update of '${infodir}/dir'
  dejagnu: allow the package developer to extend site.exp
  * THANKS: Fix whitespace issue.
  deps: partially revert commit `v1.11-512-geeee551'
  dejagnu: ensure 'srcdir' is defined as a relative directory
  Fix testsuite failure of check12.test without DejaGNU.
  Extend and improve tests on DejaGnu support.

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index 12fd2ecabae706de3bc8b1ac89d479d282f672df,fe1dc9729091b467f237e82aa89dee5667144666..130d2447dbe43a34f163dd111ec562abf91e5b90
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -40,20 -40,14 +40,28 @@@ New in 1.11.0a
      user; still, the old Makefile.am files that used to define it should
      still continue to work as before.
  
+   - When using DejaGnu-based testsuites, the user can extend the `site.exp'
+     file generated by automake-provided rules by defining the special make
+     variable `$(EXTRA_DEJAGNU_SITE_CONFIG)'.
+ 
+   - The `install-info' rule can now be instructed not to create/update
+     the `${infodir}/dir' file, by exporting the new environment variable
+     `AM_UPDATE_INFO_DIR' to the value "no".
+ 
 +* Changes to Yacc support:
 +
 +  - C source and header files derived from non-distributed Yacc and/or
 +    Lex sources are now removed by a simple "make clean" (while they were
 +    previously removed only "make maintainer-clean").
 +
 +  - Slightly backward-incompatible change, relevant only for use of Yacc
 +    with C++: the extensions of the header files produced by the Yacc
 +    rules are now modelled after extension of the sources corresponding
 +    sources.  For example, yacc files named "foo.y++" and "bar.yy" will
 +    produce header files named respectively "foo.h++" and "bar.hh", where
 +    they would have previously produced header files named simply "foo.h"
 +    and "bar.h".  This change offers better compatibility with `bison -o'.
 +
  Bugs fixed in 1.11.0a:
  
  * Bugs introduced by 1.11:
@@@ -147,6 -132,9 +155,10 @@@
      processes, honour the configure-time definitions of AUTOCONF and
      AUTOM4TE.
  
+   - The `install-info' recipe does not try anymore to guess whether the
+     `install-info' program is from Debian or from GNU, and adaptively
+     change its behaviour; this has proven to be frail and easy to regress.
++
  \f
  New in 1.11:
  

diff --cc automake.in
Simple merge

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge