# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1083449411 0
# Node ID abb2028f53e02cb22d4ac1474a12d77241f9c8c5
# Parent  e4f4756b8996f7d7d865cb09f41fff7c4eb8fc69
[gaim-migrate @ 9619]
OK, this works on at least one system with SILC and one without.  Our
configure.ac plan is craptastic, someone remind me to give it some
time when I have time to give.

committer: Tailor Script <tailor@pidgin.im>

diff -r e4f4756b8996 -r abb2028f53e0 configure.ac
--- a/configure.ac	Sat May 01 21:23:47 2004 +0000
+++ b/configure.ac	Sat May 01 22:10:11 2004 +0000
@@ -128,6 +128,9 @@
 if test "x$STATIC_PRPLS" = "xall" ; then
 	STATIC_PRPLS="gg irc jabber msn napster novell oscar silc yahoo zephyr"
 fi
+if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
+	STATIC_PRPLS=`echo $STATIC_PRPLS | sed 's/silc//'`
+fi
 AC_SUBST(STATIC_PRPLS)
 STATIC_LINK_LIBS=
 extern_init=
@@ -174,6 +177,9 @@
 if test "x$DYNAMIC_PRPLS" = "xall" ; then
 	DYNAMIC_PRPLS="gg irc jabber msn napster novell oscar silc yahoo zephyr"
 fi
+if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
+	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | sed 's/silc//'`
+fi
 AC_SUBST(DYNAMIC_PRPLS)
 for i in $DYNAMIC_PRPLS ; do
 	case $i in
@@ -201,7 +207,7 @@
 AM_CONDITIONAL(DYNAMIC_NOVELL, test "x$dynamic_novell" = "xyes")
 AM_CONDITIONAL(DYNAMIC_OSCAR, test "x$dynamic_oscar" = "xyes")
 AM_CONDITIONAL(DYNAMIC_RENDEZVOUS, test "x$dynamic_rendezvous" = "xyes")
-AM_CONDITIONAL(DYNAMIC_SILC, test "x$dynamic_silc" = "xyes")
+AM_CONDITIONAL(DYNAMIC_SILC, test "x$dynamic_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes")
 AM_CONDITIONAL(DYNAMIC_TOC, test "x$dynamic_toc" = "xyes")
 AM_CONDITIONAL(DYNAMIC_TREPIA, test "x$dynamic_trepia" = "xyes")
 AM_CONDITIONAL(DYNAMIC_YAHOO, test "x$dynamic_yahoo" = "xyes")