X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=396e3ec21345c10b6bb424e7ea8492332e397b75;hb=e26f5af3593b6d826a8ad7bed399935197454f2c;hp=2879b2794ce808cc8f81dbccd30168fea86b769f;hpb=57621c6d60b1eb31d0a3071fc362547c88c5d395;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 2879b279..396e3ec2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -434,7 +434,7 @@ CXXFLAGS="$CXXFLAGS -Iinclude/libsigrok -I${srcdir}/include -Ibindings/cxx -Ibin
 
 # Find Java compiler and JNI includes for Java bindings.
 AC_CHECK_PROG([HAVE_JAVAC], [javac], [yes], [no])
-if test "x$HAVE_JAVAC" = "xyes"; then
+if test "x$HAVE_JAVAC" = "xyes" && test "x$BINDINGS_JAVA" = "xyes"; then
 	AX_PROG_JAVAC
 	if test "x$JNI_INCLUDE_DIRS" = "xauto"; then
 		if test "x$cross_compiling" = "xyes"; then
@@ -513,9 +513,6 @@ AM_CONDITIONAL(BINDINGS_CXX, test x$BINDINGS_CXX = xyes)
 
 AM_CONDITIONAL(BINDINGS_PYTHON, test x$BINDINGS_PYTHON = xyes)
 
-# Temporarily disable Java bindings, they need a bugfix.
-BINDINGS_JAVA="no"; java_msg="temporarily disabled, needs a bugfix"
-
 AM_CONDITIONAL(BINDINGS_JAVA, test x$BINDINGS_JAVA = xyes)
 
 # Checks for header files.