From 77fd95d66ad14011626d9839a88f9264a3d73114 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 21 May 2014 00:51:21 +0900 Subject: Fixed FTBFS caused by ruby 2.1 (Debian/testing). --- qtruby/rubylib/qtruby/configure.in.in | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'qtruby') diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in index 5503328f..a381e839 100644 --- a/qtruby/rubylib/qtruby/configure.in.in +++ b/qtruby/rubylib/qtruby/configure.in.in @@ -26,6 +26,12 @@ else 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 # 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