summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-01-01 20:04:33 +0100
committerSlávek Banko <slavek.banko@axis.cz>2016-01-01 20:04:33 +0100
commit4eabb309b98fd80e91542d3149375e374412b623 (patch)
tree5fc04b5bb770835cc9438f989da077265be243f6
parenta23594f5c72d9aab24c3d2ef6fe4d995352986cf (diff)
downloadkoffice-4eabb309b98fd80e91542d3149375e374412b623.tar.gz
koffice-4eabb309b98fd80e91542d3149375e374412b623.zip
Add ruby 2.2 detection
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--lib/kross/configure.in.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/kross/configure.in.in b/lib/kross/configure.in.in
index 19c438ec..a1aba27c 100644
--- a/lib/kross/configure.in.in
+++ b/lib/kross/configure.in.in
@@ -36,6 +36,12 @@ if test "x$compile_kross" = "xyes" ; then
RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
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
RUBY_VERSION=`$PKGCONFIG ruby-2.1 --modversion 2>/dev/null`
if test -n "$RUBY_VERSION"; then
RUBY_CFLAGS=`$PKGCONFIG ruby-2.1 --cflags`