diff options
| author | Michele Calgaro <[email protected]> | 2014-04-18 15:37:25 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2014-04-18 15:37:25 +0900 |
| commit | 767de3fe9dd7c99f9599b2caceda151e1f054c61 (patch) | |
| tree | 631fb88aa57b5a49c30839c75742f261bacf9067 | |
| parent | 97e75571db05ecee0bd74ced8ea3a54f4b198540 (diff) | |
| download | amarok-767de3fe9dd7c99f9599b2caceda151e1f054c61.tar.gz amarok-767de3fe9dd7c99f9599b2caceda151e1f054c61.zip | |
Fixed FTBFS caused by switch to ruby2.0. This resolves bug 2031.
| -rw-r--r-- | amarok/configure.in.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/amarok/configure.in.in b/amarok/configure.in.in index 1e097e78..cce76902 100644 --- a/amarok/configure.in.in +++ b/amarok/configure.in.in @@ -1126,6 +1126,12 @@ if test -n "$PKG_CONFIG"; then 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 |