Branch: master

767de3fe 2014-04-18 01:37:25 Michele Calgaro
Fixed FTBFS caused by switch to ruby2.0. This resolves bug 2031.
M amarok/configure.in.in
diff --git a/amarok/configure.in.in b/amarok/configure.in.in
index 1e097e7..cce7690 100644
--- a/amarok/configure.in.in
+++ b/amarok/configure.in.in
@@ -1126,6 +1126,12 @@
     fi
   fi
   if test -z "$RUBY_VERSION"; then
+    RUBY_VERSION=`$PKG_CONFIG ruby-2.0 --modversion 2>/dev/null`
+    if test -n "$RUBY_VERSION"; then
+      RUBY_CFLAGS=`$PKG_CONFIG ruby-2.0 --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