Ticket #731: purple-configure-patch.diff

File purple-configure-patch.diff, 1.2 KB (added by dx, at 2014-02-04T06:26:37Z)

Just adding here my version of the patch (which i wrote a few months ago)

  • configure 

    diff --git a/configure b/configure
index 1e3a242..2999abe 100755
    a b ipcsocket='' 
    2323pcdir='$prefix/lib/pkgconfig'
    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
    3238
    … … EOF 
    594600        protocols=$protocols'purple '
    595601        protoobjs=$protoobjs'purple_mod.o '
    596602
    597         # Having both libpurple and native IM modules in one binary may
    598         # do strange things. Let's not do that.
    599         msn=0
    600         jabber=0
    601         oscar=0
    602         yahoo=0
     603        # only disable these if the user didn't enable them explicitly
     604        [ "$msn" = "default-on" ] && msn=0
     605        [ "$jabber" = "default-on" ] && jabber=0
     606        [ "$oscar" = "default-on" ] && oscar=0
     607        [ "$yahoo" = "default-on" ] && yahoo=0
    603608
    604609        echo '#undef PACKAGE' >> config.h
    605610        echo '#define PACKAGE "BitlBee-LIBPURPLE"' >> config.h