Changeset 17f6079

Timestamp:

2011-07-24T12:50:21Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c8b8c83

Parents:

b518cdc

Message:

Small changes to --skype= flag behaviour in configure script.

File:

• configure (modified) (5 diffs)

configure

@@ -84 +84 @@
 --otr=0/1/auto/plugin
                 Disable/enable OTR encryption support   $otr
---skype=0/plugin
+--skype=0/1/plugin
                 Disable/enable Skype support            $skype
 
@@ -112 +112 @@
 ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
 pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
+
+protocols_mods=""
 
 cat<<EOF>Makefile.settings
@@ -541 +543 @@
 fi
 
-if [ "$skype" = "1" ]; then
+if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
         echo 'SKYPE_PI=skype.so' >> Makefile.settings
+        protocols_mods="$protocol_mods skype(plugin)"
 fi
 
@@ -747 +750 @@
 fi
 
-if [ "$skype" = "1" ]; then
-        echo '  Skype enabled (as a plugin).'
-else
-        echo '  Skype disabled.'
-fi
-
 if [ -n "$systemdsystemunitdir" ]; then
         echo '  systemd enabled.'
@@ -764 +761 @@
 
 if [ -n "$protocols" ]; then
-        echo '  Building with these protocols:' $protocols
+        echo '  Building with these protocols:' $protocols$protocols_mods
         case "$protocols" in
         *purple*)