]> sigrok.org Git - libsigrok.git/blobdiff - configure.ac
serial: Improved docs.
[libsigrok.git] / configure.ac
index c1c4aedce85a2bcf392b99d61199bdde8c7be75e..cbe91cf39de17db843a8663db2679752e2b602ee 100644 (file)
@@ -94,6 +94,11 @@ AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
        [HW_ALSA="$enableval"],
        [HW_ALSA=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(appa-55ii, AC_HELP_STRING([--enable-appa-55ii],
+       [enable APPA 55II support [default=yes]]),
+       [HW_APPA_55II="$enableval"],
+       [HW_APPA_55II=$HW_ENABLED_DEFAULT])
+
 AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma],
        [enable ASIX SIGMA/SIGMA2 support [default=yes]]),
        [HW_ASIX_SIGMA="$enableval"],
@@ -144,6 +149,11 @@ AC_ARG_ENABLE(gmc-mh-1x-2x, AC_HELP_STRING([--enable-gmc-mh-1x-2x],
        [HW_GMC_MH_1X_2X="$enableval"],
        [HW_GMC_MH_1X_2X=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(hameg-hmo, AC_HELP_STRING([--enable-hameg-hmo],
+       [enable Hameg HMO support [default=yes]]),
+       [HW_HAMEG_HMO="$enableval"],
+       [HW_HAMEG_HMO=$HW_ENABLED_DEFAULT])
+
 AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso],
        [enable Hantek DSO support [default=yes]]),
        [HW_HANTEK_DSO="$enableval"],
@@ -237,6 +247,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.
@@ -262,10 +278,11 @@ PKG_CHECK_MODULES([libserialport], [libserialport >= 0.1.0],
        [have_libserialport="yes"; CFLAGS="$CFLAGS $libserialport_CFLAGS";
        LIBS="$LIBS $libserialport_LIBS";
        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_NORMA_DMM="no"; HW_OLS="no"; HW_RIGOL_DS1XX2="no";
+       [have_libserialport="no"; HW_AGILENT_DMM="no"; HW_APPA_55II="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_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"])
 
 # Define HAVE_LIBSERIALPORT in config.h if we found libserialport.
@@ -288,7 +305,7 @@ case "$host" in
                [Specifies whether we have a libusb.h header.])
        ;;
 *)
-       PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9],
+       PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.16],
                [have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS";
                LIBS="$LIBS $libusb_LIBS";
                SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
@@ -334,19 +351,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)
@@ -363,6 +373,11 @@ if test "x$HW_ALSA" = "xyes"; then
        AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support])
 fi
 
+AM_CONDITIONAL(HW_APPA_55II, test x$HW_APPA_55II = xyes)
+if test "x$HW_APPA_55II" = "xyes"; then
+       AC_DEFINE(HAVE_HW_APPA_55II, 1, [APPA 55II support])
+fi
+
 AM_CONDITIONAL(HW_ASIX_SIGMA, test x$HW_ASIX_SIGMA = xyes)
 if test "x$HW_ASIX_SIGMA" = "xyes"; then
        AC_DEFINE(HAVE_HW_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
@@ -418,6 +433,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])
@@ -540,6 +560,7 @@ AC_SUBST(SR_PACKAGE_VERSION)
 AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/agilent-dmm/Makefile
                 hardware/alsa/Makefile
+                hardware/appa-55ii/Makefile
                 hardware/asix-sigma/Makefile
                 hardware/brymen-dmm/Makefile
                 hardware/cem-dt-885x/Makefile
@@ -548,6 +569,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
                 hardware/colead-slm/Makefile
                 hardware/common/Makefile
                 hardware/gmc-mh-1x-2x/Makefile
+                hardware/hameg-hmo/Makefile
                 hardware/ikalogic-scanalogic2/Makefile
                 hardware/ikalogic-scanaplus/Makefile
                 hardware/kecheng-kc-330b/Makefile
@@ -593,7 +615,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "libusb-1.0 >= 1.0.9" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.10" "libserialport >= 0.1.0" "libusb-1.0 >= 1.0.16" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do
        if `$PKG_CONFIG --exists $lib`; then
                ver=`$PKG_CONFIG --modversion $lib`
                answer="yes ($ver)"
@@ -606,6 +628,7 @@ done
 echo -e "\nEnabled hardware drivers:\n"
 echo "  - agilent-dmm..................... $HW_AGILENT_DMM"
 echo "  - alsa............................ $HW_ALSA"
+echo "  - appa-55ii....................... $HW_APPA_55II"
 echo "  - asix-sigma...................... $HW_ASIX_SIGMA"
 echo "  - brymen-dmm...................... $HW_BRYMEN_DMM"
 echo "  - cem-dt-885x..................... $HW_CEM_DT_885X"
@@ -616,6 +639,7 @@ echo "  - demo............................ $HW_DEMO"
 echo "  - fluke-dmm....................... $HW_FLUKE_DMM"
 echo "  - fx2lafw......................... $HW_FX2LAFW"
 echo "  - gmc-mh-1x-2x.................... $HW_GMC_MH_1X_2X"
+echo "  - hameg-hmo....................... $HW_HAMEG_HMO"
 echo "  - hantek-dso...................... $HW_HANTEK_DSO"
 echo "  - ikalogic-scanalogic2............ $HW_IKALOGIC_SCANALOGIC2"
 echo "  - ikalogic-scanaplus.............. $HW_IKALOGIC_SCANAPLUS"