diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-06-10 01:26:56 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-06-10 01:26:56 +0200 |
| commit | aff9e4d3f628629b362bf0cc32fa20a3c6538c1c (patch) | |
| tree | a997c5dac3e0b1fa3deea644bbcb6e86e341076f /lib/kross | |
| parent | 4d70db855f263cf04265cbab54217f29a9b15145 (diff) | |
| download | koffice-aff9e4d3f628629b362bf0cc32fa20a3c6538c1c.tar.gz koffice-aff9e4d3f628629b362bf0cc32fa20a3c6538c1c.zip | |
Fix ruby 2.1 detection
Diffstat (limited to 'lib/kross')
| -rw-r--r-- | lib/kross/configure.in.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/kross/configure.in.in b/lib/kross/configure.in.in index 918588a2..19c438ec 100644 --- a/lib/kross/configure.in.in +++ b/lib/kross/configure.in.in @@ -36,9 +36,9 @@ if test "x$compile_kross" = "xyes" ; then RUBY_CFLAGS=`$PKGCONFIG ruby --cflags` fi if test -z "$RUBY_VERSION"; then - RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null` + RUBY_VERSION=`$PKGCONFIG ruby-2.1 --modversion 2>/dev/null` if test -n "$RUBY_VERSION"; then - RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags` + RUBY_CFLAGS=`$PKGCONFIG ruby-2.1 --cflags` fi fi if test -z "$RUBY_VERSION"; then @@ -48,6 +48,12 @@ if test "x$compile_kross" = "xyes" ; then 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 + 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 if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1 |