From e248c7ff061e1582ed4c2919de6d615c1813e87a Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Mon, 12 Oct 2009 23:23:49 +0100
Subject: Automatically try prpl-$proto if $proto doesn't exist, and disable
 native protocol modules if purple is enabled; they don't go together very
 well.

---
 configure | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 65eb9e89..a87b3697 100755
--- a/configure
+++ b/configure
@@ -449,6 +449,22 @@ EOF
 protocols=''
 protoobjs=''
 
+if [ "$purple" = 0 ]; then
+	echo '#undef WITH_PURPLE' >> config.h
+else
+	echo '#define WITH_PURPLE' >> config.h
+	echo 'EFLAGS += $$(pkg-config purple --libs)' >> Makefile.settings
+	protocols=$protocols'purple '
+	protoobjs=$protoobjs'purple_mod.o '
+
+	# Having both libpurple and native IM modules in one binary may
+	# do strange things. Let's not do that.
+	msn=0
+	jabber=0
+	oscar=0
+	yahoo=0
+fi
+
 if [ "$msn" = 0 ]; then
 	echo '#undef WITH_MSN' >> config.h
 else
@@ -481,15 +497,6 @@ else
 	protoobjs=$protoobjs'yahoo_mod.o '
 fi
 
-if [ "$purple" = 0 ]; then
-	echo '#undef WITH_PURPLE' >> config.h
-else
-	echo '#define WITH_PURPLE' >> config.h
-	echo 'EFLAGS += $$(pkg-config purple --libs)' >> Makefile.settings
-	protocols=$protocols'purple '
-	protoobjs=$protoobjs'purple_mod.o '
-fi
-
 if [ "$protocols" = "PROTOCOLS = " ]; then
 	echo "Warning: You haven't selected any communication protocol to compile!"
 	echo "         BitlBee will run, but you will be unable to connect to IM servers!"
-- 
cgit v1.2.3