X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=b0558ef3296e64f21820d046533b56ddccbc027a;hb=e21e846330070e102b24e08605b76b362020f500;hp=1504780eefb175aff897dc61e26871cb5f140756;hpb=8fdecced96a1e849f5474e57aeca456dd265d9b9;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 1504780e..b0558ef3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ AC_PREREQ([2.63])
 
 # libsigrok package version number (NOT the same as shared lib version!).
 m4_define([sr_package_version_major], [0])
-m4_define([sr_package_version_minor], [1])
-m4_define([sr_package_version_micro], [1])
+m4_define([sr_package_version_minor], [2])
+m4_define([sr_package_version_micro], [0])
 m4_define([sr_package_version], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro])
 
 AC_INIT([libsigrok], [sr_package_version], [sigrok-devel@lists.sourceforge.net],
@@ -63,7 +63,7 @@ PKG_PROG_PKG_CONFIG([0.22])
 # Carefully read the libtool docs before updating these numbers!
 # The algorithm for determining which number to change (and how) is nontrivial!
 # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
-SR_LIB_VERSION_CURRENT=0
+SR_LIB_VERSION_CURRENT=1
 SR_LIB_VERSION_REVISION=0
 SR_LIB_VERSION_AGE=0
 SR_LIB_VERSION="$SR_LIB_VERSION_CURRENT:$SR_LIB_VERSION_REVISION:$SR_LIB_VERSION_AGE"
@@ -152,6 +152,26 @@ if test "x$LA_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
 	AC_DEFINE(HAVE_LA_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
 fi
 
+AC_ARG_ENABLE(hantek-dso,
+	      AC_HELP_STRING([--enable-hantek-dso],
+	      [enable Hantek DSO support [default=yes]]),
+	      [HW_HANTEK_DSO="$enableval"],
+	      [HW_HANTEK_DSO=yes])
+AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes)
+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.
@@ -161,7 +181,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).
@@ -265,6 +285,8 @@ AC_CONFIG_FILES([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
@@ -305,5 +327,7 @@ echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
 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