Merge branch 'maint'

diff --cc ChangeLog
index 029fdcc,d82d363..96969a8
--- 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 f9a6821,a8ec749..a1c6f30
mode 100644,100755..100644
--- 1/automake.in
--- 2/automake.in
+++ b/automake.in

diff --cc tests/Makefile.am
index 2eaef32,bf07f2b..5b02a66
--- 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 8aa7886,d8bf050..fd573d5
--- 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 \