X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=6cc15bf775518affedce85b15107502739f56b7d;hb=0f017b7da90c4379580bf74716dacf0b0f60e292;hp=3ab83af9fba43fa0f5fb6b95063da4561297f003;hpb=aa29b255f8f507e6d842ab0c54f23d8adcd65bc1;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 3ab83af9..6cc15bf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,12 +136,16 @@ SR_ARG_OPT_CHECK([libieee1284], [LIBIEEE1284],, [
 AS_IF([test "x$sr_have_libieee1284" = xyes],
 	[SR_PREPEND([SR_EXTRA_LIBS], [-lieee1284])])
 
+SR_ARG_OPT_PKG([libgio], [LIBGIO], , [gio-2.0 >= 2.24.0])
+
 # See if any of the (potentially platform specific) libs are available
 # which provide some means of Bluetooth communication.
 AS_IF([test "x$sr_have_libbluez" = xyes],
 	sr_have_bluetooth=yes, sr_have_bluetooth=no)
 AS_IF([test "x$sr_have_bluetooth" = xyes],
 	[AC_DEFINE([HAVE_BLUETOOTH], [1], [Specifies whether Bluetooth communication is supported.])])
+AS_IF([test "x$sr_have_bluetooth" = xyes],
+	[SR_APPEND([sr_deps_avail], [bluetooth_comm])])
 
 AS_IF([test "x$sr_have_libserialport" = xyes -o "x$sr_have_libhidapi" = xyes -o "x$sr_have_bluetooth" = xyes],
 	sr_have_serial_comm=yes, sr_have_serial_comm=no)
@@ -287,9 +291,11 @@ SR_DRIVER([Lascar EL-USB], [lascar-el-usb], [libusb])
 SR_DRIVER([LeCroy LogicStudio], [lecroy-logicstudio], [libusb])
 SR_DRIVER([LeCroy X-Stream], [lecroy-xstream])
 SR_DRIVER([Manson HCS-3xxx], [manson-hcs-3xxx], [serial_comm])
+SR_DRIVER([Mastech MS6514], [mastech-ms6514], [serial_comm])
 SR_DRIVER([maynuo-m97], [maynuo-m97])
 SR_DRIVER([MIC 985xx], [mic-985xx], [serial_comm])
 SR_DRIVER([Microchip PICkit2], [microchip-pickit2], [libusb])
+SR_DRIVER([Mooshimeter DMM], [mooshimeter-dmm], [bluetooth_comm libgio])
 SR_DRIVER([Motech LPS 30x], [motech-lps-30x], [serial_comm])
 SR_DRIVER([Norma DMM], [norma-dmm], [serial_comm])
 SR_DRIVER([OpenBench Logic Sniffer], [openbench-logic-sniffer], [serial_comm])
@@ -336,8 +342,8 @@ AC_ARG_ENABLE([python],
 	[], [enable_python=$enable_bindings])
 
 AC_ARG_ENABLE([ruby],
-	[AS_HELP_STRING([--enable-ruby], [build Ruby bindings [default=yes]])],
-	[], [enable_ruby=$enable_bindings])
+	[AS_HELP_STRING([--enable-ruby], [build Ruby bindings [default=no]])],
+	[], [enable_ruby=no])
 
 AC_ARG_ENABLE([java],
 	[AS_HELP_STRING([--enable-java], [build Java bindings [default=yes]])],
@@ -438,7 +444,7 @@ AS_IF([test "x$HAVE_PYMOD_NUMPY" != xyes],
 	[SR_APPEND([sr_python_missing], [', '], [numpy])])
 
 # The Python bindings use SWIG to generate code.
-AC_CHECK_PROGS([SWIG], [swig swig3.0 swig2.0])
+AC_CHECK_PROGS([SWIG], [swig swig4.0 swig3.0 swig2.0])
 AS_IF([test "x$SWIG" != x],
     AC_MSG_CHECKING([for $SWIG version])
     [SWIG_VERSION=`$SWIG -version 2>&1 | sed -n 's/SWIG Version //p'`]