X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=9c0e7ec6a3e802a5f2fdba39681d846c3f5c58a6;hb=58c5f2ed1785ead87d1398c28b5dbe60ba4610dd;hp=7eca9cf7f613dd295d32b3cb9156a8885da23758;hpb=8a22e8c0ff4e43ceae154c908c75a3e06bf26cc6;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 7eca9cf7..9c0e7ec6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,6 @@ AH_BOTTOM([#endif /* SR_CONFIG_H */])
 CFLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden"
 
 # Checks for programs.
-AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -109,6 +108,15 @@ if test "x$LA_ASIX_SIGMA" = "xyes"; then
 	AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
 fi
 
+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
+
 AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
 	[enable ChronoVu LA8 support [default=yes]]),
 	[LA_CHRONOVU_LA8="$enableval"],
@@ -181,6 +189,15 @@ if test "x$LA_LINK_MSO19" = "xyes"; then
 	AC_DEFINE(HAVE_LA_LINK_MSO19, 1, [Link Instruments MSO-19 support])
 fi
 
+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"],
@@ -266,11 +283,6 @@ SR_PKGLIBS=""
 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).
-PKG_CHECK_MODULES([gthread], [gthread-2.0 >= 2.22.0],
-	[CFLAGS="$CFLAGS $gthread_CFLAGS"; LIBS="$LIBS $gthread_LIBS";
-	SR_PKGLIBS="$SR_PKGLIBS gthread-2.0"])
-
 # libusb-1.0 is only needed for some hardware drivers.
 if test "x$LA_ASIX_SIGMA" != xno \
    -o "x$LA_CHRONOVU_LA8" != xno \
@@ -381,10 +393,12 @@ AC_CONFIG_FILES([Makefile version.h hardware/Makefile
 		 hardware/agilent-dmm/Makefile
 		 hardware/alsa/Makefile
 		 hardware/asix-sigma/Makefile
+		 hardware/brymen-dmm/Makefile
 		 hardware/chronovu-la8/Makefile
 		 hardware/colead-slm/Makefile
 		 hardware/common/Makefile
 		 hardware/lascar-el-usb/Makefile
+		 hardware/mic-985xx/Makefile
 		 hardware/nexus-osciprime/Makefile
 		 hardware/rigol-ds1xx2/Makefile
 		 hardware/tondaj-sl-814/Makefile
@@ -419,7 +433,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0" "gthread-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa"; do
+for lib in "glib-2.0" "libusb-1.0" "libzip" "libftdi" "libudev" "alsa"; do
 	if `$PKG_CONFIG --exists $lib`; then
 		ver=`$PKG_CONFIG --modversion $lib`
 		answer="yes ($ver)"
@@ -433,6 +447,7 @@ 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"
@@ -441,6 +456,7 @@ 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"