X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=configure.ac;h=f177c87f56f900cb0e642a24338515e7b28a87c4;hb=3c6ce226dec2ee70c044d844ffbb3845f07baf7e;hp=7118bce28709903784cb0d9e8d82be04b283bb98;hpb=28b9dd18611da8e16038d62d58195bdef91552eb;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 7118bce2..f177c87f 100644 --- a/configure.ac +++ b/configure.ac @@ -171,16 +171,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=no]]), - [HW_MASTECH_VA18B="$enableval"], - [HW_MASTECH_VA18B=no]) -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. @@ -201,8 +191,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. @@ -308,7 +299,6 @@ AC_CONFIG_FILES([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 @@ -351,6 +341,5 @@ 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