diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2013-08-25 18:18:39 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-08-25 18:18:39 +0200 |
| commit | 7d099fe425cef8ec6732da96b54c35fb460f3df0 (patch) | |
| tree | 6292bafdac27950440ce0217de5c241841062b86 | |
| parent | dee1a982f6c686fa8d391341caa59a0030f447bf (diff) | |
| download | koffice-7d099fe425cef8ec6732da96b54c35fb460f3df0.tar.gz koffice-7d099fe425cef8ec6732da96b54c35fb460f3df0.zip | |
Fix ruby 2.0 detection
| -rw-r--r-- | lib/kross/configure.in.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/kross/configure.in.in b/lib/kross/configure.in.in index 9bdca433..918588a2 100644 --- a/lib/kross/configure.in.in +++ b/lib/kross/configure.in.in @@ -42,6 +42,12 @@ if test "x$compile_kross" = "xyes" ; then 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 # 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 # rubyhdrdir parameter works only in >=1.9.1; this is 1.9.1 |