From e9ce2c838bbaaeb1f6c3e62cd3e18adc0b561c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 28 Oct 2012 21:02:13 +0100 Subject: [PATCH] Fix Ruby 1.9.x shared library test without pkgconfig file (cherry picked from commit e566a4bef04b83c4927349955ca7cca80aee1c09) --- configure.in | 4 ++++ lib/kross/configure.in.in | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/configure.in b/configure.in index 8d4df6472..febd60c93 100644 --- a/configure.in +++ b/configure.in @@ -1566,6 +1566,9 @@ if test "x$compile_kross" = "xyes" ; then 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" + if test -n "`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`"; then + RUBY_ENABLESHARED=yes + fi fi fi fi @@ -1602,6 +1605,7 @@ if test "x$compile_kross" = "xyes" ; then AC_SUBST(RUBY_SITEARCHDIR) AC_SUBST(RUBY_RUBYLIBDIR) AC_SUBST(RUBY_INCLUDEDIR) + AC_SUBST(RUBY_LIBRUBYARG) AC_SUBST(RUBY_SITEDIR) AC_SUBST(RUBY_CFLAGS) diff --git a/lib/kross/configure.in.in b/lib/kross/configure.in.in index 496b399b4..dd049651a 100644 --- a/lib/kross/configure.in.in +++ b/lib/kross/configure.in.in @@ -52,6 +52,9 @@ if test "x$compile_kross" = "xyes" ; then 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" + if test -n "`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`"; then + RUBY_ENABLESHARED=yes + fi fi fi fi @@ -88,6 +91,7 @@ if test "x$compile_kross" = "xyes" ; then AC_SUBST(RUBY_SITEARCHDIR) AC_SUBST(RUBY_RUBYLIBDIR) AC_SUBST(RUBY_INCLUDEDIR) + AC_SUBST(RUBY_LIBRUBYARG) AC_SUBST(RUBY_SITEDIR) AC_SUBST(RUBY_CFLAGS)