Fix linking for perl. From: David Rothenberger --- Makefile.in | 1 + build.conf | 3 ++- build/ac-macros/swig.m4 | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 183448c..b8eb9be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -145,6 +145,7 @@ SWIG_PY_COMPILE = @SWIG_PY_COMPILE@ SWIG_PY_LINK = @SWIG_PY_LINK@ SWIG_PY_LIBS = @SWIG_PY_LIBS@ SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@ +SWIG_PL_LIBS = @SWIG_PL_LIBS@ SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby SWIG_RB_COMPILE = @SWIG_RB_COMPILE@ SWIG_RB_LINK = @SWIG_RB_LINK@ diff --git a/build.conf b/build.conf index a22bdaf..2795c23 100644 --- a/build.conf +++ b/build.conf @@ -575,7 +575,8 @@ msvc-export = ../bindings/swig/python/libsvn_swig_py/swigutil_py.h type = swig_lib lang = perl path = subversion/bindings/swig/perl/libsvn_swig_perl -libs = libsvn_delta libsvn_subr apriconv apr perl swig +libs = libsvn_delta libsvn_subr apriconv apr swig +link-cmd = $(LINK) $(SWIG_PL_LIBS) install = swig-pl-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_PL) diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4 index 7d1a406..8a3cdb6 100644 --- a/build/ac-macros/swig.m4 +++ b/build/ac-macros/swig.m4 @@ -175,6 +175,11 @@ AC_DEFUN(SVN_FIND_SWIG, AC_MSG_RESULT([$PERL_VERSION]) if test "$PERL_VERSION" -ge "5008000"; then SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`" + + AC_CACHE_CHECK([how to link Perl libraries], [ac_cv_perl_libs], [ + ac_cv_perl_libs="`$PERL -MExtUtils::Embed -e ldopts`" + ]) + SWIG_PL_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_perl_libs)`" else AC_MSG_WARN([perl bindings require perl 5.8.0 or newer.]) fi @@ -301,6 +306,7 @@ int main() AC_SUBST(SWIG_PY_LINK) AC_SUBST(SWIG_PY_LIBS) AC_SUBST(SWIG_PL_INCLUDES) + AC_SUBST(SWIG_PL_LIBS) AC_SUBST(SWIG_RB_LINK) AC_SUBST(SWIG_RB_LIBS) AC_SUBST(SWIG_RB_INCLUDES)