X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=3847d17f38963208e076d66ff1416d8df3c3cb98;hb=ce95428cca4ee7f8263389dd44a02d228d2be88e;hp=b5610187a70c3c639ba460aa002042d8640c3748;hpb=9e165e742fcaf247fe36644192194e59a02698aa;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index b5610187..3847d17f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,6 +104,11 @@ AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
 	[HW_BRYMEN_DMM="$enableval"],
 	[HW_BRYMEN_DMM=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(cem-dt-885x, AC_HELP_STRING([--enable-cem-dt-885x],
+	[enable CEM DT-885x support [default=yes]]),
+	[HW_CEM_DT_885X="$enableval"],
+	[HW_CEM_DT_885X=yes])
+
 AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
 	[enable ChronoVu LA8 support [default=yes]]),
 	[HW_CHRONOVU_LA8="$enableval"],
@@ -134,26 +139,36 @@ AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso],
 	[HW_HANTEK_DSO="$enableval"],
 	[HW_HANTEK_DSO=$HW_ENABLED_DEFAULT])
 
+AC_ARG_ENABLE(ikalogic-scanalogic2, AC_HELP_STRING([--enable-ikalogic-scanalogic2],
+	[enable IKALOGIC Scanalogic-2 support [default=yes]]),
+	[HW_IKALOGIC_SCANALOGIC2="$enableval"],
+	[HW_IKALOGIC_SCANALOGIC2=yes])
+
+AC_ARG_ENABLE(ikalogic-scanaplus, AC_HELP_STRING([--enable-ikalogic-scanaplus],
+	[enable IKALOGIC ScanaPLUS support [default=yes]]),
+	[HW_IKALOGIC_SCANAPLUS="$enableval"],
+	[HW_IKALOGIC_SCANAPLUS=yes])
+
+AC_ARG_ENABLE(kecheng-kc-330b, AC_HELP_STRING([--enable-kecheng-kc-330b],
+	[enable Kecheng KC-330B support [default=yes]]),
+	[HW_KECHENG_KC_330B="$enableval"],
+	[HW_KECHENG_KC_330B=yes])
+
 AC_ARG_ENABLE(lascar-el-usb, AC_HELP_STRING([--enable-lascar-el-usb],
 	[enable Lascar EL-USB support [default=yes]]),
 	[HW_LASCAR_EL_USB="$enableval"],
 	[HW_LASCAR_EL_USB=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19],
-	[enable Link Instruments MSO-19 support [default=yes]]),
+	[enable Link Instruments MSO-19 support [default=no]]),
 	[HW_LINK_MSO19="$enableval"],
-	[HW_LINK_MSO19=$HW_ENABLED_DEFAULT])
+	[HW_LINK_MSO19="no"])
 
 AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx],
 	[enable MIC 985xx support [default=yes]]),
 	[HW_MIC_985XX="$enableval"],
 	[HW_MIC_985XX=$HW_ENABLED_DEFAULT])
 
-AC_ARG_ENABLE(nexus-osciprime, AC_HELP_STRING([--enable-nexus-osciprime],
-	[enable Nexus Osciprime support [default=yes]]),
-	[HW_NEXUS_OSCIPRIME="$enableval"],
-	[HW_NEXUS_OSCIPRIME=$HW_ENABLED_DEFAULT])
-
 AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols],
 	[enable OpenBench Logic Sniffer (OLS) support [default=yes]]),
 	[HW_OLS="$enableval"],
@@ -197,6 +212,9 @@ AC_ARG_ENABLE(zeroplus-logic-cube,
 # libsigrok.pc file.
 SR_PKGLIBS=""
 
+# libm (the standard math library) is always needed.
+AC_SEARCH_LIBS([pow], [m])
+
 # libglib-2.0 is always needed. Abort if it's not found.
 # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement).
 # We require at least 2.32.0 due to e.g. g_variant_new_fixed_array().
@@ -224,7 +242,8 @@ case "$host" in
 		LIBS="$LIBS $libusb_LIBS";
 		SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
 		[have_libusb1_0="no"; HW_FX2LAFW="no"; HW_HANTEK_DSO="no";
-		HW_LASCAR_EL_USB="no"; HW_NEXUS_OSCIPRIME="no";
+		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"])
 
@@ -244,7 +263,7 @@ PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
 	[CFLAGS="$CFLAGS $libftdi_CFLAGS";
 	LIBS="$LIBS $libftdi_LIBS";
 	SR_PKGLIBS="$SR_PKGLIBS libftdi"],
-	[HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA8="no"])
+	[HW_ASIX_SIGMA="no"; HW_CHRONOVU_LA8="no"; HW_IKALOGIC_SCANAPLUS="no"])
 
 # libudev is only needed for some hardware drivers. Disable them if not found.
 PKG_CHECK_MODULES([libudev], [libudev >= 151],
@@ -303,6 +322,11 @@ if test "x$HW_BRYMEN_DMM" = "xyes"; then
 	AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support])
 fi
 
+AM_CONDITIONAL(HW_CEM_DT_885X, test x$HW_CEM_DT_885X = xyes)
+if test "x$HW_CEM_DT_885X" = "xyes"; then
+	AC_DEFINE(HAVE_HW_CEM_DT_885X, 1, [CEM DT-885x support])
+fi
+
 AM_CONDITIONAL(HW_CHRONOVU_LA8, test x$HW_CHRONOVU_LA8 = xyes)
 if test "x$HW_CHRONOVU_LA8" = "xyes"; then
 	AC_DEFINE(HAVE_HW_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
@@ -333,6 +357,21 @@ if test "x$HW_HANTEK_DSO" = "xyes"; then
 	AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support])
 fi
 
+AM_CONDITIONAL(HW_IKALOGIC_SCANALOGIC2, test x$HW_IKALOGIC_SCANALOGIC2 = xyes)
+if test "x$HW_IKALOGIC_SCANALOGIC2" = "xyes"; then
+	AC_DEFINE(HAVE_HW_IKALOGIC_SCANALOGIC2, 1, [IKALOGIC Scanalogic-2 support])
+fi
+
+AM_CONDITIONAL(HW_IKALOGIC_SCANAPLUS, test x$HW_IKALOGIC_SCANAPLUS = xyes)
+if test "x$HW_IKALOGIC_SCANAPLUS" = "xyes"; then
+	AC_DEFINE(HAVE_HW_IKALOGIC_SCANAPLUS, 1, [IKALOGIC ScanaPLUS support])
+fi
+
+AM_CONDITIONAL(HW_KECHENG_KC_330B, test x$HW_KECHENG_KC_330B = xyes)
+if test "x$HW_KECHENG_KC_330B" = "xyes"; then
+	AC_DEFINE(HAVE_HW_KECHENG_KC_330B, 1, [Kecheng KC-330B support])
+fi
+
 AM_CONDITIONAL(HW_LASCAR_EL_USB, test x$HW_LASCAR_EL_USB = xyes)
 if test "x$HW_LASCAR_EL_USB" = "xyes"; then
 	AC_DEFINE(HAVE_HW_LASCAR_EL_USB, 1, [Lascar EL-USB support])
@@ -348,11 +387,6 @@ if test "x$HW_MIC_985XX" = "xyes"; then
 	AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support])
 fi
 
-AM_CONDITIONAL(HW_NEXUS_OSCIPRIME, test x$HW_NEXUS_OSCIPRIME = xyes)
-if test "x$HW_NEXUS_OSCIPRIME" = "xyes"; then
-	AC_DEFINE(HAVE_HW_NEXUS_OSCIPRIME, 1, [Nexus Osciprime support])
-fi
-
 AM_CONDITIONAL(HW_OLS, test x$HW_OLS = xyes)
 if test "x$HW_OLS" = "xyes"; then
 	AC_DEFINE(HAVE_HW_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
@@ -426,12 +460,15 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/alsa/Makefile
 		 hardware/asix-sigma/Makefile
 		 hardware/brymen-dmm/Makefile
+		 hardware/cem-dt-885x/Makefile
 		 hardware/chronovu-la8/Makefile
 		 hardware/colead-slm/Makefile
 		 hardware/common/Makefile
+		 hardware/ikalogic-scanalogic2/Makefile
+		 hardware/ikalogic-scanaplus/Makefile
+		 hardware/kecheng-kc-330b/Makefile
 		 hardware/lascar-el-usb/Makefile
 		 hardware/mic-985xx/Makefile
-		 hardware/nexus-osciprime/Makefile
 		 hardware/rigol-ds1xx2/Makefile
 		 hardware/tondaj-sl-814/Makefile
 		 hardware/victor-dmm/Makefile
@@ -483,16 +520,19 @@ echo "  - agilent-dmm..................... $HW_AGILENT_DMM"
 echo "  - alsa............................ $HW_ALSA"
 echo "  - asix-sigma...................... $HW_ASIX_SIGMA"
 echo "  - brymen-dmm...................... $HW_BRYMEN_DMM"
+echo "  - cem-dt-885x..................... $HW_CEM_DT_885X"
 echo "  - chronovu-la8.................... $HW_CHRONOVU_LA8"
 echo "  - colead-slm...................... $HW_COLEAD_SLM"
 echo "  - demo............................ $HW_DEMO"
 echo "  - fluke-dmm....................... $HW_FLUKE_DMM"
 echo "  - fx2lafw......................... $HW_FX2LAFW"
 echo "  - hantek-dso...................... $HW_HANTEK_DSO"
+echo "  - ikalogic-scanalogic2............ $HW_IKALOGIC_SCANALOGIC2"
+echo "  - ikalogic-scanaplus.............. $HW_IKALOGIC_SCANAPLUS"
+echo "  - kecheng-kc-330b................. $HW_KECHENG_KC_330B"
 echo "  - lascar-el-usb................... $HW_LASCAR_EL_USB"
-echo "  - link-mso19...................... $HW_LINK_MSO19"
+echo "  - link-mso19 (EXPERIMENTAL)....... $HW_LINK_MSO19"
 echo "  - mic-985xx....................... $HW_MIC_985XX"
-echo "  - nexus-osciprime................. $HW_NEXUS_OSCIPRIME"
 echo "  - openbench-logic-sniffer......... $HW_OLS"
 echo "  - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2"
 echo "  - serial-dmm...................... $HW_SERIAL_DMM"