summaryrefslogtreecommitdiffstats
path: root/qtruby
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-12-08 00:38:55 +0100
committerSlávek Banko <slavek.banko@axis.cz>2015-12-08 00:39:27 +0100
commit55c28e116058c3e26f0ab44ce254a8ab1ad1f6a8 (patch)
tree96096df45aca2263c5cf27c70af936315018a15c /qtruby
parent1b41f605e68f32309ffe39edabe4e905deb04055 (diff)
downloadtdebindings-55c28e116058c3e26f0ab44ce254a8ab1ad1f6a8.tar.gz
tdebindings-55c28e116058c3e26f0ab44ce254a8ab1ad1f6a8.zip
Add ruby 2.2 detection
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 4ea148f9e2fe50ac2aaa9971ea19fb2435244f60)
Diffstat (limited to 'qtruby')
-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 a381e839..f17f03b3 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -33,6 +33,12 @@ else
fi
fi
if test -z "$RUBY_VERSION"; then
+ RUBY_VERSION=`$PKGCONFIG ruby-2.2 --modversion 2>/dev/null`
+ if test -n "$RUBY_VERSION"; then
+ RUBY_CFLAGS=`$PKGCONFIG ruby-2.2 --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