From 04e2a05051747cea98fabb7a1232a8e64b1e4a68 Mon Sep 17 00:00:00 2001 From: dequis Date: Thu, 26 Jun 2014 05:07:11 -0300 Subject: configure: Let the user enable both built-in protocols and purple There's no real risk in enabling these, since protocols/purple/purple.c already avoids adding duplicate protocols in purple_initmodule(): /* If we already have this one (as a native module), don't add a libpurple duplicate. */ if( find_protocol( prot->info->id ) ) continue; --- configure | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'configure') diff --git a/configure b/configure index dd592855..e98d5a8b 100755 --- a/configure +++ b/configure @@ -23,10 +23,16 @@ ipcsocket='' pcdir='$prefix/lib/pkgconfig' systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib" -msn=1 -jabber=1 -oscar=1 -yahoo=1 +# Set these to default-on to let it be overriden by either the user or purple +# +# If the user sets one of these to 1, purple won't disable them. +# Otherwise, if it's still default-on, it gets included in normal builds, +# but not purple ones. +msn="default-on" +jabber="default-on" +oscar="default-on" +yahoo="default-on" + twitter=1 purple=0 @@ -601,12 +607,11 @@ EOF 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 + # only disable these if the user didn't enable them explicitly + [ "$msn" = "default-on" ] && msn=0 + [ "$jabber" = "default-on" ] && jabber=0 + [ "$oscar" = "default-on" ] && oscar=0 + [ "$yahoo" = "default-on" ] && yahoo=0 echo '#undef PACKAGE' >> config.h echo '#define PACKAGE "BitlBee-LIBPURPLE"' >> config.h -- cgit v1.2.3