Branch: master

6be520b7 2014-05-21 01:08:03 Michele Calgaro
Fixed FTBFS caused by ruby 2.1 (Debian/testing).
M amarok/configure.in.in
diff --git a/amarok/configure.in.in b/amarok/configure.in.in
index cce7690..30c9ea2 100644
--- a/amarok/configure.in.in
+++ b/amarok/configure.in.in
@@ -1132,6 +1132,12 @@
     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