From fc0c74f642f48374e730aa800965cda505717e7d Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Tue, 16 Oct 2012 19:39:18 -0500
Subject: [PATCH] Fix build on Ruby 1.9.x without pkgconfig file Thanks to
 Slavek Banko.

---
 configure.in              | 9 +++++++--
 lib/kross/configure.in.in | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 41021b3be..710f9b1b2 100644
--- a/configure.in
+++ b/configure.in
@@ -1548,9 +1548,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
@@ -1561,6 +1564,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
diff --git a/lib/kross/configure.in.in b/lib/kross/configure.in.in
index 16530c7cc..496b399b4 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