summaryrefslogtreecommitdiffstats
path: root/redhat/tdebindings/kdebindings-3.5.13.1-fallback_to_ruby19_pc_file.patch
blob: 85c496d10873394fd025f875cad0429609937d7d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
commit 2f6e9c735fe8486ee3484c47c0e8ff999b699abc
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date:   1347987185 -0500

    Fall back to ruby-1.9 pkgconfig file if needed

diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/rubylib/korundum/configure.in.in
index e4ab2fd..924f42f 100644
--- a/korundum/rubylib/korundum/configure.in.in
+++ b/korundum/rubylib/korundum/configure.in.in
@@ -10,6 +10,9 @@ else
   AC_MSG_CHECKING(for ruby dirs)
   if test -n "$PKGCONFIG"; then
     RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
+    if test -z "$RUBY_VERSION"; then
+      RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
+    fi
     if test -n "$RUBY_VERSION"; then
       RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
       RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
index 7ad0e4d..e7f4f2c 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/rubylib/qtruby/configure.in.in
@@ -10,6 +10,9 @@ else
   AC_MSG_CHECKING(for ruby dirs)
   if test -n "$PKGCONFIG"; then
     RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
+    if test -z "$RUBY_VERSION"; then
+      RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
+    fi
     if test -n "$RUBY_VERSION"; then
       RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
       RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`