summaryrefslogtreecommitdiffstats
path: root/korundum
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-05-30 09:26:17 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-05-30 09:26:29 +0200
commit42861b07b908d5cbb2a5141e83b65855f1446fa6 (patch)
tree205ccd5fded9ee5aefb266c68a7bdb57263d8e40 /korundum
parent8f6fe2f7b49cf194b665f1d51adabeef83969b06 (diff)
downloadtdebindings-42861b07b908d5cbb2a5141e83b65855f1446fa6.tar.gz
tdebindings-42861b07b908d5cbb2a5141e83b65855f1446fa6.zip
Add ruby 2.3 detection
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit cc25bc1502c32cebb7f6b7c76e43d89f8c42117d)
Diffstat (limited to 'korundum')
-rw-r--r--korundum/rubylib/korundum/configure.in.in29
1 files changed, 7 insertions, 22 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