Mercurial > pidgin
changeset 27524:b0ae684202a8
merge of '36948cfc8a90e3d81db3b233f7af33bf653ae4d3'
and '80c512a73e4585cbb038dbf493be0183ad2547bf'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Mon, 13 Jul 2009 02:17:47 +0000 |
| parents | 37741237d146 (current diff) 35cb9aa9eb2f (diff) |
| children | b32e7be9b3bf |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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"
--- 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)