X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=850384c5f8c7da38a9aa3e9cf47c9b3230bde5db;hb=6f22a8ef2ccf7091324b41b553632695507215a7;hp=62675bc26925589a0a2fa9e6b26454876bb3f11e;hpb=6f669a68e77a8a8fe4e62d66851cd894d72538dd;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 62675bc2..850384c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,7 @@ AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm],
 	      [HW_AGILENT_DMM=yes])
 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])
+	AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM support])
 fi
 
 # Disabled by default, unfinished.
@@ -124,7 +124,7 @@ if test "x$LA_DEMO" = "xyes"; then
 fi
 
 AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm],
-	      [enable Fluke DMM support. [default=yes]]),
+	      [enable Fluke DMM support [default=yes]]),
 	      [HW_FLUKE_DMM="$enableval"],
 	      [HW_FLUKE_DMM=yes])
 AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes)
@@ -142,7 +142,7 @@ if test "x$LA_FX2LAFW" = "xyes"; then
 fi
 
 AC_ARG_ENABLE(genericdmm, AC_HELP_STRING([--enable-genericdmm],
-	      [enable genericdmm support (for most DMMs). [default=yes]]),
+	      [enable genericdmm support (for most DMMs) [default=yes]]),
 	      [HW_GENERICDMM="$enableval"],
 	      [HW_GENERICDMM=yes])
 AM_CONDITIONAL(HW_GENERICDMM, test x$HW_GENERICDMM = xyes)
@@ -150,8 +150,7 @@ if test "x$HW_GENERICDMM" = "xyes"; then
 	AC_DEFINE(HAVE_HW_GENERICDMM, 1, [Generic DMM support])
 fi
 
-AC_ARG_ENABLE(hantek-dso,
-	      AC_HELP_STRING([--enable-hantek-dso],
+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])
@@ -180,7 +179,7 @@ if test "x$LA_OLS" = "xyes"; then
 fi
 
 AC_ARG_ENABLE(radioshack-dmm, AC_HELP_STRING([--enable-radioshack-dmm],
-	      [enable RadioShack DMM support. [default=yes]]),
+	      [enable RadioShack DMM support [default=yes]]),
 	      [HW_RADIOSHACK_DMM="$enableval"],
 	      [HW_RADIOSHACK_DMM=yes])
 AM_CONDITIONAL(HW_RADIOSHACK_DMM, test x$HW_RADIOSHACK_DMM = xyes)
@@ -188,6 +187,24 @@ if test "x$HW_RADIOSHACK_DMM" = "xyes"; then
 	AC_DEFINE(HAVE_HW_RADIOSHACK_DMM, 1, [RadioShack DMM support])
 fi
 
+AC_ARG_ENABLE(tekpower-dmm, AC_HELP_STRING([--enable-tekpower-dmm],
+	      [enable TekPower DMM support [default=yes]]),
+	      [HW_TEKPOWER_DMM="$enableval"],
+	      [HW_TEKPOWER_DMM=yes])
+AM_CONDITIONAL(HW_TEKPOWER_DMM, test x$HW_TEKPOWER_DMM = xyes)
+if test "x$HW_TEKPOWER_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_TEKPOWER_DMM, 1, [TekPower DMM support])
+fi
+
+AC_ARG_ENABLE(uni-t-dmm, AC_HELP_STRING([--enable-uni-t-dmm],
+	      [enable UNI-T DMM support [default=yes]]),
+	      [HW_UNI_T_DMM="$enableval"],
+	      [HW_UNI_T_DMM=yes])
+AM_CONDITIONAL(HW_UNI_T_DMM, test x$HW_UNI_T_DMM = xyes)
+if test "x$HW_UNI_T_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_UNI_T_DMM, 1, [UNI-T DMM support])
+fi
+
 AC_ARG_ENABLE(zeroplus-logic-cube,
 	      AC_HELP_STRING([--enable-zeroplus-logic-cube],
 	      [enable ZEROPLUS Logic Cube support [default=yes]]),
@@ -207,7 +224,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.28.0],
+AM_PATH_GLIB_2_0([2.32.0],
 	[CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # libgthread-2.0 is always needed (e.g. for the demo hardware driver).
@@ -265,13 +282,13 @@ if test "x$LA_ALSA" != xno; then
 		SR_PKGLIBS="$SR_PKGLIBS alsa"])
 fi
 
-# EZUSB FX2 firmware helpers only needed for some hardware drivers
+# EZUSB FX2 firmware helper code is 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
+# Serial port helper code is only needed for some hardware drivers.
 AM_CONDITIONAL(NEED_SERIAL, \
 	test "x$LA_OLS" != xno \
 	-o "x$HW_AGILENT_DMM" != xno \
@@ -319,6 +336,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/asix-sigma/Makefile
 		 hardware/chronovu-la8/Makefile
 		 hardware/common/Makefile
+		 hardware/common/dmm/Makefile
 		 hardware/demo/Makefile
 		 hardware/fluke-dmm/Makefile
 		 hardware/fx2lafw/Makefile
@@ -327,6 +345,8 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/link-mso19/Makefile
 		 hardware/openbench-logic-sniffer/Makefile
 		 hardware/radioshack-dmm/Makefile
+		 hardware/tekpower-dmm/Makefile
+		 hardware/uni-t-dmm/Makefile
 		 hardware/zeroplus-logic-cube/Makefile
 		 input/Makefile
 		 output/Makefile
@@ -370,6 +390,8 @@ echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
 echo "  - Link MSO-19..................... $LA_LINK_MSO19"
 echo "  - Openbench Logic Sniffer......... $LA_OLS"
 echo "  - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
+echo "  - TekPower DMM.................... $HW_TEKPOWER_DMM"
+echo "  - UNI-T DMM....................... $HW_UNI_T_DMM"
 echo "  - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"
 echo