diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-16 19:39:18 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-16 19:39:18 -0500 |
| commit | fc0c74f642f48374e730aa800965cda505717e7d (patch) | |
| tree | f6367acc8e60360d07d9216218bbec7f58675280 /lib/kross | |
| parent | e159235799062207ebc20322fe4b1c80a08c90b1 (diff) | |
| download | koffice-fc0c74f642f48374e730aa800965cda505717e7d.tar.gz koffice-fc0c74f642f48374e730aa800965cda505717e7d.zip | |
Fix build on Ruby 1.9.x without pkgconfig file
Thanks to Slavek Banko.
Diffstat (limited to 'lib/kross')
| -rw-r--r-- | lib/kross/configure.in.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/kross/configure.in.in b/lib/kross/configure.in.in index 16530c7c..496b399b 100644 --- a/lib/kross/configure.in.in +++ b/lib/kross/configure.in.in @@ -34,9 +34,12 @@ if test "x$compile_kross" = "xyes" ; then 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 @@ -47,6 +50,8 @@ if test "x$compile_kross" = "xyes" ; then 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 |