Changeset c8b8c83 for configure

Timestamp:

2011-07-24T12:51:00Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3d952b5

Parents:

a010498 (diff), 17f6079 (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:

Merging Skype plugin. Many thanks to Miklos Vajna for all his work on this,
having this distributed together with BitlBee will hopefully make up for the
fact that BitlBee has poor binary API backward compatibility.

File:

• configure (modified) (5 diffs)

configure

@@ -36 +36 @@
 plugins=1
 otr=0
+skype=0
 
 events=glib
@@ -83 +84 @@
 --otr=0/1/auto/plugin
                 Disable/enable OTR encryption support   $otr
+--skype=0/1/plugin
+                Disable/enable Skype support            $skype
 
 --events=...    Event handler (glib, libevent)          $events
@@ -109 +112 @@
 ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
 pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
+
+protocols_mods=""
 
 cat<<EOF>Makefile.settings
@@ -538 +543 @@
 fi
 
+if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
+        echo 'SKYPE_PI=skype.so' >> Makefile.settings
+        protocols_mods="$protocol_mods skype(plugin)"
+fi
+
 if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
         echo
@@ -751 +761 @@
 
 if [ -n "$protocols" ]; then
-        echo '  Building with these protocols:' $protocols
+        echo '  Building with these protocols:' $protocols$protocols_mods
         case "$protocols" in
         *purple*)