diff options
| author | Slávek Banko <[email protected]> | 2017-05-29 16:08:13 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2017-05-29 16:08:25 +0200 |
| commit | f6e79a3209983be996c1a16c28b7971429b5ac9b (patch) | |
| tree | 3c658699bc3a59a8176cbbd39290a0846f329b3d | |
| parent | 2cc4322570085ab294a68de9d18769699f4dbad0 (diff) | |
| download | amarok-f6e79a3209983be996c1a16c28b7971429b5ac9b.tar.gz amarok-f6e79a3209983be996c1a16c28b7971429b5ac9b.zip | |
Add ruby 2.3 detection
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 97556e4496c7453ce7e868a7081a59dca56c2e1e)
| -rw-r--r-- | amarok/configure.in.in | 29 |
1 files 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 |