Branch: master

77fd95d6 2014-05-20 10:51:21 Michele Calgaro
Fixed FTBFS caused by ruby 2.1 (Debian/testing).
M qtruby/rubylib/qtruby/configure.in.in
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
index 5503328..a381e83 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -27,6 +27,12 @@
       fi
     fi
     if test -z "$RUBY_VERSION"; then
+      RUBY_VERSION=`$PKGCONFIG ruby-2.1 --modversion 2>/dev/null`
+      if test -n "$RUBY_VERSION"; then
+        RUBY_CFLAGS=`$PKGCONFIG ruby-2.1 --cflags`
+      fi
+    fi
+    if test -z "$RUBY_VERSION"; then
       # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
       if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then
         # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1