diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2016-01-01 20:04:33 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2016-01-01 20:04:53 +0100 |
| commit | 8099312e2d683020df2aa616091b8de4daf53b57 (patch) | |
| tree | 10708bd8d9dc53f15dbbd69fab765c2c44393a48 /lib/kross | |
| parent | 57e53d059a7a634b21e4a5f5fea7f16809b97f85 (diff) | |
| download | koffice-8099312e2d683020df2aa616091b8de4daf53b57.tar.gz koffice-8099312e2d683020df2aa616091b8de4daf53b57.zip | |
Add ruby 2.2 detection
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4eabb309b98fd80e91542d3149375e374412b623)
Diffstat (limited to 'lib/kross')
| -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 19c438ec..a1aba27c 100644 --- a/lib/kross/configure.in.in +++ b/lib/kross/configure.in.in @@ -36,6 +36,12 @@ if test "x$compile_kross" = "xyes" ; then RUBY_CFLAGS=`$PKGCONFIG ruby --cflags` fi if test -z "$RUBY_VERSION"; then + RUBY_VERSION=`$PKGCONFIG ruby-2.2 --modversion 2>/dev/null` + if test -n "$RUBY_VERSION"; then + RUBY_CFLAGS=`$PKGCONFIG ruby-2.2 --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` |