Changeset 3f44e43 for configure


Ignore:
Timestamp:
2016-11-21T07:49:26Z (5 years ago)
Author:
dequis <dx@…>
Children:
7a9d968
Parents:
537d9b9 (diff), 5a8afc3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into parson

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r537d9b9 r3f44e43  
    3636jabber="default-on"
    3737oscar="default-on"
    38 yahoo="default-on"
    3938
    4039twitter=1
     
    133132--jabber=0/1    Disable/enable Jabber part              $jabber
    134133--oscar=0/1     Disable/enable Oscar part (ICQ, AIM)    $oscar
    135 --yahoo=0/1     Disable/enable Yahoo part               $yahoo
    136134--twitter=0/1   Disable/enable Twitter part             $twitter
    137135
     
    837835        [ "$jabber" = "default-on" ] && jabber=0
    838836        [ "$oscar" = "default-on" ] && oscar=0
    839         [ "$yahoo" = "default-on" ] && yahoo=0
    840837
    841838        echo '#undef PACKAGE' >> config.h
     
    880877        protocols=$protocols'oscar '
    881878        protoobjs=$protoobjs'oscar_mod.o '
    882 fi
    883 
    884 if [ "$yahoo" = 0 ]; then
    885         echo '#undef WITH_YAHOO' >> config.h
    886 else
    887         echo '#define WITH_YAHOO' >> config.h
    888         protocols=$protocols'yahoo '
    889         protoobjs=$protoobjs'yahoo_mod.o '
    890879fi
    891880
Note: See TracChangeset for help on using the changeset viewer.