fix more ruby breakage

diff --git a/config/config_ruby.rb b/config/config_ruby.rb
index cf560474a09aea9df40dbefe661d712b8afb0339..dd9c4c0743ce18a4bc9916f5c755aa0500d1ea86 100644 (file)
--- a/config/config_ruby.rb
+++ b/config/config_ruby.rb
@@ -10,6 +10,8 @@ when "lib"
     puts Config::expand(CONFIG["libdir"])
 when "vendorarchdir"
     puts Config::expand(CONFIG["vendorarchdir"])
+when "sitearchdir"
+    puts Config::expand(CONFIG["sitearchdir"])
 when "sitelib"
     puts Config::expand(CONFIG["sitedir"])
 end

diff --git a/configure.ac b/configure.ac
index 322eb69611fa5208f0e77559844d5120fa7115cc..58ee0ec1793a2ae7b8d0ebdf592465666faa6967 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1560,6 +1560,9 @@ else
          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 vendorarchdir`"
+         if test "x$RUBY_INSTALL_DIR" = "x"; then
+               RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb sitearchdir`"
+         fi
           save_CPPFLAGS=$CPPFLAGS
           CPPFLAGS="$CPPFLAGS $RUBY_CFLAGS"
           AC_CHECK_HEADER(ruby.h,,[