From f48a0fa2016d9fd32e50adb87c8f6557cf6081d8 Mon Sep 17 00:00:00 2001
From: John Ellson <ellson@research.att.com>
Date: Fri, 10 Feb 2012 16:07:17 -0500
Subject: [PATCH] fixing fc17 breakage caused by ruby update

---
 config/config_ruby.rb | 20 ++++++++++++--------
 configure.ac          |  6 +++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/config/config_ruby.rb b/config/config_ruby.rb
index 9211cdd43..4417b778c 100644
--- a/config/config_ruby.rb
+++ b/config/config_ruby.rb
@@ -4,13 +4,17 @@ CONFIG = Config::MAKEFILE_CONFIG
 
 
 case ARGV[0]
-when "INCLUDES"
-    puts Config::expand(CONFIG["archdir"])
-when "lib"
-    puts Config::expand(CONFIG["libdir"])
-when "archsitelib"
-    puts Config::expand(CONFIG["sitearchdir"])
-when "sitelib"
-    puts Config::expand(CONFIG["sitedir"])
+when "archdir"
+    puts Config::expand(Config::CONFIG["archdir"])
+when "sitearchdir"
+    puts Config::expand(Config::CONFIG["sitearchdir"])
+when "includedir"
+    puts Config::expand(Config::CONFIG["includedir"])
+when "libdir"
+    puts Config::expand(Config::CONFIG["libdir"])
+when "vendorarchdir"
+    puts Config::expand(Config::CONFIG["vendorarchdir"])
+when "sitedir"
+    puts Config::expand(Config::CONFIG["sitedir"])
 end
 
diff --git a/configure.ac b/configure.ac
index 4ceab1e6f..c57596dd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1545,13 +1545,13 @@ else
       if test "x$RUBY" = "x"; then
 	use_ruby="No (ruby not available)"
       else
-        RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`"
+        RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb archdir` -I`$RUBY $srcdir/config/config_ruby.rb sitearchdir`"
 	# hack for powerpc-darwin8 (10.4)
 	if test "x$DARWIN" = "xyes"; then
 	  RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'`
 	fi
-        RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
-        RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
+        RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb libdir` `$RUBY -rrbconfig -e \"puts Config::CONFIG[['LIBRUBYARG_SHARED']]\"`"
+        RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
         save_CPPFLAGS=$CPPFLAGS
         CPPFLAGS="$CPPFLAGS $RUBY_INCLUDES"
         AC_CHECK_HEADER(ruby.h,,[
-- 
2.40.0