summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-12-08 21:09:05 +0100
committerSlávek Banko <slavek.banko@axis.cz>2015-12-08 21:09:05 +0100
commit26e29db0fcc716e756e58b032af76ecb3a1edfc5 (patch)
treeb4760391f247beebc66ddaadd61d7244b64e95b5
parentae29f50ac6c1edd872b824bbd1fe1e202ef57fa9 (diff)
downloadamarok-26e29db0fcc716e756e58b032af76ecb3a1edfc5.tar.gz
amarok-26e29db0fcc716e756e58b032af76ecb3a1edfc5.zip
Add ruby 2.2 detection
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--amarok/configure.in.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/amarok/configure.in.in b/amarok/configure.in.in
index 30c9ea25..6c5252f9 100644
--- a/amarok/configure.in.in
+++ b/amarok/configure.in.in
@@ -1138,6 +1138,12 @@ if test -n "$PKG_CONFIG"; then
fi
fi
if test -z "$RUBY_VERSION"; then
+ RUBY_VERSION=`$PKG_CONFIG ruby-2.2 --modversion 2>/dev/null`
+ if test -n "$RUBY_VERSION"; then
+ RUBY_CFLAGS=`$PKG_CONFIG 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