diff options
| author | Marius Halden <marius.h@lden.org> | 2016-11-19 10:32:18 +0100 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-11-19 10:32:18 +0100 |
| commit | 08e1027c558a25b0b4f9410048c185e89c7b347a (patch) | |
| tree | c9c80be4e9984bfc52835b0eac0895f6dfc81b14 /configure | |
| parent | ad5637a3fe2f8e25a88d910041791336e0c62271 (diff) | |
| parent | 11d4123fe9a4d88d475bee6c623fb80af8fdbb0b (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 17 |
1 files changed, 3 insertions, 14 deletions
@@ -34,7 +34,6 @@ configure_args="$@" msn="default-on" jabber="default-on" oscar="default-on" -yahoo="default-on" twitter=1 purple=0 @@ -130,7 +129,6 @@ Option Description Default --msn=0/1 Disable/enable MSN part $msn --jabber=0/1 Disable/enable Jabber part $jabber --oscar=0/1 Disable/enable Oscar part (ICQ, AIM) $oscar ---yahoo=0/1 Disable/enable Yahoo part $yahoo --twitter=0/1 Disable/enable Twitter part $twitter --purple=0/1 Disable/enable libpurple support $purple @@ -823,10 +821,9 @@ EOF protoobjs=$protoobjs'purple_mod.o ' # 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 + [ "$msn" = "default-on" ] && msn=0 + [ "$jabber" = "default-on" ] && jabber=0 + [ "$oscar" = "default-on" ] && oscar=0 #echo '#undef PACKAGE' >> config.h #echo '#define PACKAGE "BitlBee-LIBPURPLE"' >> config.h @@ -871,14 +868,6 @@ else protoobjs=$protoobjs'oscar_mod.o ' fi -if [ "$yahoo" = 0 ]; then - echo '#undef WITH_YAHOO' >> config.h -else - echo '#define WITH_YAHOO' >> config.h - protocols=$protocols'yahoo ' - protoobjs=$protoobjs'yahoo_mod.o ' -fi - if [ "$twitter" = 0 ]; then echo '#undef WITH_TWITTER' >> config.h else |