Fix build on Ruby 1.9.x without pkgconfig file.

pull/1/head
Darrell Anderson 12 years ago
parent 17ec98326a
commit de9980a5ac

@ -13,9 +13,12 @@ else
RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null` RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
if test -n "$RUBY_VERSION"; then if test -n "$RUBY_VERSION"; then
RUBY_CFLAGS=`$PKGCONFIG ruby --cflags` RUBY_CFLAGS=`$PKGCONFIG ruby --cflags`
else fi
if test -z "$RUBY_VERSION"; then
RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null` RUBY_VERSION=`$PKGCONFIG ruby-1.9 --modversion 2>/dev/null`
RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags` if test -n "$RUBY_VERSION"; then
RUBY_CFLAGS=`$PKGCONFIG ruby-1.9 --cflags`
fi
fi fi
if test -z "$RUBY_VERSION"; then if test -z "$RUBY_VERSION"; then
# pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h # pkgconfig file does not exist but might be 1.9.1: RUBY_VERSION defined in ruby/version.h
@ -26,6 +29,8 @@ else
RUBY_TEENY=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['TEENY']"@:>@)'` RUBY_TEENY=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"['TEENY']"@:>@)'`
if test "$RUBY_MAJOR" == "1" && test "$RUBY_MINOR" == "9"; then if test "$RUBY_MAJOR" == "1" && test "$RUBY_MINOR" == "9"; then
RUBY_VERSION="$RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY" RUBY_VERSION="$RUBY_MAJOR.$RUBY_MINOR.$RUBY_TEENY"
RUBY_CFLAGS="-I`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"rubyhdrdir"@:>@)'`"
RUBY_CFLAGS="$RUBY_CFLAGS/`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"arch"@:>@)'` $RUBY_CFLAGS"
fi fi
fi fi
fi fi
@ -60,9 +65,11 @@ else
cflags $RUBY_CFLAGS]) cflags $RUBY_CFLAGS])
AC_SUBST(RUBY_ARCHDIR) AC_SUBST(RUBY_ARCHDIR)
AC_SUBST(RUBY_SITEARCHDIR) AC_SUBST(RUBY_SITEARCHDIR)
AC_SUBST(RUBY_SITEDIR)
AC_SUBST(RUBY_RUBYLIBDIR) AC_SUBST(RUBY_RUBYLIBDIR)
AC_SUBST(RUBY_LIBDIR)
AC_SUBST(RUBY_INCLUDEDIR) AC_SUBST(RUBY_INCLUDEDIR)
AC_SUBST(RUBY_SITEDIR) AC_SUBST(RUBY_LIBRUBYARG)
AC_SUBST(RUBY_CFLAGS) AC_SUBST(RUBY_CFLAGS)
fi fi

@ -8,6 +8,7 @@ if test -z "$RUBY"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby" DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
else else
AC_MSG_CHECKING(for ruby dirs) AC_MSG_CHECKING(for ruby dirs)
# Note: pkgconfig file exists only for ruby >= 1.9.3
if test -n "$PKGCONFIG"; then if test -n "$PKGCONFIG"; then
RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null` RUBY_VERSION=`$PKGCONFIG ruby --modversion 2>/dev/null`
if test -n "$RUBY_VERSION"; then if test -n "$RUBY_VERSION"; then

Loading…
Cancel
Save