Check that rubyarchhdrdir exists in configuration of ruby before fetc…

…hing it.
gmarcais · Oct 27, 2015 · 66b7e25 · 66b7e25
1 parent d5bc3e0
commit 66b7e25
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/m4/m4-ax_ruby_ext.m4 b/m4/m4-ax_ruby_ext.m4
@@ -89,7 +89,8 @@ AC_DEFUN([AX_RUBY_EXT],[
                 #
                 AC_MSG_CHECKING([for Ruby include directory])
                 AS_IF([test -z "$RUBY_EXT_CFLAGS"],
-                      [RUBY_EXT_CFLAGS="-I`$RUBY -rrbconfig -e 'print RbConfig::expand(RbConfig::CONFIG.fetch("rubyhdrdir"))'` -I`$RUBY -rrbconfig -e 'print RbConfig::expand(RbConfig::CONFIG.fetch("rubyarchhdrdir"))'`"])
+                      [RUBY_EXT_CFLAGS="-I`$RUBY -rrbconfig -e 'print RbConfig::expand(RbConfig::CONFIG.fetch("rubyhdrdir"))'`"]
+                      [RUBY_EXT_CFLAGS="$RUBY_EXT_CFLAGS -I`$RUBY -rrbconfig -e 'print RbConfig::CONFIG.has_key?("rubyarchhdrdir") ? RbConfig::expand(RbConfig::CONFIG.fetch("rubyarchhdrdir")) : File.join(RbConfig::expand(RbConfig::CONFIG.fetch("rubyhdrdir")), RbConfig::CONFIG.fetch("arch"))'`"])
                 AC_MSG_RESULT([$RUBY_EXT_CFLAGS])
                 AC_SUBST(RUBY_EXT_CFLAGS)