]> git.tokkee.org Git - inkscape.git/commitdiff

Code

correct the Perl linking symantics
authorkeescook <keescook@users.sourceforge.net>
Sat, 16 Dec 2006 04:54:48 +0000 (04:54 +0000)
committerkeescook <keescook@users.sourceforge.net>
Sat, 16 Dec 2006 04:54:48 +0000 (04:54 +0000)
configure.ac
src/Makefile_insert

index 61d5a8d1ccf43b2ed0e35b8e0e433746f78cda1f..0eb5d66e1fcff8a51757dfa6b97748e8dfc971f1 100644 (file)
@@ -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
index 6b252055c1ca9a22232ae371ad7c573b0b17003e..e976a1f3cf54663175ea70841751c8589fa504c0 100644 (file)
@@ -343,7 +343,6 @@ all_libs =                  \
        $(win32ldflags)         \
        $(PERL_LIBS)            \
        $(PYTHON_LIBS)  \
-       $(LIBLOUDMOUTH_LIBS) \
        $(INKBOARD_LIBS)
 
 desktop.$(OBJEXT): helper/sp-marshal.h