pidgin: bb09c1ec: Make sure libpurple libraries are the fi...

qulogic at pidgin.im qulogic at pidgin.im
Sat Dec 12 22:35:48 EST 2009


-----------------------------------------------------------------
Revision: bb09c1ec048f9cf29c1b8de94c5781a39878380e
Ancestor: 024b0f33f4ce79af59a2779ed32aa68da6a62e05
Author: qulogic at pidgin.im
Date: 2009-12-13T02:27:48
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bb09c1ec048f9cf29c1b8de94c5781a39878380e

Modified files:
        libpurple/tests/Makefile.am

ChangeLog: 

Make sure libpurple libraries are the first thing in the test suite's
library path. Maybe the newer libtool's don't leave out the system library
path when constructing this now, but if the system path is first, running
the tests will load the system version of libpurple instead of the just
built copy.

Fixes #10966.

-------------- next part --------------
============================================================
--- libpurple/tests/Makefile.am	e099af98ceb831b19c8096503a3cb39d433456fb
+++ libpurple/tests/Makefile.am	1f439ae5170a6f68f80997749d5dc71df844fe11
@@ -27,11 +27,11 @@ check_libpurple_LDADD=\
 		-DBUILDDIR=\"$(top_builddir)\"
 
 check_libpurple_LDADD=\
-        @CHECK_LIBS@ \
-		$(GLIB_LIBS) \
 		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
 		$(top_builddir)/libpurple/protocols/qq/libqq.la \
 		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
-		$(top_builddir)/libpurple/libpurple.la
+		$(top_builddir)/libpurple/libpurple.la \
+        @CHECK_LIBS@ \
+		$(GLIB_LIBS)
 
 endif


More information about the Commits mailing list