X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=008dd4cc748346890cc76bc7457c2014661cd395;hb=503220ec8d00a8a351a2c1bc659d42132a40f64a;hp=c5089f1db4ee3132f59f6ca2bcf2e5ffd0e5b181;hpb=5d8b3913d4dc450b8af0ad028a379be775e278ef;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index c5089f1d..008dd4cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,6 +94,7 @@ SR_PKGLIBS_CXX=
 SR_PKGLIBS_PYTHON=
 SR_PKGLIBS_RUBY=
 SR_EXTRA_LIBS=
+SR_EXTRA_CXX_LIBS=
 
 SR_ARG_OPT_PKG([libserialport], [LIBSERIALPORT], [NEED_SERIAL],
 	[libserialport >= 0.1.1])
@@ -211,7 +212,7 @@ m4_define([_SR_DRIVER], [
 	sr_driver_summary_append "$2" "$sr_hw_info"
 
 	AM_CONDITIONAL([$3], [test "x[$]$3" = xyes])
-	AM_COND_IF([$3], [AC_DEFINE([HAVE_$3], [1], [Whether to support $1 device.])])
+	AM_COND_IF([$3], [AC_DEFINE([HAVE_$3], [1], [Whether to support $1 device.]) AC_DEFINE([HAVE_DRIVERS], [1], [Whether at least one driver is enabled.])])
 ])
 
 ## SR_DRIVER(Device name, driver-name, [dependencies...])
@@ -232,7 +233,6 @@ SR_DRIVER([Center 3xx], [center-3xx], [libserialport])
 SR_DRIVER([ChronoVu LA], [chronovu-la], [libusb libftdi])
 SR_DRIVER([Colead SLM], [colead-slm], [libserialport])
 SR_DRIVER([Conrad DIGI 35 CPU], [conrad-digi-35-cpu], [libserialport])
-SR_DRIVER([DER EE DE-5000], [deree-de5000], [libserialport])
 SR_DRIVER([demo], [demo])
 SR_DRIVER([Fluke DMM], [fluke-dmm], [libserialport])
 SR_DRIVER([FTDI LA], [ftdi-la], [libusb libftdi])
@@ -263,6 +263,7 @@ SR_DRIVER([Rigol DS], [rigol-ds])
 SR_DRIVER([Saleae Logic16], [saleae-logic16], [libusb])
 SR_DRIVER([SCPI PPS], [scpi-pps])
 SR_DRIVER([serial DMM], [serial-dmm], [libserialport])
+SR_DRIVER([serial LCR], [serial-lcr], [libserialport])
 SR_DRIVER([Sysclk LWLA], [sysclk-lwla], [libusb])
 SR_DRIVER([Teleinfo], [teleinfo], [libserialport])
 SR_DRIVER([Testo], [testo], [libusb])
@@ -321,6 +322,9 @@ AC_CHECK_PROG([HAVE_DOXYGEN], [doxygen], [yes], [no])
 AS_IF([test "x$HAVE_DOXYGEN" != xyes],
 	[SR_APPEND([sr_cxx_missing], [', '], [Doxygen])])
 
+# Link C++ code with gnustl_shared if it exists (Android)
+SR_SEARCH_LIBS([SR_EXTRA_CXX_LIBS], [__cxa_throw], [gnustl_shared])
+
 # Python is needed for the C++ bindings.
 AM_PATH_PYTHON([2.7],
 	[HAVE_PYTHON=yes],