X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=a8cb4f7077c838e982d571ec4b057839b0bfd07c;hb=25879a34e925ce58e62a59382b9a287a75350564;hp=7d02b7437be7844f32346b0ec94b5e00aac86070;hpb=f2cd2debf9dcbf0e83ec70d8ea41d8421a400dfd;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 7d02b743..a8cb4f70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,15 +201,6 @@ AM_CONDITIONAL([NEED_RPC], [test "x$sr_cv_have_rpc" = xyes])
 # Check for compiler support of 128 bit integers
 AC_CHECK_TYPES([__int128_t, __uint128_t], [], [], [])
 
-# Availability of bt_put_le16() depends on the bluez library version.
-AC_CACHE_CHECK([for bt_put_le16], [sr_cv_have_btputle16],
-	[AC_LINK_IFELSE([AC_LANG_PROGRAM(
-			[[#include <bluetooth/bluetooth.h>]],
-			[[bt_put_le16(0, (void *)0);]])],
-		[sr_cv_have_btputle16=yes], [sr_cv_have_btputle16=no])])
-AS_IF([test "x$sr_cv_have_btputle16" = xyes],
-	[AC_DEFINE([HAVE_BT_PUT_LE16], [1], [Specifies whether we have bt_put_le16().])])
-
 ########################
 ##  Hardware drivers  ##
 ########################
@@ -348,8 +339,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]])],
@@ -488,8 +479,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])])