From 3a85bbcbcdbbb0968a806320e64b40c0fe3feb80 Mon Sep 17 00:00:00 2001
From: John Ellson <ellson@research.att.com>
Date: Fri, 10 Feb 2012 19:06:41 -0500
Subject: [PATCH] second try at fixing ruby-1.9 issues

---
 config/config_ruby.rb | 18 +++++++----------
 configure.ac          | 47 ++++++++++++++++++++++++++-----------------
 tclpkg/gv/Makefile.am |  2 +-
 3 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/config/config_ruby.rb b/config/config_ruby.rb
index 4417b778c..3be5974b8 100644
--- a/config/config_ruby.rb
+++ b/config/config_ruby.rb
@@ -5,16 +5,12 @@ CONFIG = Config::MAKEFILE_CONFIG
 
 case ARGV[0]
 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"])
+    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"])
 end
 
diff --git a/configure.ac b/configure.ac
index c57596dd7..5d71d72ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1541,28 +1541,37 @@ else
     if test `$SWIG -help 2>&1 | $EGREP -c '\-ruby *- Generate'` = 0; then
       use_ruby="No (swig does not support -ruby option)"
     else
-      AC_CHECK_PROG(RUBY,ruby,ruby)
-      if test "x$RUBY" = "x"; then
-	use_ruby="No (ruby not available)"
-      else
-        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/'`
+      PKG_CHECK_MODULES(RUBY, [ruby-1.9],[
+	AC_CHECK_PROG(RUBY,ruby,ruby)
+        if test "x$RUBY" = "x"; then
+          use_ruby="No (ruby not available)"
+        else
+          RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb archsitelib`"
 	fi
-        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,,[
-          use_ruby="No (missing header)"
-          RUBY=
-        ])
-        CPPFLAGS=$save_CPPFLAGS
-      fi
+      ],[
+        AC_CHECK_PROG(RUBY,ruby,ruby)
+        if test "x$RUBY" = "x"; then
+	  use_ruby="No (ruby not available)"
+        else
+          RUBY_CFLAGS="-I`$RUBY $srcdir/config/config_ruby.rb archdir`"
+	  # hack for powerpc-darwin8 (10.4)
+	  if test "x$DARWIN" = "xyes"; then
+	    RUBY_CFLAGS=`echo $RUBY_CFLAGS | 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`"
+          save_CPPFLAGS=$CPPFLAGS
+          CPPFLAGS="$CPPFLAGS $RUBY_CFLAGS"
+          AC_CHECK_HEADER(ruby.h,,[
+            use_ruby="No (missing header)"
+            RUBY=
+          ])
+          CPPFLAGS=$save_CPPFLAGS
+        fi
+      ])
       if test "x$RUBY" != "x"; then
 	use_ruby="Yes"
-        AC_SUBST([RUBY_INCLUDES])
+        AC_SUBST([RUBY_CFLAGS])
         AC_SUBST([RUBY_LIBS])
         AC_SUBST([RUBY_INSTALL_DIR])
       fi
diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index bc5f60860..4501cc342 100644
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -242,7 +242,7 @@ nodist_libgv_ruby_la_SOURCES = gv_ruby.cpp $(RUBY_data)
 libgv_ruby_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
 libgv_ruby_la_LIBADD = $(BASELIBS) $(RUBY_LIBS)
 libgv_ruby_la_LDFLAGS = -module -avoid-version
-libgv_ruby_la_CPPFLAGS = $(BASECPPFLAGS) $(RUBY_INCLUDES)
+libgv_ruby_la_CPPFLAGS = $(BASECPPFLAGS) $(RUBY_CFLAGS)
 # $(RUBY_data): gv_ruby.cpp
 gv_ruby.cpp: gv.i
 	$(SWIG) $(DEFS) -c++ -ruby -o gv_ruby.cpp $(srcdir)/gv.i
-- 
2.40.0