diff options
| author | Slávek Banko <[email protected]> | 2015-12-08 21:09:05 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2015-12-08 21:09:22 +0100 |
| commit | 7396c009933d5e3d40e449442719194641798210 (patch) | |
| tree | 6045a63514bac94b2859c6c0e08743edf0d7f7b3 | |
| parent | 32c704dca05b08a60aa616b2386e4b0da07e9922 (diff) | |
| download | amarok-7396c009933d5e3d40e449442719194641798210.tar.gz amarok-7396c009933d5e3d40e449442719194641798210.zip | |
Add ruby 2.2 detectionr14.0.3
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 26e29db0fcc716e756e58b032af76ecb3a1edfc5)
| -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 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 |