From aff9e4d3f628629b362bf0cc32fa20a3c6538c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 10 Jun 2014 01:26:56 +0200 Subject: Fix ruby 2.1 detection --- lib/kross/configure.in.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib/kross/configure.in.in') 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 @@ -47,6 +47,12 @@ if test "x$compile_kross" = "xyes" ; 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 + 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 -- cgit v1.2.1