generic-dmm: cosmetics

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b0558ef3296e64f21820d046533b56ddccbc027a..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]]),
@@ -104,9 +114,8 @@ if test "x$LA_CHRONOVU_LA8" = "xyes"; then
        AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
 fi
 
-# Disabled per default for now, will be enabled when it's tested some more.
 AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
-             [enable fx2lafw support (for FX2 LAs). [default=no]]),
+             [enable fx2lafw support (for FX2 LAs). [default=yes]]),
              [LA_FX2LAFW="$enableval"],
              [LA_FX2LAFW=yes])
 AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes)
@@ -114,6 +123,16 @@ if test "x$LA_FX2LAFW" = "xyes"; then
        AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support])
 fi
 
+# Disabled by default for now
+AC_ARG_ENABLE(genericdmm, AC_HELP_STRING([--enable-genericdmm],
+             [enable genericdmm support (for most DMMs). [default=no]]),
+             [HW_GENERICDMM="$enableval"],
+             [HW_GENERICDMM=no])
+AM_CONDITIONAL(HW_GENERICDMM, test x$HW_GENERICDMM = xyes)
+if test "x$HW_GENERICDMM" = "xyes"; then
+       AC_DEFINE(HAVE_HW_GENERICDMM, 1, [Generic DMM support])
+fi
+
 AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo],
              [enable demo driver support [default=yes]]),
              [LA_DEMO="$enableval"],
@@ -162,16 +181,6 @@ if test "x$HW_HANTEK_DSO" = "xyes"; then
        AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support])
 fi
 
-AC_ARG_ENABLE(mastech-va18b,
-             AC_HELP_STRING([--enable-mastech-va18b],
-             [enable Mastech VA18B support [default=yes]]),
-             [HW_MASTECH_VA18B="$enableval"],
-             [HW_MASTECH_VA18B=yes])
-AM_CONDITIONAL(HW_MASTECH_VA18B, test x$HW_MASTECH_VA18B = xyes)
-if test "x$HW_MASTECH_VA18B" = "xyes"; then
-       AC_DEFINE(HAVE_HW_MASTECH_VA18B, 1, [Mastech VA18B support])
-fi
-
 # Checks for libraries.
 
 # This variable collects the pkg-config names of all detected libs.
@@ -192,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.
@@ -238,6 +248,19 @@ if test "x$LA_ALSA" != xno; then
                SR_PKGLIBS="$SR_PKGLIBS alsa"])
 fi
 
+# EZUSB FX2 firmware helpers only needed for some hardware drivers
+AM_CONDITIONAL(NEED_EZUSB, \
+       test "x$LA_FX2LAFW" != xno \
+       -o "x$HW_HANTEK_DSO" != xno \
+)
+
+# 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 \
+)
+
 AC_SUBST(SR_PKGLIBS)
 
 # Checks for header files.
@@ -274,19 +297,20 @@ AC_SUBST(SR_PACKAGE_VERSION_MICRO)
 AC_SUBST(SR_PACKAGE_VERSION)
 
 AC_CONFIG_FILES([Makefile
-                sigrok.h
+                version.h
                 hardware/Makefile
+                hardware/agilent-dmm/Makefile
                 hardware/alsa/Makefile
                 hardware/asix-sigma/Makefile
                 hardware/chronovu-la8/Makefile
                 hardware/common/Makefile
                 hardware/demo/Makefile
                 hardware/fx2lafw/Makefile
+                hardware/genericdmm/Makefile
                 hardware/link-mso19/Makefile
                 hardware/openbench-logic-sniffer/Makefile
                 hardware/zeroplus-logic-cube/Makefile
                 hardware/hantek-dso/Makefile
-                hardware/mastech-va18b/Makefile
                 input/Makefile
                 output/Makefile
                 output/text/Makefile
@@ -320,14 +344,15 @@ 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"
 echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
+echo "  - Generic DMM..................... $HW_GENERICDMM"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
 echo "  - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"
 echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
-echo "  - Mastech VA18B................... $HW_MASTECH_VA18B"
 echo