From: Matthias Kramm <kramm@quiss.org>
Date: Wed, 24 Feb 2010 19:21:48 +0000 (-0800)
Subject: darwin fixes
X-Git-Tag: version-0-9-1~137
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=6487933fe6b496bb04cd287b51b96af6b7d97058

darwin fixes
---

diff --git a/configure.in b/configure.in
index 7fda6b9..14e6d62 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])
diff --git a/m4/ruby.m4 b/m4/ruby.m4
index fd200c6..d5cf4a5 100644
--- a/m4/ruby.m4
+++ b/m4/ruby.m4
@@ -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')