From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 23 Apr 2011 12:14:20 +0000 (+0200)
Subject: java tests: require java compiler more properly
X-Git-Tag: ng-0.5a~123^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b53cb6bfab7d903e5bf72bf2f0697be335707a8;p=thirdparty%2Fautomake.git

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 adabd2760..520d7281e 100644
--- 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 530996402..9837d7548 100755
--- 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 65477708f..58f96ae60 100755
--- 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