svn commit: r1137545 - /subversion/trunk/build/ac-macros/swig.m4

[st...@apache.org]

Author: stsp
Date: Mon Jun 20 08:39:38 2011
New Revision: 1137545

URL: http://svn.apache.org/viewvc?rev=1137545&view=rev
Log:
* build/ac-macros/swig.m4: When checking how to link ruby libraries,
   include all libraries that libruby depends on in the linker argument
   list, rather than just the ruby library itself. Should fix the build on
   OpenBSD with ruby-1.9. The configure script could not detect rb_errinfo()
   because linking ruby libraries failed as the -pthread argument was missing.
   This argument isn't part of the LIBRUBYARG value in rbconfig, but of LIBS.

Modified:
    subversion/trunk/build/ac-macros/swig.m4

Modified: subversion/trunk/build/ac-macros/swig.m4
URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/swig.m4?rev=1137545&r1=1137544&r2=1137545&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/swig.m4 (original)
+++ subversion/trunk/build/ac-macros/swig.m4 Mon Jun 20 08:39:38 2011
@@ -184,7 +184,7 @@ AC_DEFUN(SVN_FIND_SWIG,
   if test "$RUBY" != "none"; then
     rbconfig="$RUBY -rrbconfig -e "
 
-    for var_name in arch archdir CC LDSHARED DLEXT LIBRUBYARG \
+    for var_name in arch archdir CC LDSHARED DLEXT LIBS LIBRUBYARG \
                     rubyhdrdir sitedir sitelibdir sitearchdir libdir
     do
       rbconfig_tmp=`$rbconfig "print Config::CONFIG@<:@'$var_name'@:>@"`
@@ -218,8 +218,8 @@ AC_DEFUN(SVN_FIND_SWIG,
     ])
     SWIG_RB_LINK="$svn_cv_ruby_link"
 
-    AC_CACHE_CHECK([for linking Ruby libraries], [ac_cv_ruby_libs], [
-      ac_cv_ruby_libs="$rbconfig_LIBRUBYARG"
+    AC_CACHE_CHECK([how to link Ruby libraries], [ac_cv_ruby_libs], [
+      ac_cv_ruby_libs="$rbconfig_LIBRUBYARG $rbconfig_LIBS"
     ])
     SWIG_RB_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_ruby_libs)`"