Merge branch 'maint' into branch-1.11

* maint:
  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 6254fc0,fe1dc97..2bcf0b5
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -40,11 -40,17 +40,19 @@@ New in 1.11.1a
      user; still, the old Makefile.am files that used to define it should
      still continue to work as before.
  
 -Bugs fixed in 1.11.0a:
+   - 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".
+ 
 +Bugs fixed in 1.11.1a:
  
 -* Bugs introduced by 1.11:
 +* Bugs introduced by 1.11.1:
 +
 +* Long standing bugs:
  
    - The `parallel-tests' test driver works around a GNU make 3.80 bug with
      trailing white space in the test list (`TESTS = foo $(EMPTY)'), and
@@@ -131,35 -131,11 +139,39 @@@
    - Now aclocal and automake, when they've to spawn autoconf or autom4te
      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
 +Bugs fixed in 1.11.1:
 +
 +  - Lots of minor bugfixes.
 +
 +* Bugs introduced by 1.11:
 +
 +  - The `parallel-tests' test driver works around a GNU make 3.80 bug with
 +    trailing white space in the test list (`TESTS = foo $(EMPTY)').
 +
 +* Long standing bugs:
 +
 +  - On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'
 +    even if the `--prefix' argument pointed outside of a system directory.
 +    AM_PATH_PYTHON has been fixed to ignore the value returned from python's
 +    `get_python_lib' function if it points outside the configured prefix,
 +    unless the `--prefix' argument was either `/usr' or below `/System'.
 +
 +  - The testsuite does not try to change the mode of `ltmain.sh' files from
 +    a Libtool installation (symlinked to test directories) any more.
 +
 +  - AM_PROG_GCJ uses AC_CHECK_TOOLS to look for `gcj' now, so that prefixed
 +    tools are preferred in a cross-compile setup.
 +
 +  - The distribution is tarred up with mode 755 now by the `dist*' targets.
 +    This fixes a race condition where untrusted users could modify files
 +    in the $(PACKAGE)-$(VERSION) distdir before packing if the toplevel
 +    build directory was world-searchable.  This is CVE-2009-4029.
 +\f
  New in 1.11:
  
  * Version requirements:

diff --cc doc/automake.texi
Simple merge

diff --cc tests/Makefile.in
Simple merge