summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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