# HG changeset patch
# User fang@csl.cornell.edu
# Date 1263369931 0
# Node ID 485f69e04d6a09dfaedcfc07be8bd447b1ad47df
# Parent  c64b22932ffacd22515a33311300623f228b24d6
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.

committer: Paul Aurich <paul@darkrain42.org>

diff -r c64b22932ffa -r 485f69e04d6a ChangeLog
--- a/ChangeLog	Wed Jan 13 03:13:26 2010 +0000
+++ b/ChangeLog	Wed Jan 13 08:05:31 2010 +0000
@@ -1,6 +1,9 @@
 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)
diff -r c64b22932ffa -r 485f69e04d6a libpurple/protocols/qq/Makefile.am
--- a/libpurple/protocols/qq/Makefile.am	Wed Jan 13 03:13:26 2010 +0000
+++ b/libpurple/protocols/qq/Makefile.am	Wed Jan 13 08:05:31 2010 +0000
@@ -65,12 +65,19 @@
 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
diff -r c64b22932ffa -r 485f69e04d6a libpurple/tests/Makefile.am
--- a/libpurple/tests/Makefile.am	Wed Jan 13 03:13:26 2010 +0000
+++ b/libpurple/tests/Makefile.am	Wed Jan 13 08:05:31 2010 +0000
@@ -28,7 +28,7 @@
 
 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@ \