# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1247451231 0
# Node ID 35cb9aa9eb2f64cfe89f4c7aaab8773b7689bf8a
# Parent  1b92b9b51e2a5bb7dd446b2b7479480814d02096
zac from the Adium team noticed that the static prpl foo for yahoo was no longer
working after my changes to split the prpl.  It traced back to lack of magic in
configure.ac and a typo in yahoo's Makefile.am.  This corrects those problems.

diff -r 1b92b9b51e2a -r 35cb9aa9eb2f configure.ac
--- a/configure.ac	Sun Jul 12 22:55:24 2009 +0000
+++ b/configure.ac	Mon Jul 13 02:13:51 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 1b92b9b51e2a -r 35cb9aa9eb2f libpurple/protocols/yahoo/Makefile.am
--- a/libpurple/protocols/yahoo/Makefile.am	Sun Jul 12 22:55:24 2009 +0000
+++ b/libpurple/protocols/yahoo/Makefile.am	Mon Jul 13 02:13:51 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)