Fix detection of Ruby include files for Ruby 1.8.7
svn rev r13964 broke it for Ruby 1.8.7 :-/ git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13971 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
94fb7629f4
commit
e39a16c92a
1 changed files with 4 additions and 4 deletions
|
|
@ -1342,8 +1342,8 @@ AC_MSG_CHECKING(for Ruby header files)
|
||||||
if test -n "$RUBY"; then
|
if test -n "$RUBY"; then
|
||||||
# Try Ruby1.9 first
|
# Try Ruby1.9 first
|
||||||
RUBYDIR=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || $rubyhdrdir') 2>/dev/null`
|
RUBYDIR=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["rubyhdrdir"]] || $rubyhdrdir') 2>/dev/null`
|
||||||
if test x"$RUBYDIR" == x""; then
|
if test x"$RUBYDIR" == x"" || test x"$RUBYDIR" == x"nil"; then
|
||||||
RUBYDIR=`($RUBY -rmkmf -e 'print Config::CONFIG[["archdir"]] || $archdir') 2>/dev/null`
|
RUBYDIR=`($RUBY -rmkmf -e 'print Config::CONFIG[["archdir"]] || $archdir') 2>/dev/null`
|
||||||
else
|
else
|
||||||
RUBYARCH=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["arch"]] || $arch') 2>/dev/null`
|
RUBYARCH=`($RUBY -rrbconfig -e 'print RbConfig::CONFIG[["arch"]] || $arch') 2>/dev/null`
|
||||||
fi
|
fi
|
||||||
|
|
@ -1357,9 +1357,9 @@ if test -n "$RUBY"; then
|
||||||
break;
|
break;
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
if test x"$RUBYARCH" != x""; then
|
if test x"$RUBYARCH" != x""; then
|
||||||
RUBYINCLUDE="-I$RUBYDIR -I$RUBYDIR/$RUBYARCH"
|
RUBYINCLUDE="-I$RUBYDIR -I$RUBYDIR/$RUBYARCH"
|
||||||
fi
|
fi
|
||||||
if test "$RUBYINCLUDE" = none; then
|
if test "$RUBYINCLUDE" = none; then
|
||||||
RUBYINCLUDE="-I$RUBYDIR"
|
RUBYINCLUDE="-I$RUBYDIR"
|
||||||
AC_MSG_RESULT(could not locate ruby.h...using $RUBYINCLUDE)
|
AC_MSG_RESULT(could not locate ruby.h...using $RUBYINCLUDE)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue