diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2013-08-25 15:51:40 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-08-25 15:51:40 +0200 |
| commit | 2cf2b76caeb70e288173579ad14942ae314cb0e3 (patch) | |
| tree | 247c25e31478cd69f2c7f468864be7b9ed3caa9d | |
| parent | dcb2a2fbc7235fff7757f1e7af661db9cdd21afd (diff) | |
| download | tdebindings-2cf2b76caeb70e288173579ad14942ae314cb0e3.tar.gz tdebindings-2cf2b76caeb70e288173579ad14942ae314cb0e3.zip | |
Fix ruby 2.0 detection
| -rw-r--r-- | korundum/rubylib/korundum/configure.in.in | 6 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/configure.in.in | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in index 4ab1532e..29769f10 100644 --- a/korundum/rubylib/korundum/configure.in.in +++ b/korundum/rubylib/korundum/configure.in.in @@ -21,6 +21,12 @@ else 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 diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in index 09795d6e..5503328f 100644 --- a/qtruby/rubylib/qtruby/configure.in.in +++ b/qtruby/rubylib/qtruby/configure.in.in @@ -21,6 +21,12 @@ else 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 |