Branch: r14.0.x

f6e79a32 2017-05-29 09:08:25 Slávek Banko
Add ruby 2.3 detection

Signed-off-by: Slávek Banko <slavek.banko@...>
(cherry picked from commit 97556e4496c7453ce7e868a7081a59dca56c2e1e)
M amarok/configure.in.in
diff --git a/amarok/configure.in.in b/amarok/configure.in.in
index 6c5252f..9db9379 100644
--- a/amarok/configure.in.in
+++ b/amarok/configure.in.in
@@ -1120,28 +1120,13 @@
     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