X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=778093e7f59c233bed48fcc250c50c3c17237b7f;hb=c51bbdec345b0d7e1c9013e0a1bea2586cf6daa7;hp=908afe9a905022d90ec413a10beee59eac36b884;hpb=bb203cde9d42df0430e64cb5d2b604c9d68b5639;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 908afe9a..778093e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 ##
-## This file is part of the sigrok project.
+## This file is part of the libsigrok project.
 ##
 ## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
 ## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
@@ -34,7 +34,7 @@ AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
 # We require at least automake 1.11 (needed for 'silent rules').
-AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options])
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news color-tests])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
@@ -66,7 +66,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=2
+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"
@@ -88,191 +88,122 @@ AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm],
 	[enable Agilent DMM support [default=yes]]),
 	[HW_AGILENT_DMM="$enableval"],
 	[HW_AGILENT_DMM=$HW_ENABLED_DEFAULT])
-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 support])
-fi
 
 AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
 	[enable ALSA driver support [default=yes]]),
 	[HW_ALSA="$enableval"],
 	[HW_ALSA=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(HW_ALSA, test x$HW_ALSA = xyes)
-if test "x$HW_ALSA" = "xyes"; then
-	AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support])
-fi
 
 AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma],
 	[enable ASIX SIGMA/SIGMA2 support [default=yes]]),
-	[LA_ASIX_SIGMA="$enableval"],
-	[LA_ASIX_SIGMA=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(LA_ASIX_SIGMA, test x$LA_ASIX_SIGMA = xyes)
-if test "x$LA_ASIX_SIGMA" = "xyes"; then
-	AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
-fi
+	[HW_ASIX_SIGMA="$enableval"],
+	[HW_ASIX_SIGMA=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(brymen-dmm, AC_HELP_STRING([--enable-brymen-dmm],
 	[enable Brymen DMM support [default=yes]]),
 	[HW_BRYMEN_DMM="$enableval"],
-	[HW_BRYMEN_DMM=yes])
-AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes)
-if test "x$HW_BRYMEN_DMM" = "xyes"; then
-	AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [brymen-dmm support])
-fi
+	[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]]),
-	[LA_CHRONOVU_LA8="$enableval"],
-	[LA_CHRONOVU_LA8=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(LA_CHRONOVU_LA8, test x$LA_CHRONOVU_LA8 = xyes)
-if test "x$LA_CHRONOVU_LA8" = "xyes"; then
-	AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
-fi
+	[HW_CHRONOVU_LA8="$enableval"],
+	[HW_CHRONOVU_LA8=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(colead-slm, AC_HELP_STRING([--enable-colead-slm],
 	[enable Colead SLM support [default=yes]]),
 	[HW_COLEAD_SLM="$enableval"],
 	[HW_COLEAD_SLM=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes)
-if test "x$HW_COLEAD_SLM" = "xyes"; then
-	AC_DEFINE(HAVE_HW_COLEAD_SLM, 1, [Colead SLM support])
-fi
 
 AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo],
 	[enable demo driver support [default=yes]]),
-	[LA_DEMO="$enableval"],
-	[LA_DEMO=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(LA_DEMO, test x$LA_DEMO = xyes)
-if test "x$LA_DEMO" = "xyes"; then
-	AC_DEFINE(HAVE_LA_DEMO, 1, [Demo driver support])
-fi
+	[HW_DEMO="$enableval"],
+	[HW_DEMO=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm],
 	[enable Fluke DMM support [default=yes]]),
 	[HW_FLUKE_DMM="$enableval"],
 	[HW_FLUKE_DMM=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes)
-if test "x$HW_FLUKE_DMM" = "xyes"; then
-	AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [Fluke DMM support])
-fi
 
 AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
 	[enable fx2lafw support (for FX2 LAs). [default=yes]]),
-	[LA_FX2LAFW="$enableval"],
-	[LA_FX2LAFW=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes)
-if test "x$LA_FX2LAFW" = "xyes"; then
-	AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support])
-fi
+	[HW_FX2LAFW="$enableval"],
+	[HW_FX2LAFW=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(hantek-dso, AC_HELP_STRING([--enable-hantek-dso],
 	[enable Hantek DSO support [default=yes]]),
 	[HW_HANTEK_DSO="$enableval"],
 	[HW_HANTEK_DSO=$HW_ENABLED_DEFAULT])
-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(ikalogic-scanalogic2, AC_HELP_STRING([--enable-ikalogic-scanalogic2],
+	[enable IKALOGIC Scanalogic2 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])
-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])
-fi
 
 AC_ARG_ENABLE(link-mso19, AC_HELP_STRING([--enable-link-mso19],
 	[enable Link Instruments MSO-19 support [default=yes]]),
-	[LA_LINK_MSO19="$enableval"],
-	[LA_LINK_MSO19=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(LA_LINK_MSO19, test x$LA_LINK_MSO19 = xyes)
-if test "x$LA_LINK_MSO19" = "xyes"; then
-	AC_DEFINE(HAVE_LA_LINK_MSO19, 1, [Link Instruments MSO-19 support])
-fi
+	[HW_LINK_MSO19="$enableval"],
+	[HW_LINK_MSO19=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(mic-985xx, AC_HELP_STRING([--enable-mic-985xx],
 	[enable MIC 985xx support [default=yes]]),
 	[HW_MIC_985XX="$enableval"],
-	[HW_MIC_985XX=yes])
-AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes)
-if test "x$HW_MIC_985XX" = "xyes"; then
-	AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx support])
-fi
-
-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])
-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
+	[HW_MIC_985XX=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(ols, AC_HELP_STRING([--enable-ols],
 	[enable OpenBench Logic Sniffer (OLS) support [default=yes]]),
-	[LA_OLS="$enableval"],
-	[LA_OLS=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(LA_OLS, test x$LA_OLS = xyes)
-if test "x$LA_OLS" = "xyes"; then
-	AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
-fi
+	[HW_OLS="$enableval"],
+	[HW_OLS=$HW_ENABLED_DEFAULT])
 
 AC_ARG_ENABLE(rigol-ds1xx2, AC_HELP_STRING([--enable-rigol-ds1xx2],
 	[enable Rigol DS1xx2 support [default=yes]]),
 	[HW_RIGOL_DS1XX2="$enableval"],
 	[HW_RIGOL_DS1XX2=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(HW_RIGOL_DS1XX2, test x$HW_RIGOL_DS1XX2 = xyes)
-if test "x$HW_RIGOL_DS1XX2" = "xyes"; then
-	AC_DEFINE(HAVE_HW_RIGOL_DS1XX2, 1, [Rigol DS1xx2 support])
-fi
 
 AC_ARG_ENABLE(serial-dmm, AC_HELP_STRING([--enable-serial-dmm],
 	[enable serial DMM support [default=yes]]),
 	[HW_SERIAL_DMM="$enableval"],
 	[HW_SERIAL_DMM=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(HW_SERIAL_DMM, test x$HW_SERIAL_DMM = xyes)
-if test "x$HW_SERIAL_DMM" = "xyes"; then
-	AC_DEFINE(HAVE_HW_SERIAL_DMM, 1, [Serial DMM support])
-fi
 
 AC_ARG_ENABLE(tondaj-sl-814, AC_HELP_STRING([--enable-tondaj-sl-814],
 	[enable Tondaj SL-814 support [default=yes]]),
 	[HW_TONDAJ_SL_814="$enableval"],
 	[HW_TONDAJ_SL_814=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(HW_TONDAJ_SL_814, test x$HW_TONDAJ_SL_814 = xyes)
-if test "x$HW_TONDAJ_SL_814" = "xyes"; then
-	AC_DEFINE(HAVE_HW_TONDAJ_SL_814, 1, [Tondaj SL-814 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=$HW_ENABLED_DEFAULT])
-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(victor-dmm, AC_HELP_STRING([--enable-victor-dmm],
 	[enable victor-dmm support [default=yes]]),
 	[HW_VICTOR_DMM="$enableval"],
 	[HW_VICTOR_DMM=$HW_ENABLED_DEFAULT])
-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])
-fi
 
 AC_ARG_ENABLE(zeroplus-logic-cube,
 	AC_HELP_STRING([--enable-zeroplus-logic-cube],
 	[enable ZEROPLUS Logic Cube support [default=yes]]),
-	[LA_ZEROPLUS_LOGIC_CUBE="$enableval"],
-	[LA_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT])
-AM_CONDITIONAL(LA_ZEROPLUS_LOGIC_CUBE, test x$LA_ZEROPLUS_LOGIC_CUBE = xyes)
-if test "x$LA_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
-	AC_DEFINE(HAVE_LA_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
-fi
+	[HW_ZEROPLUS_LOGIC_CUBE="$enableval"],
+	[HW_ZEROPLUS_LOGIC_CUBE=$HW_ENABLED_DEFAULT])
 
 # Checks for libraries.
 
@@ -281,89 +212,214 @@ fi
 # libsigrok.pc file.
 SR_PKGLIBS=""
 
-# libglib-2.0 is always needed.
+# 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).
-AM_PATH_GLIB_2_0([2.28.0],
+# We require at least 2.32.0 due to e.g. g_variant_new_fixed_array().
+AM_PATH_GLIB_2_0([2.32.0],
 	[CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
-# libusb-1.0 is only needed for some hardware drivers.
-if test "x$LA_ASIX_SIGMA" != xno \
-   -o "x$LA_CHRONOVU_LA8" != xno \
-   -o "x$LA_FX2LAFW" != xno \
-   -o "x$HW_HANTEK_DSO" != xno \
-   -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno; then
-	case "$build" in
-	*freebsd*)
-		# FreeBSD comes with an "integrated" libusb-1.0-style USB API.
+# libzip is always needed. Abort if it's not found.
+PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
+	[CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
+	SR_PKGLIBS="$SR_PKGLIBS libzip"])
+
+# libusb-1.0 is only needed for some hardware drivers. Disable the respective
+# drivers if it is not found.
+case "$host" in
+*freebsd*)
+	# FreeBSD comes with an "integrated" libusb-1.0-style USB API.
+	# This means libusb-1.0 is always available, no need to check for it,
+	# and no need to (potentially) disable any drivers if it's not found.
+	AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
+		[Specifies whether we have a libusb.h header.])
+	;;
+*)
+	PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9],
+		[have_libusb1_0="yes"; CFLAGS="$CFLAGS $libusb_CFLAGS";
+		LIBS="$LIBS $libusb_LIBS";
+		SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"],
+		[have_libusb1_0="no"; HW_FX2LAFW="no"; HW_HANTEK_DSO="no";
+		HW_IKALOGIC_SCANALOGIC2="no"; HW_LASCAR_EL_USB="no";
+		HW_UNI_T_DMM="no"; HW_VICTOR_DMM="no";
+		HW_ZEROPLUS_LOGIC_CUBE="no"])
+
+	# Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
+	if test "x$have_libusb1_0" != "xno"; then
 		AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
 			[Specifies whether we have a libusb.h header.])
-		;;
-	*)
-		PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9],
-			[CFLAGS="$CFLAGS $libusb_CFLAGS";
-			LIBS="$LIBS $libusb_LIBS";
-			SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"])
-		# Define HAVE_LIBUSB_1_0 in config.h if we found libusb-1.0.
-		if test "x$libusb_CFLAGS" != "x"; then
-			AC_DEFINE_UNQUOTED(HAVE_LIBUSB_1_0, [1],
-				[Specifies whether we have a libusb.h header.])
-		fi
-		;;
-	esac
+	fi
+	;;
+esac
+
+# USB + FX2 firmware helper code is only compiled in if libusb-1.0 was found.
+AM_CONDITIONAL(NEED_USB, test "x$have_libusb1_0" != xno)
+
+# libftdi is only needed for some hardware drivers. Disable them if not found.
+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"])
+
+# libudev is only needed for some hardware drivers. Disable them if not found.
+PKG_CHECK_MODULES([libudev], [libudev >= 151],
+	[CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
+	SR_PKGLIBS="$SR_PKGLIBS libudev"],
+	[HW_LINK_MSO19="no"])
+
+# ALSA is only needed for some hardware drivers. Disable them if not found.
+PKG_CHECK_MODULES([alsa], [alsa >= 1.0],
+	[CFLAGS="$CFLAGS $alsa_CFLAGS"; LIBS="$LIBS $alsa_LIBS";
+	SR_PKGLIBS="$SR_PKGLIBS alsa"],
+	[HW_ALSA="no"])
+
+# The Check unit testing framework is optional. Disable if not found.
+PKG_CHECK_MODULES([check], [check >= 0.9.4],
+	[have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS";
+	LIBS="$LIBS $check_LIBS"], [have_check="no"])
+AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
+
+# The Rigol DS1xx2 driver currently uses the Linux kernel usbtmc module
+# (though it is planned to rewrite the driver to be portable later).
+# Thus, it will be disabled for non-Linux builds for now.
+case "$host" in
+*linux*)
+	# Do nothing. Whether the driver is enabled is determined by the
+	# previous --enable-all-drivers/--disable-all-drivers and/or any
+	# --enable-rigol-ds1xx2/--disable-rigol-ds1xx2 options.
+	;;
+*)
+	# Disable the driver for builds that don't target Linux.
+	HW_RIGOL_DS1XX2="no"
+	;;
+esac
+
+AC_SUBST(SR_PKGLIBS)
+
+# Now set AM_CONDITIONALs and AC_DEFINEs for the enabled/disabled drivers.
+
+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 support])
 fi
 
-# libzip is always needed.
-PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
-	[CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
-	SR_PKGLIBS="$SR_PKGLIBS libzip"])
+AM_CONDITIONAL(HW_ALSA, test x$HW_ALSA = xyes)
+if test "x$HW_ALSA" = "xyes"; then
+	AC_DEFINE(HAVE_HW_ALSA, 1, [ALSA driver support])
+fi
 
-# libftdi is only needed for some hardware drivers.
-if test "x$LA_ASIX_SIGMA" != xno \
-     -o "x$LA_CHRONOVU_LA8" != xno; then
-	PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
-		[CFLAGS="$CFLAGS $libftdi_CFLAGS";
-		LIBS="$LIBS $libftdi_LIBS";
-		SR_PKGLIBS="$SR_PKGLIBS libftdi"])
+AM_CONDITIONAL(HW_ASIX_SIGMA, test x$HW_ASIX_SIGMA = xyes)
+if test "x$HW_ASIX_SIGMA" = "xyes"; then
+	AC_DEFINE(HAVE_HW_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
 fi
 
-# libudev is only needed for some hardware drivers.
-if test "x$LA_LINK_MSO19" != xno; then
-	PKG_CHECK_MODULES([libudev], [libudev >= 151],
-		[CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
-		SR_PKGLIBS="$SR_PKGLIBS libudev"])
+AM_CONDITIONAL(HW_BRYMEN_DMM, test x$HW_BRYMEN_DMM = xyes)
+if test "x$HW_BRYMEN_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_BRYMEN_DMM, 1, [Brymen DMM support])
 fi
 
-# ALSA is only needed for some hardware drivers.
-if test "x$HW_ALSA" != xno; then
-	PKG_CHECK_MODULES([alsa], [alsa >= 1.0],
-		[CFLAGS="$CFLAGS $alsa_CFLAGS"; LIBS="$LIBS $alsa_LIBS";
-		SR_PKGLIBS="$SR_PKGLIBS alsa"])
+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
 
-# The Check unit testing framework is optional.
-PKG_CHECK_MODULES([check], [check >= 0.9.4],
-	[have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS";
-	LIBS="$LIBS $check_LIBS"], [have_check="no"])
-AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
+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])
+fi
 
-# 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 helper code is only needed for some hardware drivers.
-AM_CONDITIONAL(NEED_SERIAL, \
-	test "x$HW_AGILENT_DMM" != xno \
-	-o "x$HW_COLEAD_SLM" != xno \
-	-o "x$HW_FLUKE_DMM" != xno \
-	-o "x$LA_LINK_MSO19" != xno \
-	-o "x$LA_OLS" != xno \
-	-o "x$HW_SERIAL_DMM" != xno \
-	-o "x$HW_TONDAJ_SL_814" != xno \
-)
+AM_CONDITIONAL(HW_COLEAD_SLM, test x$HW_COLEAD_SLM = xyes)
+if test "x$HW_COLEAD_SLM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_COLEAD_SLM, 1, [Colead SLM support])
+fi
 
-AC_SUBST(SR_PKGLIBS)
+AM_CONDITIONAL(HW_DEMO, test x$HW_DEMO = xyes)
+if test "x$HW_DEMO" = "xyes"; then
+	AC_DEFINE(HAVE_HW_DEMO, 1, [Demo driver support])
+fi
+
+AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes)
+if test "x$HW_FLUKE_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [Fluke DMM support])
+fi
+
+AM_CONDITIONAL(HW_FX2LAFW, test x$HW_FX2LAFW = xyes)
+if test "x$HW_FX2LAFW" = "xyes"; then
+	AC_DEFINE(HAVE_HW_FX2LAFW, 1, [fx2lafw support])
+fi
+
+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
+
+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 Scanalogic2 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])
+fi
+
+AM_CONDITIONAL(HW_LINK_MSO19, test x$HW_LINK_MSO19 = xyes)
+if test "x$HW_LINK_MSO19" = "xyes"; then
+	AC_DEFINE(HAVE_HW_LINK_MSO19, 1, [Link Instruments MSO-19 support])
+fi
+
+AM_CONDITIONAL(HW_MIC_985XX, test x$HW_MIC_985XX = xyes)
+if test "x$HW_MIC_985XX" = "xyes"; then
+	AC_DEFINE(HAVE_HW_MIC_985XX, 1, [MIC 985xx 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])
+fi
+
+AM_CONDITIONAL(HW_RIGOL_DS1XX2, test x$HW_RIGOL_DS1XX2 = xyes)
+if test "x$HW_RIGOL_DS1XX2" = "xyes"; then
+	AC_DEFINE(HAVE_HW_RIGOL_DS1XX2, 1, [Rigol DS1xx2 support])
+fi
+
+AM_CONDITIONAL(HW_SERIAL_DMM, test x$HW_SERIAL_DMM = xyes)
+if test "x$HW_SERIAL_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_SERIAL_DMM, 1, [Serial DMM support])
+fi
+
+AM_CONDITIONAL(HW_TONDAJ_SL_814, test x$HW_TONDAJ_SL_814 = xyes)
+if test "x$HW_TONDAJ_SL_814" = "xyes"; then
+	AC_DEFINE(HAVE_HW_TONDAJ_SL_814, 1, [Tondaj SL-814 support])
+fi
+
+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
+
+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])
+fi
+
+AM_CONDITIONAL(HW_ZEROPLUS_LOGIC_CUBE, test x$HW_ZEROPLUS_LOGIC_CUBE = xyes)
+if test "x$HW_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
+	AC_DEFINE(HAVE_HW_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
+fi
 
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
@@ -403,12 +459,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
@@ -438,12 +497,14 @@ echo
 echo "  - Package version (major.minor.micro):    $SR_PACKAGE_VERSION"
 echo "  - Library version (current:revision:age): $SR_LIB_VERSION"
 echo "  - Prefix: $prefix"
+echo "  - Building on: $build"
+echo "  - Building for: $host"
 echo
 echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa" "check"; do
+for lib in "glib-2.0 >= 2.32.0" "libzip >= 0.8" "libusb-1.0 >= 1.0.9" "libftdi >= 0.16" "libudev >= 151" "alsa >= 1.0" "check >= 0.9.4"; do
 	if `$PKG_CONFIG --exists $lib`; then
 		ver=`$PKG_CONFIG --modversion $lib`
 		answer="yes ($ver)"
@@ -454,26 +515,29 @@ for lib in "glib-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa" "check";
 done
 
 echo -e "\nEnabled hardware drivers:\n"
-echo "  - Agilent DMM..................... $HW_AGILENT_DMM"
-echo "  - ALSA............................ $HW_ALSA"
-echo "  - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
-echo "  - Brymen DMM...................... $HW_BRYMEN_DMM"
-echo "  - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
-echo "  - Colead SLM...................... $HW_COLEAD_SLM"
-echo "  - Demo driver..................... $LA_DEMO"
-echo "  - Fluke DMM....................... $HW_FLUKE_DMM"
-echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
-echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
-echo "  - Lascar EL-USB................... $HW_LASCAR_EL_USB"
-echo "  - Link MSO-19..................... $LA_LINK_MSO19"
-echo "  - MIC 985xx....................... $HW_MIC_985XX"
-echo "  - Nexus Osciprime................. $HW_NEXUS_OSCIPRIME"
-echo "  - Openbench Logic Sniffer......... $LA_OLS"
-echo "  - Rigol DS1xx2.................... $HW_RIGOL_DS1XX2"
-echo "  - Serial DMM...................... $HW_SERIAL_DMM"
-echo "  - Tondaj SL-814................... $HW_TONDAJ_SL_814"
-echo "  - UNI-T DMM....................... $HW_UNI_T_DMM"
-echo "  - Victor DMM...................... $HW_VICTOR_DMM"
-echo "  - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"
+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 "  - mic-985xx....................... $HW_MIC_985XX"
+echo "  - openbench-logic-sniffer......... $HW_OLS"
+echo "  - rigol-ds1xx2.................... $HW_RIGOL_DS1XX2"
+echo "  - serial-dmm...................... $HW_SERIAL_DMM"
+echo "  - tondaj-sl-814................... $HW_TONDAJ_SL_814"
+echo "  - uni-t-dmm....................... $HW_UNI_T_DMM"
+echo "  - victor-dmm...................... $HW_VICTOR_DMM"
+echo "  - zeroplus-logic-cube............. $HW_ZEROPLUS_LOGIC_CUBE"
 echo