From 97556e4496c7453ce7e868a7081a59dca56c2e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 29 May 2017 16:08:13 +0200 Subject: [PATCH] Add ruby 2.3 detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- amarok/configure.in.in | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/amarok/configure.in.in b/amarok/configure.in.in index 6c5252f9..9db93790 100644 --- a/amarok/configure.in.in +++ b/amarok/configure.in.in @@ -1120,28 +1120,13 @@ if test -n "$PKG_CONFIG"; then RUBY_CFLAGS=`$PKG_CONFIG ruby --cflags` fi if test -z "$RUBY_VERSION"; then - RUBY_VERSION=`$PKG_CONFIG ruby-1.9 --modversion 2>/dev/null` - if test -n "$RUBY_VERSION"; then - RUBY_CFLAGS=`$PKG_CONFIG ruby-1.9 --cflags` - 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 - 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 - 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 + for RUBY_TEST in 2.3 2.2 2.1 2.0 1.9; do + RUBY_VERSION=`$PKG_CONFIG ruby-$RUBY_TEST --modversion 2>/dev/null` + if test -n "$RUBY_VERSION"; then + RUBY_CFLAGS=`$PKG_CONFIG ruby-$RUBY_TEST --cflags` + break + fi + done 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