summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-05-21 00:51:21 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-05-21 00:51:21 +0900
commit77fd95d66ad14011626d9839a88f9264a3d73114 (patch)
tree4c5050edce8140178717ed0f6eb08dc9281a8b16
parentc5f3a42ec60863f69b49c5775f9628d57f6719d5 (diff)
downloadtdebindings-77fd95d66ad14011626d9839a88f9264a3d73114.tar.gz
tdebindings-77fd95d66ad14011626d9839a88f9264a3d73114.zip
Fixed FTBFS caused by ruby 2.1 (Debian/testing).
-rw-r--r--qtruby/rubylib/qtruby/configure.in.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
index 5503328f..a381e839 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -27,6 +27,12 @@ else
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