pidgin: b6f00c7a: Fix 'make check' on OS X by adding in a ...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: b6f00c7accb2076d1c68b65011f1c6c0451fe0a9
Ancestor: f57115801692578a12eb345cec17051de96de291
Author: fang at csl.cornell.edu
Date: 2010-01-13T08:05:31
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b6f00c7accb2076d1c68b65011f1c6c0451fe0a9

Modified files:
        ChangeLog libpurple/protocols/qq/Makefile.am
        libpurple/tests/Makefile.am

ChangeLog: 

Fix 'make check' on OS X by adding in a not-installed libqq shared lib.

Fix pointed out by David Fang on the mailing list.

-------------- next part --------------
============================================================
--- ChangeLog	73e0739366e6bf5ff220dbde2ae5396c24516c33
+++ ChangeLog	87c4e92ffd7d102b7c731eebe1310de697106fea
@@ -1,6 +1,9 @@ version 2.6.6 (??/??/20??):
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.6.6 (??/??/20??):
+	libpurple:
+	* Fix 'make check' on OS X. (David Fang)
+
 	Gadu-Gadu:
 	* Fix display of avatars after a server-side change. (Krzysztof
 	  Klinikowski)
============================================================
--- libpurple/protocols/qq/Makefile.am	804d8057efc64ccd120d5670e0cff27e11b73c5f
+++ libpurple/protocols/qq/Makefile.am	42487997e120bb298af3c7e0279f323e23daf5c7
@@ -65,12 +65,19 @@ st =
 else
 
 st =
+noinst_LTLIBRARIES =
 pkg_LTLIBRARIES  = libqq.la
 libqq_la_SOURCES = $(QQSOURCES)
 libqq_la_LIBADD  = $(GLIB_LIBS)
 
 endif
 
+# For 'make check'
+noinst_LTLIBRARIES += libqq_tmp.la
+libqq_tmp_la_SOURCES = $(libqq_la_SOURCES)
+libqq_tmp_la_LIBADD = $(libqq_la_LIBADD)
+
+
 # QQ_BUDDY_ICON_DIR is the path where a bunch of stock icons can be
 # places for users to choose from when setting their buddy icon.  We
 # don't distribute those icons ourselves because of possibly copyright
============================================================
--- libpurple/tests/Makefile.am	1f439ae5170a6f68f80997749d5dc71df844fe11
+++ libpurple/tests/Makefile.am	f1d2e70bf4e78d3cd817bfd0873e92f3d7ab173c
@@ -28,7 +28,7 @@ check_libpurple_LDADD=\
 
 check_libpurple_LDADD=\
 		$(top_builddir)/libpurple/protocols/jabber/libjabber.la \
-		$(top_builddir)/libpurple/protocols/qq/libqq.la \
+		$(top_builddir)/libpurple/protocols/qq/libqq_tmp.la \
 		$(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
 		$(top_builddir)/libpurple/libpurple.la \
         @CHECK_LIBS@ \