Merge branch 'maint'

diff --cc ChangeLog
index 029fdccad211c01d106d31bfc0d74023a0edfe2e,d82d36388305023beb8d4e0163e07ff22b79bf85..96969a84461301c7be8626abbb8783f76320d53b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,34 -1,16 +1,47 @@@
+ 2011-04-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       java: check_JAVA does not cause compilation by "make all" anymore
+       Fixes automake bug#8234.
+       * automake.in (handle_java): Make stamp of class files built from
+       java sources in $(check_JAVA) a dependency of `check' target, not
+       `all' target.
+       * tests/java-check.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * NEWS: Update.
+       * THANKS: Update.
+       Report from Petteri Räty.
+ 
 +2011-04-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +          Bruno Haible  <bruno@clisp.org>
 +
 +      coverage: add tests on remake rules in more complex situations
 +      * tests/defs (using_gmake): New function.
 +      (for tool in $required): Use it when $tool is 'GNUmake'.
 +      * tests/remake-moved-m4-file.test: New test.
 +      * tests/remake-deleted-m4-file.test: Likewise.
 +      * tests/remake-renamed-m4-file.test: Likewise.
 +      * tests/remake-renamed-m4-macro-and-file.test: Likewise.
 +      * tests/remake-renamed-m4-macro.test: Likewise.
 +      * tests/remake-add-acsubst-gnulib.test: Likewise.
 +      * tests/remake-add-header-gnulib.test: Likewise.
 +      * tests/remake-remove-header-gnulib.test: Likewise.
 +      * tests/Makefile.am (TESTS): Update.
 +
 +2011-04-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      typofix in 'tests/defs'
 +      * tests/defs: Fix typo (`itslef' instead of `itself') in
 +      comments.
 +
 +2011-04-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      coverage: more on java support EXTRA_ and noinst_ prefixes
 +      * tests/java-extra.test: New test, checking support for the
 +      prefix `EXTRA_' with the JAVA primary.
 +      * tests/java-noinst.test: New test, checking support for the
 +      prefix `noinst_' with the JAVA primary.
 +      * tests/Makefile.am (TESTS): Update.
 +
  2011-04-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
        Clarify regex code in depcomp.

diff --cc NEWS
Simple merge

diff --cc THANKS
Simple merge

diff --cc automake.in
index f9a682141ec8d3dce731a2448980c635f116a2e3,a8ec749e115a687f23c9d14d9e8bef50c96ba9da..a1c6f30468e26329e1c2c1ea7e729916b6407b88
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc tests/Makefile.am
index 2eaef327e073f5a90bfaef8fda9b5f7204df3fa4,bf07f2b0ec6fc3c6e69b9b8c1a19183f29de8a9a..5b02a66f098265d2776179a9a0e69aafadd2840e
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -521,10 -421,9 +521,11 @@@ interp2.test 
  java.test \
  java2.test \
  java3.test \
+ java-check.test \
  javaprim.test \
  javasubst.test \
 +java-extra.test \
 +java-noinst.test \
  ldadd.test \
  ldflags.test \
  lex.test \

diff --cc tests/Makefile.in
index 8aa78863448982771526d79608479d98f2466e96,d8bf050e7773b8913f0975c107fc798f4e6aa364..fd573d571e3555346c6c471b0dd605834fd6fcb2
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -782,10 -691,9 +782,11 @@@ interp2.test 
  java.test \
  java2.test \
  java3.test \
+ java-check.test \
  javaprim.test \
  javasubst.test \
 +java-extra.test \
 +java-noinst.test \
  ldadd.test \
  ldflags.test \
  lex.test \