* tests/java-extra.test: Use "required=javac" instead of an ad-hoc configure check. * tests/java-noinst.test: Likewise. --- ChangeLog | 7 +++++++ tests/java-extra.test | 3 +-- tests/java-noinst.test | 3 +-- 3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog index adabd27..520d728 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-04-23 Stefano Lattarini <[email protected]> + 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 <[email protected]> + java: allow both JAVA and nobase_JAVA in the same Makefile.am * automake.in (handle_java): Also strip `nobase_' from the given prefix, when needed. diff --git a/tests/java-extra.test b/tests/java-extra.test index 5309964..9837d75 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 6547770..58f96ae 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 -- 1.7.2.3
