diff options
| author | Kees Cook <kees@outflux.net> | 2006-12-16 04:54:48 +0000 |
|---|---|---|
| committer | keescook <keescook@users.sourceforge.net> | 2006-12-16 04:54:48 +0000 |
| commit | d18c37bc7c0661536b9f600f92562cbda992a0e6 (patch) | |
| tree | 86c278b9666cbba60c208f0ce48de2e2ae963192 | |
| parent | Clean up internal Python/Perl dialog text; link against the python dynamic li... (diff) | |
| download | inkscape-d18c37bc7c0661536b9f600f92562cbda992a0e6.tar.gz inkscape-d18c37bc7c0661536b9f600f92562cbda992a0e6.zip | |
correct the Perl linking symantics
(bzr r2095)
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/Makefile_insert | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 61d5a8d1c..0eb5d66e1 100644 --- a/configure.ac +++ b/configure.ac @@ -363,7 +363,7 @@ if test "x$with_perl" = "xyes"; then if test "$?" -gt "0"; then with_perl="no" else - checkPERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null` + checkPERL_LIBS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null` if test "$?" -gt "0"; then with_perl="no" else @@ -375,22 +375,22 @@ AC_MSG_RESULT([$with_perl]) if test "x$with_perl" = "xyes"; then # Test that we actually have the perl libraries installed oldCFLAGS="$CFLAGS" - oldLDFLAGS="$LDFLAGS" + oldLIBS="$LIBS" CFLAGS="$CFLAGS $checkPERL_CFLAGS" - LDFLAGS="$LDFLAGS $checkPERL_LDFLAGS" + LIBS="$LIBS $checkPERL_LIBS" AC_CHECK_FUNC([perl_parse],[ PERL_CFLAGS="$checkPERL_CFLAGS" - PERL_LDFLAGS="$checkPERL_LDFLAGS" + PERL_LIBS="$checkPERL_LIBS" AC_DEFINE(WITH_PERL, 1, [use Perl for embedded scripting]) ],[ with_perl="no" ]) CFLAGS="$oldCFLAGS" - LDFLAGS="$oldLDFLAGS" + LIBS="$oldLIBS" fi AM_CONDITIONAL(WITH_PERL, test "x$with_perl" = "xyes") AC_SUBST(PERL_CFLAGS) -AC_SUBST(PERL_LDFLAGS) +AC_SUBST(PERL_LIBS) dnl ****************************** dnl Python checking diff --git a/src/Makefile_insert b/src/Makefile_insert index 6b252055c..e976a1f3c 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -343,7 +343,6 @@ all_libs = \ $(win32ldflags) \ $(PERL_LIBS) \ $(PYTHON_LIBS) \ - $(LIBLOUDMOUTH_LIBS) \ $(INKBOARD_LIBS) desktop.$(OBJEXT): helper/sp-marshal.h |