git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
poppler: use new PDF version methods
[swftools.git]
/
m4
/
ruby.m4
diff --git
a/m4/ruby.m4
b/m4/ruby.m4
index
f64d6e6
..
9daa03a
100644
(file)
--- a/
m4/ruby.m4
+++ b/
m4/ruby.m4
@@
-22,14
+22,16
@@
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_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)
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_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')
fi
else
AC_MSG_RESULT('unknown')
fi
@@
-62,11
+64,12
@@
int Init_foobar()
{
foobar = rb_define_module("foobar");
rb_define_module_function(foobar, "set_foo", foobar_set_foo, 2);
{
foobar = rb_define_module("foobar");
rb_define_module_function(foobar, "set_foo", foobar_set_foo, 2);
+ return 0;
}
int main() {return 0;}
EOF
}
int main() {return 0;}
EOF
- ac_link='$CC $SHARED $CPPFLAGS $RUBY_CPPFLAGS $CFLAGS conftest.c $LDFLAGS $RUBY_LDFLAGS $LIBS $RUBY_LIBS -o conftest${ac_exeext}'
- if { (eval echo ruby.m4: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_link='$CC $SHARED $CPPFLAGS $RUBY_CPPFLAGS $CFLAGS conftest.c $LDFLAGS $RUBY_LDFLAGS $LIBS $RUBY_LIBS -o conftest${SLEXT}'
+ if { (eval echo ruby.m4: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${SLEXT}; then
RUBY_OK=yes
else
echo "configure: failed program was:" >&5
RUBY_OK=yes
else
echo "configure: failed program was:" >&5
@@
-80,10
+83,12
@@
if test "x${RUBY_OK}" '=' "xyes"; then
AC_SUBST(RUBY_LIBS)
AC_SUBST(RUBY_CPPFLAGS)
AC_SUBST(RUBY_LDFLAGS)
AC_SUBST(RUBY_LIBS)
AC_SUBST(RUBY_CPPFLAGS)
AC_SUBST(RUBY_LDFLAGS)
+ AC_SUBST(RUBY_INSTALLDIR)
else
AC_MSG_RESULT([no])
RUBY_CPPFLAGS=""
RUBY_LDFLAGS=""
RUBY_LIBS=""
else
AC_MSG_RESULT([no])
RUBY_CPPFLAGS=""
RUBY_LDFLAGS=""
RUBY_LIBS=""
+ RUBY_INSTALLDIR=""
fi
])
fi
])