X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=4216e4f6282364ea25b57ba24444d974fc0c0ed0;hb=ebc51109899008694c50977cb2574050b1bc0c89;hp=6b2d36af45b57f5ae9d583b60b6c1a3ee48bbe46;hpb=23669c3df33a3ea884afabf4b7a8cd6fe4a75824;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 6b2d36af..4216e4f6 100644 --- a/configure.ac +++ b/configure.ac @@ -291,7 +291,7 @@ 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]) +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]) @@ -317,6 +317,7 @@ SR_DRIVER([Teleinfo], [teleinfo], [serial_comm]) SR_DRIVER([Testo], [testo], [libusb]) SR_DRIVER([Tondaj SL-814], [tondaj-sl-814], [serial_comm]) SR_DRIVER([UNI-T DMM], [uni-t-dmm], [libusb]) +SR_DRIVER([UNI-T UT181A], [uni-t-ut181a], [serial_comm]) SR_DRIVER([UNI-T UT32x], [uni-t-ut32x], [serial_comm]) SR_DRIVER([Yokogawa DL/DLM], [yokogawa-dlm]) SR_DRIVER([ZEROPLUS Logic Cube], [zeroplus-logic-cube], [libusb]) @@ -342,8 +343,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]])], @@ -444,7 +445,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'`]