From 7396c009933d5e3d40e449442719194641798210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 8 Dec 2015 21:09:05 +0100 Subject: [PATCH] Add ruby 2.2 detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 26e29db0fcc716e756e58b032af76ecb3a1edfc5) --- amarok/configure.in.in | 6 ++++++ 1 file changed, 6 insertions(+) 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 @@ -1137,6 +1137,12 @@ if test -n "$PKG_CONFIG"; then RUBY_CFLAGS=`$PKG_CONFIG ruby-2.1 --cflags` 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