X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=c60e403d4438e32fd89b31bae80d38b99723bca2;hb=10c4ca9c5bd9b2e917759e9fddc6f8655895b92c;hp=5e8ba9331f149988b713f63906d83b62e5fe4d9f;hpb=27d44cf6e0eaaa75979510596d6148193a8434c0;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 5e8ba933..c60e403d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -384,6 +384,10 @@ AS_IF([test "x$HAVE_PYMOD_NUMPY" != xyes],
 
 # The Python bindings use SWIG to generate code.
 AC_CHECK_PROGS([SWIG], [swig 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\s*//p'`]
+    AC_MSG_RESULT([$SWIG_VERSION]))
 AS_IF([test "x$SWIG" = x],
 	[SR_APPEND([sr_python_missing], [', '], [SWIG])])
 
@@ -399,10 +403,16 @@ AS_IF([test "x$BINDINGS_CXX" = xyes],
 	[sr_ruby_missing=],
 	[sr_ruby_missing='C++ bindings'])
 
-AX_RUBY_EXT
+AC_PATH_PROGS(RUBY, ["${RUBY-ruby}"], [])
+AS_IF([test "x$RUBY" != x],
+	AC_MSG_CHECKING([for Ruby version])
+    [RUBY_VERSION=`$RUBY -e 'puts RUBY_VERSION'`]
+    AC_MSG_RESULT([$RUBY_VERSION])
+    [RUBY_DLEXT=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG[["DLEXT"]]'`]
+    AC_SUBST(RUBY_DLEXT))
 
 AS_IF([test "x$RUBY" = x],
-	[SR_APPEND([sr_ruby_missing], [', '], ['Ruby'])])
+	[SR_APPEND([sr_ruby_missing], [', '], [Ruby])])
 
 # Extract major and minor version number of the Ruby interpreter.
 sr_rbmajor=${RUBY_VERSION%%.*}
@@ -417,14 +427,15 @@ SR_PKG_CHECK([ruby_dev], [SR_PKGLIBS_RUBY],
 AS_IF([test "x$sr_have_ruby_dev" != xyes],
 	[SR_APPEND([sr_ruby_missing], [', '], [Headers])])
 
-# The Ruby bindings use SWIG to generate code.
+# The Ruby bindings use SWIG >= 3.0.8 to generate code.
 AS_IF([test "x$SWIG" = x],
-	[SR_APPEND([sr_ruby_missing], [', '], [SWIG])])
+	[SR_APPEND([sr_ruby_missing], [', '], [SWIG])],
+	[AS_VERSION_COMPARE($SWIG_VERSION, "3.0.8",
+		[SR_APPEND([sr_ruby_missing], [', '], ['SWIG >= 3.0.8'])])])
 
 AS_IF([test -z "$sr_ruby_missing"],
 	[BINDINGS_RUBY=$enable_ruby], [BINDINGS_RUBY=no])
 AM_CONDITIONAL([BINDINGS_RUBY], [test "x$BINDINGS_RUBY" = xyes])
-# AC_SUBST(RUBY_EXT_DLEXT, $RUBY_EXT_DLEXT)
 
 ####################
 ##  Java bindings ##