agilent-dmm: make parser deal with input better

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index d5e48450972287bc1bbec445a7f73710e24449c5..54f8f15db782865c7b08bd5034212e5c6c6885be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,16 @@ AC_SUBST(SR_LIB_LDFLAGS)
 
 # Logic analyzer hardware support '--enable' options.
 
+# Disabled by default
+AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm],
+             [enable Agilent DMM driver support [default=no]]),
+             [HW_AGILENT_DMM="$enableval"],
+             [HW_AGILENT_DMM=xno])
+AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes)
+if test "x$HW_AGILENT_DMM" = "xyes"; then
+       AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM driver support])
+fi
+
 # Disabled by default, unfinished.
 AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
              [enable ALSA driver support [default=no]]),
@@ -191,8 +201,9 @@ PKG_CHECK_MODULES([gthread], [gthread-2.0 >= 2.22.0],
 # libusb is only needed for some hardware drivers.
 if test "x$LA_ASIX_SIGMA" != xno \
    -o "x$LA_CHRONOVU_LA8" != xno \
-   -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno \
-   -o "x$LA_FX2LAFW" != xno; then
+   -o "x$LA_FX2LAFW" != xno \
+   -o "x$HW_HANTEK_DSO" != xno \
+   -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno; then
        case "$build" in
        *freebsd*)
                # FreeBSD comes with an "integrated" libusb-1.0-style USB API.
@@ -246,6 +257,7 @@ AM_CONDITIONAL(NEED_EZUSB, \
 # Serial port helpers only needed for some hardware drivers
 AM_CONDITIONAL(NEED_SERIAL, \
        test "x$LA_OLS" != xno \
+       -o "x$HW_AGILENT_DMM" != xno \
        -o "x$HW_GENERICDMM" != xno \
 )
 
@@ -287,6 +299,7 @@ AC_SUBST(SR_PACKAGE_VERSION)
 AC_CONFIG_FILES([Makefile
                 version.h
                 hardware/Makefile
+                hardware/agilent-dmm/Makefile
                 hardware/alsa/Makefile
                 hardware/asix-sigma/Makefile
                 hardware/chronovu-la8/Makefile
@@ -331,6 +344,7 @@ done
 echo
 echo "Enabled hardware drivers:"
 echo
+echo "  - Agilent DMM..................... $HW_AGILENT_DMM"
 echo "  - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
 echo "  - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
 echo "  - Demo driver..................... $LA_DEMO"