Changeset 04e2a05


Ignore:
Timestamp:
2014-06-26T08:07:11Z (5 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:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    rb95b0c8 r04e2a05  
    2424systemlibdirs="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib"
    2525
    26 msn=1
    27 jabber=1
    28 oscar=1
    29 yahoo=1
     26# Set these to default-on to let it be overriden by either the user or purple
     27#
     28# If the user sets one of these to 1, purple won't disable them.
     29# Otherwise, if it's still default-on, it gets included in normal builds,
     30# but not purple ones.
     31msn="default-on"
     32jabber="default-on"
     33oscar="default-on"
     34yahoo="default-on"
     35
    3036twitter=1
    3137purple=0
     
    602608        protoobjs=$protoobjs'purple_mod.o '
    603609
    604         # Having both libpurple and native IM modules in one binary may
    605         # do strange things. Let's not do that.
    606         msn=0
    607         jabber=0
    608         oscar=0
    609         yahoo=0
     610        # only disable these if the user didn't enable them explicitly
     611        [ "$msn" = "default-on" ] && msn=0
     612        [ "$jabber" = "default-on" ] && jabber=0
     613        [ "$oscar" = "default-on" ] && oscar=0
     614        [ "$yahoo" = "default-on" ] && yahoo=0
    610615
    611616        echo '#undef PACKAGE' >> config.h
Note: See TracChangeset for help on using the changeset viewer.