serial-dmm: Commented struct dmm_info.

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e6cb714319c5e1096f22f9dd28a674c90e39b41f..341873a013b0885b9a1fe3aa988eac11e46e6538 100644 (file)
--- 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.
@@ -269,7 +275,8 @@ PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0],
        SR_PKGLIBS="$SR_PKGLIBS libserialport"],
        [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_BRYMEN_DMM="no";
        HW_CEM_DT_885X="no"; HW_CENTER_3XX="no"; HW_COLEAD_SLM="no";
-       HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_LINK_MSO19="no"; HW_MIC_985XX="no";
+       HW_FLUKE_DMM="no"; HW_GMC_MH_1X_2X="no"; HW_HAMEG_HMO="no";
+       HW_LINK_MSO19="no"; HW_MIC_985XX="no";
        HW_NORMA_DMM="no"; HW_OLS="no"; HW_RIGOL_DS="no";
        HW_SERIAL_DMM="no"; HW_TELEINFO="no"; HW_TONDAJ_SL_814="no"])
 
@@ -339,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)