THRIFT-300. A reimplementation of ax_java

Completely replace ax_java.m4 with ax_javac_and_java, which is
a clean-room implementation of an autoconf macro to detect Java.
It has some limitations compared to the ax_java macros in
The Autoconf Macro archive, but it has two key advantages.
It is not GPL-licensed.  It doesn't abort configure if Java is
not found.


git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@753428 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/configure.ac b/configure.ac
index 3f135b1..889cba8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,9 +49,8 @@
 
 AX_THRIFT_LIB(java, [Java], yes)
 if test "$with_java" = "yes";  then
+  AX_JAVAC_AND_JAVA
   AC_PATH_PROG([ANT], [ant])
-  AX_PROG_JAVAC
-  AX_PROG_JAVA
 fi
 AM_CONDITIONAL([WITH_JAVA],
                [test -n "$ANT" -a -n "$JAVA" -a -n "$JAVAC"])