Merge branch 'maint'

diff --cc ChangeLog
index f1e3958,6423875..19b7772
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,42 +1,60 @@@
+ 2010-04-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Fix per-Makefile.am setting of -Werror.
+       Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one
+       Makefile.am would carry over to other Makefile.am files
+       treated afterwards by the same thread, causing inconsistent
+       and unstable exit status values.
+       * lib/Automake/Channels.pm (dup_channel_setup)
+       (drop_channel_setup): Save and restore the setting of
+       $warnings_are_errors.
+       * tests/werror3.test: New test.
+       * tests/Makefile.am: Adjust.
+       * NEWS: Update.
+ 
+ 2010-04-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       Avoid possible false negatives in cond46.test.
+       * tests/cond46.test: Enable shell `errexit' flag (and bumped
+       copyright years).  Due to this change, the testcase should now
+       fail on unexpected failures in calls to $ACLOCAL/$AUTOMAKE (whose
+       outcomes were previously unchecked), and on failures in grepping
+       the expected diagnostic in Automake stderr.
+ 
+       Make test `aclocal3.test' stricter.
+       * tests/aclocal3.test: Add call to `set -e'.  Fail if $ACLOCAL
+       succeds unexpectedly.
+ 
+       Add tests checking that symlinks are resolved by `make dist'.
+       * tests/distlinks.test: New test.
+       * tests/Makefile.am (TESTS): Updated accordingly.
+       Suggested by observations from Ralf Wildenhues.
+ 
+ 2010-04-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+       Use -9 for maximum xz compression with dist-xz.
+       * lib/am/distdir.am (dist-xz, dist, dist-all): Pass -9 to xz.
+       * NEWS, THANKS: Update.
+       Report by Pavel Sanda.
+ 
 +2010-04-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Avoid possible false negatives in cond46.test.
 +      * tests/cond46.test: Enable shell `errexit' flag (and bumped
 +      copyright years).  Due to this change, the testcase should now
 +      fail on unexpected failures in calls to $ACLOCAL/$AUTOMAKE (whose
 +      outcomes were previously unchecked), and on failures in grepping
 +      the expected diagnostic in Automake stderr.
 +
 +2010-04-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Generated tests are now just a thin layer around other tests.
 +      * tests/Makefile.am: Rewrite the rule to generate the `*-p.test'
 +      test scripts so that any of them simply includes the corresponding
 +      `*.test' script (after setting `$parallel_tests' to `yes').
 +      * tests/.gitignore: Add wildcard for temporary files used in the
 +      generation of `*-p.test' tests.
 +
  2010-03-30  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Avoid an unportable use of `$status' shell variable.

diff --cc Makefile.in
index d4aa111,33d85f3..d8e60c0
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -655,11 -607,11 +655,11 @@@ dist-lzip: distdi
  
  dist-lzma: distdir
        tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 -      $(am__remove_distdir)
 +      $(am__post_remove_distdir)
  
  dist-xz: distdir
-       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+       tardir=$(distdir) && $(am__tar) | xz -9 -c >$(distdir).tar.xz
 -      $(am__remove_distdir)
 +      $(am__post_remove_distdir)
  
  dist-tarZ: distdir
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z

diff --cc NEWS
index 4f8f8bb,fee7f83..74887fb
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -26,11 -12,8 +26,13 @@@ Bugs fixed in 1.11a
    - The `parallel-tests' test driver works around a GNU make 3.80 bug with
      trailing white space in the test list (`TESTS = foo $(EMPTY)').
  
 +  - The `silent-rules' option now also silences all compile rules if dependency
 +    tracking is disabled.  Also, when `silent-rules' is not used, the output from
 +    `make' does not contain spurious extra lines with only a backslash in them
 +    any more; it now again matches that from pre-1.11 Automake.
 +
+   - The `dist-xz' option now uses `xz -9' for maximum compression.
+ 
  * Long standing bugs:
  
    - On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'

diff --cc THANKS
Simple merge

diff --cc lib/am/distdir.am
index 9459e75,d88656c..fd82838
--- 1/lib/am/distdir.am
--- 2/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@@ -363,8 -353,8 +363,8 @@@ dist-lzma: distdi
  ?XZ?DIST_ARCHIVES += $(distdir).tar.xz
  .PHONY: dist-xz
  dist-xz: distdir
-       tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+       tardir=$(distdir) && $(am__tar) | xz -9 -c >$(distdir).tar.xz
 -      $(am__remove_distdir)
 +      $(am__post_remove_distdir)
  
  ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z
  .PHONY: dist-tarZ

diff --cc tests/Makefile.am
Simple merge

diff --cc tests/Makefile.in
Simple merge