X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=341873a013b0885b9a1fe3aa988eac11e46e6538;hb=945e23a57dc5e639c96fd00294f735848f8d463e;hp=1280582ed562696ce0314a05bf62db49c3e7b020;hpb=c6e35004cb7b5de7c2e9cff785d08589daf96e7e;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 1280582e..341873a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,6 +242,12 @@ AC_ARG_ENABLE(zeroplus-logic-cube,
 
 # Checks for libraries.
 
+case "$host" in
+*mingw*)
+	# We need to link against the Winsock2 library for SCPI over TCP.
+	LIBS="$LIBS -lws2_32";;
+esac
+
 # This variable collects the pkg-config names of all detected libs.
 # It is then used to construct the "Requires.private:" field in the
 # libsigrok.pc file.
@@ -340,19 +346,12 @@ PKG_CHECK_MODULES([check], [check >= 0.9.4],
 	LIBS="$LIBS $check_LIBS"], [have_check="no"])
 AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
-# The Rigol DS driver currently uses the Linux kernel usbtmc module
-# (though it is planned to rewrite the driver to be portable later).
-# Thus, it will be disabled for non-Linux builds for now.
+# The OLS driver uses serial port file descriptors directly, and therefore
+# will not currently work on Windows.
 case "$host" in
-*linux*)
-	# Do nothing. Whether the driver is enabled is determined by the
-	# previous --enable-all-drivers/--disable-all-drivers and/or any
-	# --enable-rigol-ds/--disable-rigol-ds options.
-	;;
-*)
-	# Disable the driver for builds that don't target Linux.
-	HW_RIGOL_DS="no"
-	;;
+*mingw*)
+       HW_OLS="no"
+       ;;
 esac
 
 AC_SUBST(SR_PKGLIBS)