Changeset 3f44e43 for configure

Timestamp:

2016-11-21T07:49:26Z (8 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:

• configure (modified) (4 diffs)

configure

@@ -36 +36 @@
 jabber="default-on"
 oscar="default-on"
-yahoo="default-on"
 
 twitter=1
@@ -133 +132 @@
 --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
 
@@ -837 +835 @@
         [ "$jabber" = "default-on" ] && jabber=0
         [ "$oscar" = "default-on" ] && oscar=0
-        [ "$yahoo" = "default-on" ] && yahoo=0
 
         echo '#undef PACKAGE' >> config.h
@@ -880 +877 @@
         protocols=$protocols'oscar '
         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