summaryrefslogtreecommitdiffstats
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:38:55 +0100
commit4ea148f9e2fe50ac2aaa9971ea19fb2435244f60 (patch)
tree4b5aaf7246b64500fa15697e73e4b2c62fb82db5
parentf46bd0ca15c6b91df2e9622aab9a4b36c4c59fee (diff)
downloadtdebindings-4ea148f9.tar.gz
tdebindings-4ea148f9.zip
Add ruby 2.2 detection
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--korundum/rubylib/korundum/configure.in.in12
-rw-r--r--qtruby/rubylib/qtruby/configure.in.in6
2 files changed, 18 insertions, 0 deletions
diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
index 29769f10..d2c4928c 100644
--- a/korundum/rubylib/korundum/configure.in.in
+++ b/korundum/rubylib/korundum/configure.in.in
@@ -27,6 +27,18 @@ 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
+ 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
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