Fix ruby 2.0 detection

pull/1/head
Francois Andriot 11 years ago committed by Slávek Banko
parent dcb2a2fbc7
commit 2cf2b76cae

@ -20,6 +20,12 @@ else
RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags` RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
fi fi
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 if test -z "$RUBY_VERSION"; then
# pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h # 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 if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then

@ -20,6 +20,12 @@ else
RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags` RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
fi fi
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 if test -z "$RUBY_VERSION"; then
# pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h # 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 if test -n "$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'"; then

Loading…
Cancel
Save