jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only enable Ruby testing if Ruby header files are found

Browse source
This commit is contained in:
William S Fulton 2014-02-15 12:01:40 +00:00
commit 44670c2b96
1 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
configure.ac
View file

@ -1274,7 +1274,7 @@ fi
AC_MSG_CHECKING(for Ruby header files) 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"" || test x"$RUBYDIR" = x"nil"; 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`
@ -1283,20 +1283,20 @@ if test -n "$RUBY"; then
fi fi
if test x"$RUBYDIR" != x""; then if test x"$RUBYDIR" != x""; then
dirs="$RUBYDIR" dirs="$RUBYDIR"
RUBYINCLUDE=none RUBYINCLUDE=
for i in $dirs; do for i in $dirs; do
if test -r $i/ruby.h; then if test -r $i/ruby.h; then
AC_MSG_RESULT($i) if test x"$RUBYARCH" = x""; then
RUBYINCLUDE="-I$i" RUBYINCLUDE="-I$i"
else
RUBYINCLUDE="-I$i -I$i/$RUBYARCH"
fi
AC_MSG_RESULT($RUBYINCLUDE)
break break
fi fi
done done
if test x"$RUBYARCH" != x""; then if test x"$RUBYINCLUDE" = x""; then
RUBYINCLUDE="-I$RUBYDIR -I$RUBYDIR/$RUBYARCH" AC_MSG_RESULT(could not locate ruby.h)
fi
if test "$RUBYINCLUDE" = none; then
RUBYINCLUDE="-I$RUBYDIR"
AC_MSG_RESULT(could not locate ruby.h...using $RUBYINCLUDE)
fi fi
# Find library and path for linking. # Find library and path for linking.
@ -1350,8 +1350,6 @@ if test -n "$RUBY"; then
fi fi
else else
AC_MSG_RESULT(unable to determine ruby configuration) AC_MSG_RESULT(unable to determine ruby configuration)
RUBYINCLUDE="-I$RUBYDIR"
RUBYLIB="$RUBYDIR"
fi fi
case $host in case $host in
@ -1363,9 +1361,6 @@ if test -n "$RUBY"; then
RUBYSO=.`($RUBY -rrbconfig -e 'print Config::CONFIG[["DLEXT"]]') 2>/dev/null` RUBYSO=.`($RUBY -rrbconfig -e 'print Config::CONFIG[["DLEXT"]]') 2>/dev/null`
else else
AC_MSG_RESULT(could not figure out how to run ruby) AC_MSG_RESULT(could not figure out how to run ruby)
RUBYINCLUDE="-I/usr/local/lib/ruby/1.4/arch"
RUBYLIB="/usr/local/lib/ruby/1.4/arch"
RUBYLINK="-lruby -lm"
fi fi
case $host in case $host in