From 4c93c79f69be60bf9dbcc5f165191b74e0967ea0 Mon Sep 17 00:00:00 2001 From: John Ellson Date: Sun, 12 Feb 2012 11:51:13 -0500 Subject: [PATCH] fix more ruby breakage --- config/config_ruby.rb | 2 ++ configure.ac | 3 +++ 2 files changed, 5 insertions(+) diff --git a/config/config_ruby.rb b/config/config_ruby.rb index cf560474a..dd9c4c074 100644 --- 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 322eb6961..58ee0ec17 100644 --- 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,,[ -- 2.40.0