# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1001105257 0
# Node ID 5486d558ecee0a9d642e6198a779aa634204e1df
# Parent  b16642ac87b26b491b645562b562d86f61ade3a6
[gaim-migrate @ 2354]
Arkadiusz Miskiewicz's patches to get automake 1.5 working, and so that it doesn't build .so.0 and .so.0.0.0. i need to do this for plugins/.

committer: Tailor Script <tailor@pidgin.im>

diff -r b16642ac87b2 -r 5486d558ecee src/Makefile.am
--- a/src/Makefile.am	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/Makefile.am	Fri Sep 21 20:47:37 2001 +0000
@@ -62,28 +62,10 @@
 gaim_LDADD = @LDADD@ @LIBOBJS@
 endif
 
-# UI stuff. We do this here so the PRPLs aren't forced to link with it
-LIBS += $(UI_LIBS)
-
-# Sound libs. Just for fun
-LIBS += $(SOUND_LIBS)
-
-# Static protocols
-LIBS += $(STATIC_LINK_LIBS)
+CFLAGS += $(PERL_CFLAGS)
+CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
 
-# Perl stuff. plugins shouldn't need this either (right?)
-CFLAGS += $(PERL_CFLAGS)
-LIBS += $(PERL_LIBS)
-
-# X screensaver extension
-LIBS += $(XSS_LIBS)
-
-# gettext stuff
-LIBS += $(INTLLIBS)
-
-# any other stuff
-CFLAGS += -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
-LIBS += $(DEBUG_LIBS)
+LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
 
 EXTRA_DIST =	applet.h \
 		convo.h \
diff -r b16642ac87b2 -r 5486d558ecee src/protocols/icq/Makefile.am
--- a/src/protocols/icq/Makefile.am	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/protocols/icq/Makefile.am	Fri Sep 21 20:47:37 2001 +0000
@@ -8,6 +8,7 @@
 pkgdir = $(libdir)/gaim
 
 CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
+libicq_la_LDFLAGS =	-avoid-version
 
 if STATIC_ICQ
 
diff -r b16642ac87b2 -r 5486d558ecee src/protocols/irc/Makefile.am
--- a/src/protocols/irc/Makefile.am	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/protocols/irc/Makefile.am	Fri Sep 21 20:47:37 2001 +0000
@@ -3,6 +3,7 @@
 pkgdir = $(libdir)/gaim
 
 CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
+libirc_la_LDFLAGS = -avoid-version
 
 if STATIC_IRC
 
diff -r b16642ac87b2 -r 5486d558ecee src/protocols/jabber/Makefile.am
--- a/src/protocols/jabber/Makefile.am	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/protocols/jabber/Makefile.am	Fri Sep 21 20:47:37 2001 +0000
@@ -3,6 +3,7 @@
 pkgdir = $(libdir)/gaim
 
 CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
+libjabber_la_LDFLAGS = 	-avoid-version
 
 if STATIC_JABBER
 
diff -r b16642ac87b2 -r 5486d558ecee src/protocols/msn/Makefile.am
--- a/src/protocols/msn/Makefile.am	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/protocols/msn/Makefile.am	Fri Sep 21 20:47:37 2001 +0000
@@ -3,6 +3,7 @@
 pkgdir = $(libdir)/gaim
 
 CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
+libmsn_la_LDFLAGS = -avoid-version
 
 if STATIC_MSN
 
diff -r b16642ac87b2 -r 5486d558ecee src/protocols/napster/Makefile.am
--- a/src/protocols/napster/Makefile.am	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/protocols/napster/Makefile.am	Fri Sep 21 20:47:37 2001 +0000
@@ -1,6 +1,7 @@
 pkgdir = $(libdir)/gaim
 
 CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
+libnapster_la_LDFLAGS = -avoid-version
 
 if STATIC_NAPSTER
 
diff -r b16642ac87b2 -r 5486d558ecee src/protocols/oscar/Makefile.am
--- a/src/protocols/oscar/Makefile.am	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/protocols/oscar/Makefile.am	Fri Sep 21 20:47:37 2001 +0000
@@ -4,6 +4,7 @@
 pkgdir = $(libdir)/gaim
 
 CFLAGS += -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\" -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
+liboscar_la_LDFLAGS =	-avoid-version
 
 if STATIC_OSCAR
 
diff -r b16642ac87b2 -r 5486d558ecee src/protocols/oscar/im.c
--- a/src/protocols/oscar/im.c	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/protocols/oscar/im.c	Fri Sep 21 20:47:37 2001 +0000
@@ -1575,6 +1575,9 @@
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
 		 ret = userfunc(sess, rx, channel, sn, reason);
 
+	free(ck);
+	free(sn);
+
 	return ret;
 }
 
@@ -1584,6 +1587,7 @@
 	fu16_t type;
 	fu8_t snlen, *ck;
 	char *sn;
+	int ret = 0;
 
 	ck = aimbs_getraw(bs, 8);
 	type = aimbs_get16(bs);
@@ -1591,12 +1595,12 @@
 	sn = aimbs_getstr(bs, snlen);
 
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-		return userfunc(sess, rx, type, sn);
+		ret = userfunc(sess, rx, type, sn);
 
 	free(sn);
 	free(ck);
 
-	return 0;
+	return ret;
 }
 
 static int snachandler(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
diff -r b16642ac87b2 -r 5486d558ecee src/protocols/oscar/login.c
--- a/src/protocols/oscar/login.c	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/protocols/oscar/login.c	Fri Sep 21 20:47:37 2001 +0000
@@ -783,16 +783,17 @@
 	aim_rxcallback_t userfunc;
 	int vercount;
 	fu8_t *versions;
+	int ret = 0;
 
 	vercount = aim_bstream_empty(bs)/4;
 	versions = aimbs_getraw(bs, aim_bstream_empty(bs));
 
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-		return userfunc(sess, rx, vercount, versions);
+		ret = userfunc(sess, rx, vercount, versions);
 
 	free(versions);
 
-	return 0;
+	return ret;
 }
 
 /*
diff -r b16642ac87b2 -r 5486d558ecee src/protocols/toc/Makefile.am
--- a/src/protocols/toc/Makefile.am	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/protocols/toc/Makefile.am	Fri Sep 21 20:47:37 2001 +0000
@@ -3,6 +3,7 @@
 pkgdir = $(libdir)/gaim
 
 CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
+libtoc_la_LDFLAGS = -avoid-version
 
 if STATIC_TOC
 
diff -r b16642ac87b2 -r 5486d558ecee src/protocols/yahoo/Makefile.am
--- a/src/protocols/yahoo/Makefile.am	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/protocols/yahoo/Makefile.am	Fri Sep 21 20:47:37 2001 +0000
@@ -3,6 +3,7 @@
 pkgdir = $(libdir)/gaim
 
 CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
+libyahoo_la_LDFLAGS = -avoid-version
 
 if STATIC_YAHOO
 
diff -r b16642ac87b2 -r 5486d558ecee src/protocols/zephyr/Makefile.am
--- a/src/protocols/zephyr/Makefile.am	Fri Sep 21 17:51:13 2001 +0000
+++ b/src/protocols/zephyr/Makefile.am	Fri Sep 21 20:47:37 2001 +0000
@@ -2,7 +2,8 @@
 
 CFLAGS += -I\$(top_srcdir)/src -I\$(top_srcdir)/src/protocols -DCONFDIR=\"$(confdir)\" $(KRB4_CFLAGS) $(st) $(DEBUG_CFLAGS)
 
-LIBS += $(KRB4_LDFLAGS) $(KRB4_LIBS)
+LIBS = @LIBS@ $(KRB4_LDFLAGS) $(KRB4_LIBS)
+libzephyr_la_LDFLAGS = 	-avoid-version
 
 if STATIC_ZEPHYR