changeset 15414:6e1e72d085c5

merge of '40a73bb689b4b47c5070a2416c353ea7ee080ce2' and 'baf51c5a03d7cf19df754fa0793aeca16ead44d1'
author Ethan Blanton <elb@pidgin.im>
date Thu, 25 Jan 2007 19:00:52 +0000
parents f733d8042f96 (diff) e6b40365930c (current diff)
children 0482dae153d4
files
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Thu Jan 25 08:42:26 2007 +0000
+++ b/configure.ac	Thu Jan 25 19:00:52 2007 +0000
@@ -716,6 +716,8 @@
 		msn)		static_msn=yes ;;
 		novell)		static_novell=yes ;;
 		oscar)		static_oscar=yes ;;
+		aim)		dynamic_oscar=yes ;;
+		icq)		dynamic_oscar=yes ;;
 		qq)		static_qq=yes ;;
 		sametime)	static_sametime=yes ;;
 		silc)		static_silc=yes ;;
@@ -767,6 +769,8 @@
 		msn)		dynamic_msn=yes ;;
 		novell)		dynamic_novell=yes ;;
 		oscar)		dynamic_oscar=yes ;;
+		aim)		dynamic_oscar=yes ;;
+		icq)		dynamic_oscar=yes ;;
 		qq)		dynamic_qq=yes ;;
 		sametime)	dynamic_sametime=yes ;;
 		silc)		dynamic_silc=yes ;;