Merge branch 'java-coverage' into java-work

diff --cc ChangeLog
index ea292223a2bb0babb96795ae824a161ad83b04a9,9640a53885f996db00645f478eef206409053060..3ece73c4a6dfa576e7712f471a616c7c133928a4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,58 -1,12 +1,67 @@@
+ 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-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      test defs: fix 'javac' requirement for older JDK versions
 +      The Java compiler from JDK 1.5 (and presumably earlier versions)
 +      cannot handle the `-version' option by itself; and while it does
 +      print the version number, it then errors out with an usage error:
 +        $ javac -version
 +        javac 1.5.0_22
 +        javac: no source files
 +        Usage: javac <options> <source files>
 +        ...
 +      Luckily, adding the `-help' option to the `javac' invocation
 +      seems to fix this problem.
 +      * tests/defs.in (javac): Pass also the `-help' option to the
 +      `javac' program.  Add a comment explaining why it is needed.
 +      Report from Ralf Wildenhues.
 +
 +2011-04-10  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      test defs: new requirement for the default java compiler
 +      * tests/defs.in (for tool in $required): New requirement 'javac'.
 +      * tests/java.test: Use it instead of ad-hoc configure check.
 +      * tests/java-check.test: Likewise.
 +      * tests/instfail-java.test: Likewise.
 +      * tests/instdir-java.test: Likewise.
 +
 +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  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Clarify regex code in depcomp.
 +      * lib/depcomp: Add comment why we don't need regex-escaping here.
 +      Suggested by Stefano Lattarini.
 +
 +2011-04-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix makedepend depmode for VPATH builds.
 +      * lib/depcomp [makedepend]: Remove any VPATH prefix from the
 +      object file name, so a rebuild doesn't attempt to update the
 +      .Po files in the source tree.
 +      * tests/depcomp9.test: New test.
 +      * tests/Makefile.am (TESTS): Update.
 +      * NEWS: Update.
 +
  2011-04-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: fix timestamp-related failures

diff --cc tests/Makefile.am
index bf07f2b0ec6fc3c6e69b9b8c1a19183f29de8a9a,718ca2bce791403d3640df8ba5c322515020a9a6..96b7e892effb72bf1b55a02e9f87057a9201301c
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -421,9 -420,10 +421,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 d8bf050e7773b8913f0975c107fc798f4e6aa364,725ae4db78b1217643b55296af9c0d632d839c19..dce3a0004d8ddf62784ef41f05141f6311e89a18
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -691,9 -690,10 +691,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 \