Changeset 04e2a05

Timestamp:

2014-06-26T08:07:11Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

4e4fa93

Parents:

b95b0c8

Message:

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;

File:

• configure (modified) (2 diffs)

configure

@@ -24 +24 @@
 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
@@ -602 +608 @@
         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