summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-10-13 02:12:40 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-10-13 02:12:40 +0200
commit115acc3994ae810840706c2da7e3c6c0bb53ca5e (patch)
tree2382974198089eb1c1f48a094616b9ac3092c6bc
parent2712dc645eebfae5212030386010c5006b45a8eb (diff)
downloadtdebindings-115acc3994ae810840706c2da7e3c6c0bb53ca5e.tar.gz
tdebindings-115acc3994ae810840706c2da7e3c6c0bb53ca5e.zip
Fix build on Ruby 1.9.x without pkgconfig file
-rw-r--r--qtruby/rubylib/qtruby/configure.in.in9
1 files changed, 7 insertions, 2 deletions
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
index 767aecad..f8804038 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -12,9 +12,12 @@ else
RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
if test -n "$RUBY_VERSION"; then
RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
- else
+ fi
+ if test -z "$RUBY_VERSION"; then
RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
- RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
+ 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
@@ -25,6 +28,8 @@ else
RUBY_TEENY=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['TEENY']"@:>@)'`
if test "$RUBY_MAJOR" == "1" && test "$RUBY_MINOR" == "9"; then
RUBY_VERSION="$RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY"
+ RUBY_CFLAGS="-I`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'`"
+ RUBY_CFLAGS="$RUBY_CFLAGS/`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"arch"@:>@)'` $RUBY_CFLAGS"
fi
fi
fi