diff options
| author | Matthias Kramm <kramm@quiss.org> | 2010-02-24 11:21:48 -0800 |
|---|---|---|
| committer | Matthias Kramm <kramm@quiss.org> | 2010-02-24 11:21:48 -0800 |
| commit | 6487933fe6b496bb04cd287b51b96af6b7d97058 (patch) | |
| tree | 28506545fd1a8a8a571e0c1f7a7d9258ae248a3a | |
| parent | de22fd43dbae114b05f931cae5e066a794d997fb (diff) | |
darwin fixes
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | m4/ruby.m4 | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 7fda6b96..14e6d62b 100644 --- a/configure.in +++ b/configure.in @@ -90,6 +90,7 @@ dnl Checks for programs. AC_CANONICAL_HOST +SLEXT="so" SHARED="-shared" MACOSX= case $host_os in @@ -98,6 +99,7 @@ case $host_os in CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS -fno-rtti" SHARED="-bundle" + SLEXT="bundle" if test -d /opt/local/include && test -d /opt/local/lib; then CPPFLAGS="${CPPFLAGS} -I/opt/local/include" LDFLAGS="${LDFLAGS} -L/opt/local/lib" @@ -168,7 +170,6 @@ AC_SUBST(AREXT) RFX_CHECK_MING -SLEXT="so" if test "x${MINGW}" != "xyes"; then # no mingW AC_DEFINE([O_BINARY], [0], [Not defined on mingw]) @@ -22,14 +22,15 @@ if test "x$RUBY" '!=' "x";then AC_MSG_CHECKING([for ruby's ld flags]) rubyld=`$RUBY -e 'require "rbconfig";puts Config::expand(Config::CONFIG.send("\x5b\x5d", "LIBRUBYARG_SHARED"))' 2>/dev/null` - AC_MSG_RESULT($rubyld) + rubyld2=`$RUBY -e 'require "rbconfig";v=Config::expand(Config::CONFIG.send("\x5b\x5d", "LIBRUBY_LDSHARED"));puts v.gsub(/^g?cc/,"")' 2>/dev/null` + AC_MSG_RESULT("$rubyld $rubyld2") AC_MSG_CHECKING([for ruby library name]) rubylib=`$RUBY -e 'require "rbconfig";puts Config::expand(Config::CONFIG.send("\x5b\x5d", "RUBY_SO_NAME"))' 2>/dev/null` AC_MSG_RESULT($rubylib) RUBY_CPPFLAGS="$rubycpp -I$rubyinc $RUBY_CPPFLAGS" - RUBY_LDFLAGS="$rubyld $RUBY_LDFLAGS" + RUBY_LDFLAGS="$rubyld $rubyld2 $RUBY_LDFLAGS" RUBY_INSTALLDIR="$rubyinc" else AC_MSG_RESULT('unknown') |