From cc25bc1502c32cebb7f6b7c76e43d89f8c42117d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 30 May 2017 09:26:17 +0200 Subject: 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 --- korundum/rubylib/korundum/configure.in.in | 29 +++++++---------------------- qtruby/rubylib/qtruby/configure.in.in | 29 +++++++---------------------- 2 files changed, 14 insertions(+), 44 deletions(-) diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in index d2c4928c..c1c2ce4c 100644 --- a/korundum/rubylib/korundum/configure.in.in +++ b/korundum/rubylib/korundum/configure.in.in @@ -15,28 +15,13 @@ else RUBY_CFLAGS=`$PKGCONFIG ruby --cflags` fi if test -z "$RUBY_VERSION"; then - RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null` - if test -n "$RUBY_VERSION"; then - RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags` - fi - fi - if test -z "$RUBY_VERSION"; then - RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null` - if test -n "$RUBY_VERSION"; then - RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags` - fi - fi - if test -z "$RUBY_VERSION"; then - RUBY_VERSION=`$PKGCONFIG ruby-2.1 --modversion 2>/dev/null` - if test -n "$RUBY_VERSION"; then - RUBY_CFLAGS=`$PKGCONFIG ruby-2.1 --cflags` - fi - fi - if test -z "$RUBY_VERSION"; then - RUBY_VERSION=`$PKGCONFIG ruby-2.2 --modversion 2>/dev/null` - if test -n "$RUBY_VERSION"; then - RUBY_CFLAGS=`$PKGCONFIG 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 diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in index f17f03b3..e0147c14 100644 --- a/qtruby/rubylib/qtruby/configure.in.in +++ b/qtruby/rubylib/qtruby/configure.in.in @@ -15,28 +15,13 @@ else RUBY_CFLAGS=`$PKGCONFIG ruby --cflags` fi if test -z "$RUBY_VERSION"; then - RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null` - if test -n "$RUBY_VERSION"; then - RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags` - fi - fi - if test -z "$RUBY_VERSION"; then - RUBY_VERSION=`$PKGCONFIG ruby-2.0 --modversion 2>/dev/null` - if test -n "$RUBY_VERSION"; then - RUBY_CFLAGS=`$PKGCONFIG ruby-2.0 --cflags` - fi - fi - if test -z "$RUBY_VERSION"; then - RUBY_VERSION=`$PKGCONFIG ruby-2.1 --modversion 2>/dev/null` - if test -n "$RUBY_VERSION"; then - RUBY_CFLAGS=`$PKGCONFIG ruby-2.1 --cflags` - fi - fi - if test -z "$RUBY_VERSION"; then - RUBY_VERSION=`$PKGCONFIG ruby-2.2 --modversion 2>/dev/null` - if test -n "$RUBY_VERSION"; then - RUBY_CFLAGS=`$PKGCONFIG 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 -- cgit v1.2.3