# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1247451467 0
# Node ID b0ae684202a82a786788ad9a67f1af606a20e99e
# Parent  37741237d1462eeaf23901f0d84d0e2c2b91d77e# Parent  35cb9aa9eb2f64cfe89f4c7aaab8773b7689bf8a
merge of '36948cfc8a90e3d81db3b233f7af33bf653ae4d3'
     and '80c512a73e4585cbb038dbf493be0183ad2547bf'

diff -r 37741237d146 -r b0ae684202a8 configure.ac
--- a/configure.ac	Mon Jul 13 02:17:42 2009 +0000
+++ b/configure.ac	Mon Jul 13 02:17:47 2009 +0000
@@ -1075,13 +1075,19 @@
 load_proto=
 for i in $STATIC_PRPLS ; do
 	dnl Ugly special case for "libsilcpurple.la":
-	dnl ... and Ugly special case for multi-protocol oscar
+	dnl ... and Ugly special case for multi-protocol oscar and yahoo
 	if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
 		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
 		extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
 		extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
 		load_proto="$load_proto purple_init_aim_plugin();"
 		load_proto="$load_proto purple_init_icq_plugin();"
+	elif test "x$i" = "xyahoo"; then
+		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+		extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+		extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+		load_proto="$load_proto purple_init_yahoo_plugin();"
+		load_proto="$load_proto purple_init_yahoojp_plugin();"
 	else
 		if test "x$i" = "xsilc"; then
 			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
diff -r 37741237d146 -r b0ae684202a8 libpurple/protocols/yahoo/Makefile.am
--- a/libpurple/protocols/yahoo/Makefile.am	Mon Jul 13 02:17:42 2009 +0000
+++ b/libpurple/protocols/yahoo/Makefile.am	Mon Jul 13 02:17:47 2009 +0000
@@ -33,7 +33,7 @@
 if STATIC_YAHOO
 
 st = -DPURPLE_STATIC_PRPL
-noinst_LTLIBRARIES  = libyahoo.la
+noinst_LTLIBRARIES  = libymsg.la
 libymsg_la_SOURCES = $(YAHOOSOURCES) libyahoo.c libyahoojp.c
 libymsg_la_CFLAGS  = $(AM_CFLAGS)