X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=ce067e32be94841d643a6e65cbfb6c758707df00;hb=abb39e6b8c9f2d512920dce440c0d8dd7a9a90f0;hp=3ac06e7768186a6ce0ba181fb279bad9f5e55922;hpb=4433145f481d077570b371b466e98b17a77ec7e2;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 3ac06e77..ce067e32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,6 +184,11 @@ AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2],
 	[HW_RIGOL_DS1XX2="$enableval"],
 	[HW_RIGOL_DS1XX2=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(saleae-logic16, AC_HELP_STRING([--enable-saleae-logic16],
+	[enable Saleae Logic16 support [default=yes]]),
+	[HW_SALEAE_LOGIC16="$enableval"],
+	[HW_SALEAE_LOGIC16=yes])
+
 AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
 	[enable serial DMM support [default=yes]]),
 	[HW_SERIAL_DMM="$enableval"],
@@ -199,6 +204,11 @@ AC_ARG_ENABLE(uni-t-dmm, AC_HELP_STRING([--enable-uni-t-dmm],
 	[HW_UNI_T_DMM="$enableval"],
 	[HW_UNI_T_DMM=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(uni-t-ut32x, AC_HELP_STRING([--enable-uni-t-ut32x],
+	[enable UNI-T UT32x support [default=yes]]),
+	[HW_UNI_T_UT32X="$enableval"],
+	[HW_UNI_T_UT32X=yes])
+
 AC_ARG_ENABLE(victor-dmm, AC_HELP_STRING([--enable-victor-dmm],
 	[enable victor-dmm support [default=yes]]),
 	[HW_VICTOR_DMM="$enableval"],
@@ -250,7 +260,7 @@ case "$host" in
 		HW_IKALOGIC_SCANALOGIC2="no"; HW_KECHENG_KC_330B="no";
 		HW_LASCAR_EL_USB="no";
 		HW_UNI_T_DMM="no"; HW_VICTOR_DMM="no";
-		HW_ZEROPLUS_LOGIC_CUBE="no"])
+		HW_ZEROPLUS_LOGIC_CUBE="no"; HW_SALEAE_LOGIC16="no"])
 
 	# Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
 	if test "x$have_libusb1_0" != "xno"; then
@@ -422,6 +432,11 @@ if test "x$HW_UNI_T_DMM" = "xyes"; then
 	AC_DEFINE(HAVE_HW_UNI_T_DMM, 1, [UNI-T DMM support])
 fi
 
+AM_CONDITIONAL(HW_UNI_T_UT32X, test x$HW_UNI_T_UT32X = xyes)
+if test "x$HW_UNI_T_UT32X" = "xyes"; then
+	AC_DEFINE(HAVE_HW_UNI_T_UT32X, 1, [UNI-T UT32x support])
+fi
+
 AM_CONDITIONAL(HW_VICTOR_DMM, test x$HW_VICTOR_DMM = xyes)
 if test "x$HW_VICTOR_DMM" = "xyes"; then
 	AC_DEFINE(HAVE_HW_VICTOR_DMM, 1, [Victor DMM support])
@@ -432,11 +447,17 @@ if test "x$HW_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
 	AC_DEFINE(HAVE_HW_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
 fi
 
+AM_CONDITIONAL(HW_SALEAE_LOGIC16, test x$HW_SALEAE_LOGIC16 = xyes)
+if test "x$HW_SALEAE_LOGIC16" = "xyes"; then
+	AC_DEFINE(HAVE_HW_SALEAE_LOGIC16, 1, [Saleae Logic16 support])
+fi
+
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
 AC_CHECK_HEADERS([fcntl.h sys/time.h termios.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
+AC_C_BIGENDIAN
 AC_C_INLINE
 AC_TYPE_INT8_T
 AC_TYPE_INT16_T
@@ -481,6 +502,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/lascar-el-usb/Makefile
 		 hardware/mic-985xx/Makefile
 		 hardware/rigol-ds1xx2/Makefile
+		 hardware/saleae-logic16/Makefile
 		 hardware/tondaj-sl-814/Makefile
 		 hardware/victor-dmm/Makefile
 		 hardware/common/dmm/Makefile
@@ -492,6 +514,7 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/openbench-logic-sniffer/Makefile
 		 hardware/serial-dmm/Makefile
 		 hardware/uni-t-dmm/Makefile
+		 hardware/uni-t-ut32x/Makefile
 		 hardware/zeroplus-logic-cube/Makefile
 		 input/Makefile
 		 output/Makefile
@@ -547,9 +570,11 @@ echo "  - link-mso19 (EXPERIMENTAL)....... $HW_LINK_MSO19"
 echo "  - mic-985xx....................... $HW_MIC_985XX"
 echo "  - openbench-logic-sniffer......... $HW_OLS"
 echo "  - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2"
+echo "  - saleae-logic16.................. $HW_SALEAE_LOGIC16"
 echo "  - serial-dmm...................... $HW_SERIAL_DMM"
 echo "  - tondaj-sl-814................... $HW_TONDAJ_SL_814"
 echo "  - uni-t-dmm....................... $HW_UNI_T_DMM"
+echo "  - uni-t-ut32x..................... $HW_UNI_T_UT32X"
 echo "  - victor-dmm...................... $HW_VICTOR_DMM"
 echo "  - zeroplus-logic-cube............. $HW_ZEROPLUS_LOGIC_CUBE"
 echo