Merge branch 'maint' into branch-1.11

diff --cc ChangeLog
Simple merge

diff --cc NEWS
index 8a6ac29,6bd67f6..9864090
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -55,35 -56,9 +55,37 @@@ Bugs fixed in 1.11.1a
  
    - The parallel-tests driver now does not produce erroneous results
      with Tru64/OSF 5.1 sh upon unreadable log files any more.
+ 
+   - The makedepend depmode now works better with VPATH builds.
  \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