Fix test failure

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f0435c42bd1a08370d84b9a3ab181dac7d411b0a..e14f4a25ee661c60f57923a17b858a2931acdca0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -149,11 +149,6 @@ AC_ARG_ENABLE(hameg-hmo, AC_HELP_STRING([--enable-hameg-hmo],
        [HW_HAMEG_HMO="$enableval"],
        [HW_HAMEG_HMO=$HW_ENABLED_DEFAULT])
 
-AM_CONDITIONAL(HW_HAMEG_HMO, test x$HW_HAMEG_HMO = xyes)
-if test "x$HW_HAMEG_HMO" = "xyes"; then
-       AC_DEFINE(HAVE_HW_HAMEG_HMO, 1, [Hameg HMO support])
-fi
-
 AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso],
        [enable Hantek DSO support [default=yes]]),
        [HW_HANTEK_DSO="$enableval"],
@@ -247,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.
@@ -274,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"])
 
@@ -344,21 +346,6 @@ 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.
-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"
-       ;;
-esac
-
 AC_SUBST(SR_PKGLIBS)
 
 # Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers.
@@ -428,6 +415,11 @@ if test "x$HW_HANTEK_DSO" = "xyes"; then
        AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support])
 fi
 
+AM_CONDITIONAL(HW_HAMEG_HMO, test x$HW_HAMEG_HMO = xyes)
+if test "x$HW_HAMEG_HMO" = "xyes"; then
+       AC_DEFINE(HAVE_HW_HAMEG_HMO, 1, [Hameg HMO support])
+fi
+
 AM_CONDITIONAL(HW_IKALOGIC_SCANALOGIC2, test x$HW_IKALOGIC_SCANALOGIC2 = xyes)
 if test "x$HW_IKALOGIC_SCANALOGIC2" = "xyes"; then
        AC_DEFINE(HAVE_HW_IKALOGIC_SCANALOGIC2, 1, [IKALOGIC Scanalogic-2 support])