[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-748-gc408bea

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=c408beafae2ab5909bfd8b04df1ca93aedc6b5e7

The branch, master has been updated
       via  c408beafae2ab5909bfd8b04df1ca93aedc6b5e7 (commit)
       via  df9b3bc2212dff5edea3dc60abe93ee61e5283f9 (commit)
      from  fbb398a168fc2387814c419fc44bd24114f10d7e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c408beafae2ab5909bfd8b04df1ca93aedc6b5e7
Merge: fbb398a df9b3bc
Author: Stefano Lattarini <address@hidden>
Date:   Sun Apr 10 15:37:23 2011 +0200

    Merge branch 'maint'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog  |   17 +++++++++++++++++
 tests/defs |    8 ++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45688e3..77de7f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2011-04-10  Stefano Lattarini  <address@hidden>
 
+       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  <address@hidden>
+
        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.
diff --git a/tests/defs b/tests/defs
index 77bb534..a36f718 100644
--- a/tests/defs
+++ b/tests/defs
@@ -287,8 +287,12 @@ do
       $CC -V -help || exit 77
       ;;
     javac)
-      echo "$me: running javac -version"
-      javac -version || exit 77
+      # The Java compiler from JDK 1.5 (and presumably earlier versions)
+      # cannot handle the `-version' option by itself: it bails out
+      # telling that source files are missing.  Adding also the `-help'
+      # option seems to solve the problem.
+      echo "$me: running javac -version -help"
+      javac -version -help || exit 77
       ;;
     makedepend)
       echo "$me: running makedepend -f-"


hooks/post-receive
-- 
GNU Automake