From 249d7cb199b5c08e7a7a51189a733cc8fef12cf9 Mon Sep 17 00:00:00 2001 From: Bryan Duxbury Date: Thu, 29 Jan 2009 01:21:20 +0000 Subject: THRIFT-166. java: Java tests should be in lib/java/test/ THRIFT-221. java: Make java build classpath more dynamic and configurable This issue moves all the tests from test/java to lib/java/test/src and combines the build files. In addition, rather than continue on with the same busted approach to finding dependent jars for the tests, THRIFT-221 has been implemented, allowing the user to specify a .thrift-build.properties file in their home directory that contains additional classpath entries. As a result of this patch, "make check" does not currently work as it is expected to. This will be resolved in a follow-up commit. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@738695 13f79535-47bb-0310-9956-ffa450edef68 --- aclocal/ax_java.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'aclocal') diff --git a/aclocal/ax_java.m4 b/aclocal/ax_java.m4 index 70ec2c345..abff8c6ca 100644 --- a/aclocal/ax_java.m4 +++ b/aclocal/ax_java.m4 @@ -32,7 +32,7 @@ dnl TODO: allow to exclude compilers (rationale: most Java programs cannot compi dnl with some compilers like guavac). AC_DEFUN([AX_PROG_JAVAC],[ -test -z "$JAVAC" && AC_CHECK_PROGS(JAVAC, "gcj -C" guavac jikes javac) +test -z "$JAVAC" && AC_CHECK_PROGS(JAVAC, "gcj -C" guavac javac) test -z "$JAVAC" && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) AX_PROG_JAVAC_WORKS ]) -- cgit v1.2.1