[Gaim-commits] CVS: gaim ChangeLog,1.518,1.519 configure.ac,1.72,1.73 configure.in,1.119,1.120

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv20115

Modified Files:
	ChangeLog configure.ac configure.in 
Log Message:
No longer do we build libicq.so -- run make in src/protocols/icq if you 
feel you need it for some reason (you don't--use OSCAR)

TOC is no longer compiled statically by default.  If you need it for some
reason, you can load the libtoc.so plugin.

Ari Pollak fixed up some #ifdefs to get IM images to work in gtk2, and he
fixed a few gtk font warnings elsewhere.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -d -r1.518 -r1.519
--- ChangeLog	7 Aug 2002 19:52:31 -0000	1.518
+++ ChangeLog	7 Aug 2002 23:25:33 -0000	1.519
@@ -27,8 +27,11 @@
 		- Plugins dialog (Ari Pollak)
 		- GtkIMHtml, sorta (Ari Pollak, Christian Hammond)
 		- Buddy Icons
+		- IM Images
 	* Notify.c plugin rewritten; check its configure dialog (Thanks,
 	  Etan Reisner)
+	* TOC no longer compiles statically by default--use OSCAR
+	* ICQ plugin no longer gets built--use OSCAR
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- configure.ac	2 Aug 2002 04:39:23 -0000	1.72
+++ configure.ac	7 Aug 2002 23:25:33 -0000	1.73
@@ -68,7 +68,7 @@
 AC_ARG_ENABLE(prpls,   [  --disable-prpls         don't build dynamic protocol plugins],,enable_prpls=yes)
 AC_ARG_WITH(static-prpls,    [  --with-static-prpls     link in certain protocols statically],[STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`],STATIC_PRPLS="oscar toc")
 if test "x$STATIC_PRPLS" = "xall" ; then
-	STATIC_PRPLS="gg icq irc jabber msn napster oscar toc yahoo zephyr"
+	STATIC_PRPLS="gg irc jabber msn napster oscar toc yahoo zephyr"
 fi
 AC_SUBST(STATIC_PRPLS)
 STATIC_LINK_LIBS=
@@ -80,7 +80,6 @@
 	load_proto="$load_proto load_protocol(${i}_init, sizeof(struct prpl));"
 	case $i in
 		gg) static_gg=yes ;;
-		icq) static_icq=yes ;;
 		irc) static_irc=yes ;;
 		jabber) static_jabber=yes ;;
 		msn) static_msn=yes ;;
@@ -93,7 +92,6 @@
 	esac
 done
 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
-AM_CONDITIONAL(STATIC_ICQ, test "x$static_icq" = "xyes")
 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")

Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- configure.in	9 Jul 2002 14:26:42 -0000	1.119
+++ configure.in	7 Aug 2002 23:25:33 -0000	1.120
@@ -67,7 +67,7 @@
 AC_ARG_ENABLE(prpls,   [  --disable-prpls         don't build dynamic protocol plugins],,enable_prpls=yes)
 AC_ARG_WITH(static-prpls,    [  --with-static-prpls     link in certain protocols statically],[STATIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`],STATIC_PRPLS="oscar toc")
 if test "x$STATIC_PRPLS" = "xall" ; then
-	STATIC_PRPLS="gg icq irc jabber msn napster oscar toc yahoo zephyr"
+	STATIC_PRPLS="gg irc jabber msn napster oscar toc yahoo zephyr"
 fi
 AC_SUBST(STATIC_PRPLS)
 STATIC_LINK_LIBS=
@@ -79,7 +79,6 @@
 	load_proto="$load_proto load_protocol(${i}_init, sizeof(struct prpl));"
 	case $i in
 		gg) static_gg=yes ;;
-		icq) static_icq=yes ;;
 		irc) static_irc=yes ;;
 		jabber) static_jabber=yes ;;
 		msn) static_msn=yes ;;
@@ -92,7 +91,6 @@
 	esac
 done
 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
-AM_CONDITIONAL(STATIC_ICQ, test "x$static_icq" = "xyes")
 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")