fx2lafw: enable driver build by default

[libsigrok.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8b0286ec66f18ecc8a896ec0b45af95690b5af3e..8a17f901c2decc170da9fb4f4b51fbdbfc614842 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -104,9 +104,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)
@@ -162,6 +161,16 @@ 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.
@@ -171,7 +180,7 @@ SR_PKGLIBS=""
 
 # libglib-2.0 is always needed.
 # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement).
-AM_PATH_GLIB_2_0([2.22.0],
+AM_PATH_GLIB_2_0([2.28.0],
        [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libgthread-2.0 is always needed (e.g. for the demo hardware driver).
@@ -276,6 +285,7 @@ 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
@@ -317,5 +327,6 @@ 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