diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-05-30 09:27:46 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-05-30 09:28:00 +0200 |
| commit | 540a8da1460e44cfd6ce73cfe9d8c4d76392d6ab (patch) | |
| tree | 76ea5b2c4868fb4fa0eeb8e8188ea1b5d5b54261 /lib | |
| parent | 89dff289d1a060affed61a4d93859e2ad3362b1c (diff) | |
| download | koffice-540a8da1460e44cfd6ce73cfe9d8c4d76392d6ab.tar.gz koffice-540a8da1460e44cfd6ce73cfe9d8c4d76392d6ab.zip | |
Add ruby 2.3 detection
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 91809c36a1048802fc9073b9237b4d54ed5e1f24)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kross/configure.in.in | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/lib/kross/configure.in.in b/lib/kross/configure.in.in index a1aba27c..f12c24c7 100644 --- a/lib/kross/configure.in.in +++ b/lib/kross/configure.in.in @@ -36,28 +36,13 @@ if test "x$compile_kross" = "xyes" ; then RUBY_CFLAGS=`$PKGCONFIG ruby --cflags` 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 - 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.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-1.9 --modversion 2>/dev/null` - if test -n "$RUBY_VERSION"; then - RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --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 |