X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=396e3ec21345c10b6bb424e7ea8492332e397b75;hb=a6413fa58e455fb4a654720218183e297835226c;hp=f953857c0e9f70acad15f531e366839ac8cf3b00;hpb=b50891952d22d1c5012a99ad643ee3dd58495420;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index f953857c..396e3ec2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -423,14 +423,6 @@ PKG_CHECK_MODULES([check], [check >= 0.9.4],
 	[have_check="yes"], [have_check="no"])
 AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
-# The OLS driver uses serial port file descriptors directly, and therefore
-# will not currently work on Windows.
-case "$host" in
-*mingw*)
-	HW_OPENBENCH_LOGIC_SNIFFER="no"
-	;;
-esac
-
 # The BeagleLogic driver needs sys/mman.h and sys/ioctl.h. Don't try to
 # build it if these headers aren't available.
 AC_CHECK_HEADERS([sys/mman.h sys/ioctl.h], [], [HW_BEAGLELOGIC="no"])
@@ -442,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