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

1 files changed, 6 insertions, 9 deletions

diff --git a/configure b/configure
index 367dd44c..c10b1f6b 100755
--- a/configure
+++ b/configure
@@ -83,7 +83,7 @@ Option		Description				Default
 --plugins=0/1	Disable/enable plugins support		$plugins
 --otr=0/1/auto/plugin
 		Disable/enable OTR encryption support	$otr
---skype=0/plugin
+--skype=0/1/plugin
 		Disable/enable Skype support		$skype
 
 --events=...	Event handler (glib, libevent)		$events
@@ -112,6 +112,8 @@ pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
 ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
 pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
 
+protocols_mods=""
+
 cat<<EOF>Makefile.settings
 ## BitlBee settings, generated by configure
 PREFIX=$prefix
@@ -540,8 +542,9 @@ elif [ "$otr" = "plugin" ]; then
 	echo 'OTR_PI=otr.so' >> Makefile.settings
 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
 
 if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
@@ -746,12 +749,6 @@ else
 	echo '  Off-the-Record (OTR) Messaging disabled.'
 fi
 
-if [ "$skype" = "1" ]; then
-	echo '  Skype enabled (as a plugin).'
-else
-	echo '  Skype disabled.'
-fi
-
 if [ -n "$systemdsystemunitdir" ]; then
 	echo '  systemd enabled.'
 else
@@ -763,7 +760,7 @@ echo '  Using SSL library: '$ssl
 #echo '  Building with these storage backends: '$STORAGES
 
 if [ -n "$protocols" ]; then
-	echo '  Building with these protocols:' $protocols
+	echo '  Building with these protocols:' $protocols$protocols_mods
 	case "$protocols" in
 	*purple*)
 		echo "    Note that BitlBee-libpurple is supported on a best-effort basis. It's"