X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=159cf1174306a60f13687e14b45db8539ffbdba3;hb=339d12df978b32c5f9a10dc14d4ab3a03a0ed5c0;hp=abd8d056affbb877583986e0a20aa475477ab786;hpb=8b607a24e7e7dec8b65963281b9cb43a0c5ba0a6;p=libsigrok.git diff --git a/configure.ac b/configure.ac index abd8d056..159cf117 100644 --- a/configure.ac +++ b/configure.ac @@ -107,6 +107,8 @@ SR_ARG_OPT_PKG([libhidapi], [LIBHIDAPI], , SR_ARG_OPT_PKG([libbluez], [LIBBLUEZ], , [bluez >= 4.0]) +SR_ARG_OPT_PKG([libnettle], [LIBNETTLE], , [nettle]) + # 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. # On Windows, require the latest version we can get our hands on, @@ -286,6 +288,7 @@ SR_DRIVER([Ikalogic Scanaplus], [ikalogic-scanaplus], [libftdi]) SR_DRIVER([IPDBG LA], [ipdbg-la]) SR_DRIVER([Kecheng KC-330B], [kecheng-kc-330b], [libusb]) SR_DRIVER([KERN scale], [kern-scale], [serial_comm]) +SR_DRIVER([Kingst LA2016], [kingst-la2016], [libusb]) SR_DRIVER([Korad KAxxxxP], [korad-kaxxxxp], [serial_comm]) SR_DRIVER([Lascar EL-USB], [lascar-el-usb], [libusb]) SR_DRIVER([LeCroy LogicStudio], [lecroy-logicstudio], [libusb]) @@ -303,6 +306,7 @@ SR_DRIVER([PCE PCE-322A], [pce-322a], [serial_comm]) SR_DRIVER([Pipistrello-OLS], [pipistrello-ols], [libftdi]) SR_DRIVER([RDTech DPSxxxx/DPHxxxx], [rdtech-dps], [serial_comm]) SR_DRIVER([RDTech UMXX], [rdtech-um], [serial_comm]) +SR_DRIVER([RDTech TCXX], [rdtech-tc], [serial_comm libnettle]) SR_DRIVER([Rigol DS], [rigol-ds]) SR_DRIVER([Rohde&Schwarz SME-0x], [rohde-schwarz-sme-0x], [serial_comm]) SR_DRIVER([Saleae Logic16], [saleae-logic16], [libusb]) @@ -344,8 +348,8 @@ AC_ARG_ENABLE([python], [], [enable_python=$enable_bindings]) AC_ARG_ENABLE([ruby], - [AS_HELP_STRING([--enable-ruby], [build Ruby bindings [default=no]])], - [], [enable_ruby=no]) + [AS_HELP_STRING([--enable-ruby], [build Ruby bindings [default=yes]])], + [], [enable_ruby=$enable_bindings]) AC_ARG_ENABLE([java], [AS_HELP_STRING([--enable-java], [build Java bindings [default=yes]])], @@ -484,8 +488,8 @@ sr_rbminor=${sr_rbminor%%.*} # The Ruby bindings need Ruby development files. SR_PKG_CHECK([ruby_dev], [SR_PKGLIBS_RUBY], - [ruby], - [ruby-$sr_rbmajor.$sr_rbminor]) + [ruby >= 2.5.0], + [ruby-$sr_rbmajor.$sr_rbminor >= 2.5.0]) AS_IF([test "x$sr_have_ruby_dev" != xyes], [SR_APPEND([sr_ruby_missing], [', '], [Headers])])