Merge branch 'maint' into java-work

[platform/upstream/automake.git] / tests / defs.in

diff --git a/tests/defs.in b/tests/defs.in
index 7759455..b162a18 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -273,7 +273,12 @@ do
       # 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
+      javac -version -help || skip_ "java compiler not found"
+      ;;
+    java)
+      # See the comments above about `javac' for why we use also `-help'.
+      echo "$me: running java -version -help"
+      java -version -help || skip_ "java interpreter not found"
       ;;
     makedepend)
       echo "$me: running makedepend -f-"