X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=d5e48450972287bc1bbec445a7f73710e24449c5;hb=b35c829306b86dbeeeecf14de7fe30a05a88c914;hp=485fd90d0c83234eb98c3fa2facb6210561f1d36;hpb=eb1f1eb407965e72d31372b472b17989d3a2f3c8;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 485fd90d..d5e48450 100644
--- 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)
@@ -114,6 +113,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 +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=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.
@@ -181,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).
@@ -238,6 +237,18 @@ 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_GENERICDMM" != xno \
+)
+
 AC_SUBST(SR_PKGLIBS)
 
 # Checks for header files.
@@ -274,7 +285,7 @@ AC_SUBST(SR_PACKAGE_VERSION_MICRO)
 AC_SUBST(SR_PACKAGE_VERSION)
 
 AC_CONFIG_FILES([Makefile
-		 sigrok.h
+		 version.h
 		 hardware/Makefile
 		 hardware/alsa/Makefile
 		 hardware/asix-sigma/Makefile
@@ -282,11 +293,11 @@ AC_CONFIG_FILES([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
@@ -324,10 +335,10 @@ 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