java tests: require java compiler more properly

* tests/java-extra.test: Use "required=javac" instead of an
ad-hoc configure check.
* tests/java-noinst.test: Likewise.

diff --git a/ChangeLog b/ChangeLog
index adabd2760d49c58a960087c46057d3232d49fb92..520d7281e320235b0ccdb05d72c548812e0e448a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       java tests: require java compiler more properly
+       * tests/java-extra.test: Use "required=javac" instead of ad-hoc
+       configure check.
+       * tests/java-noinst.test: Likewise.
+
 2011-04-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        java: allow both JAVA and nobase_JAVA in the same Makefile.am

diff --git a/tests/java-extra.test b/tests/java-extra.test
index 530996402a8329eaf14bc5467251665b9cbcfbb7..9837d7548a1f8b2e93afc089b0ce264cba532ac5 100755 (executable)
--- a/tests/java-extra.test
+++ b/tests/java-extra.test
@@ -19,13 +19,12 @@
 # EXTRA_JAVA exists mostly for ensuring interoperation with Automake
 # conditionals).
 
+required=javac
 . ./defs || Exit 1
 
 set -e
 
 cat >> configure.in << 'END'
-AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
-($HAS_JAVAC 77); $HAS_JAVAC 77
 AM_CONDITIONAL([COND], [test x"$cond" = x"yes"])
 AC_OUTPUT
 END

diff --git a/tests/java-noinst.test b/tests/java-noinst.test
index 65477708fe1174ee68e9e55d6013c9b9135abbea..58f96ae602d4c1ef422408ac480fbae9c7238c6b 100755 (executable)
--- a/tests/java-noinst.test
+++ b/tests/java-noinst.test
@@ -17,13 +17,12 @@
 # Make sure that noinst_JAVA causes generated *.class files not to
 # be installed.
 
+required=javac
 . ./defs || Exit 1
 
 set -e
 
 cat >> configure.in << 'END'
-AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
-($HAS_JAVAC 77); $HAS_JAVAC 77
 AC_OUTPUT
 END