summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-05-21 15:08:03 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-05-21 15:08:03 +0900
commit6be520b7bf5f64d4dd2b766543b1eff3f2eaf897 (patch)
tree235bc3e60d736ae415fb5a6f532a4c3127735cbe
parent767de3fe9dd7c99f9599b2caceda151e1f054c61 (diff)
downloadamarok-6be520b7bf5f64d4dd2b766543b1eff3f2eaf897.tar.gz
amarok-6be520b7bf5f64d4dd2b766543b1eff3f2eaf897.zip
Fixed FTBFS caused by ruby 2.1 (Debian/testing).
-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 cce76902..30c9ea25 100644
--- a/amarok/configure.in.in
+++ b/amarok/configure.in.in
@@ -1132,6 +1132,12 @@ if test -n "$PKG_CONFIG"; then
fi
fi
if test -z "$RUBY_VERSION"; then
+ RUBY_VERSION=`$PKG_CONFIG ruby-2.1 --modversion 2>/dev/null`
+ if test -n "$RUBY_VERSION"; then
+ RUBY_CFLAGS=`$PKG_CONFIG ruby-2.1 --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