pidgin: 80c512a7: zac from the Adium team noticed that the...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 80c512a73e4585cbb038dbf493be0183ad2547bf
Ancestor: 37273b6f2212b998066d29177863f4bf938526fc
Author: rekkanoryo at pidgin.im
Date: 2009-07-13T02:13:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/80c512a73e4585cbb038dbf493be0183ad2547bf

Modified files:
        configure.ac libpurple/protocols/yahoo/Makefile.am

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- configure.ac	f68b547755dd2f8be217245d78a8f20fe2b19541
+++ configure.ac	c90f4d8ffb26e16ea6e7236d07b4199c560673cf
@@ -1075,13 +1075,19 @@ for i in $STATIC_PRPLS ; do
 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"
============================================================
--- libpurple/protocols/yahoo/Makefile.am	250d14a249690fd5856c4fe420752b765cfb782b
+++ libpurple/protocols/yahoo/Makefile.am	e9d9993f55ec5505a065b7892b98df4be11a6288
@@ -33,7 +33,7 @@ st = -DPURPLE_STATIC_PRPL
 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)