From 370899f9368cdcb0bb43fd1510b0ea44c08027ec Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Tue, 12 Apr 2011 02:16:35 +0200
Subject: Add build system support for building the skype plugin

---
 configure | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 77dc560a..535ca0d3 100755
--- a/configure
+++ b/configure
@@ -35,6 +35,7 @@ strip=1
 gcov=0
 plugins=1
 otr=0
+skype=0
 
 events=glib
 ldap=0
@@ -82,6 +83,8 @@ 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
+		Disable/enable Skype support		$skype
 
 --events=...	Event handler (glib, libevent)		$events
 --ssl=...	SSL library to use (gnutls, nss, openssl, bogus, auto)
@@ -537,6 +540,10 @@ elif [ "$otr" = "plugin" ]; then
 	echo 'OTR_PI=otr.so' >> Makefile.settings
 fi
 
+if [ "$skype" = "plugin" ]; then
+	echo 'SKYPE_PI=skype.so' >> Makefile.settings
+fi
+
 if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
 	echo
 	echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.'
@@ -739,6 +746,12 @@ else
 	echo '  Off-the-Record (OTR) Messaging disabled.'
 fi
 
+if [ "$skype" = "plugin" ]; then
+	echo '  Skype enabled (as a plugin).'
+else
+	echo '  Skype disabled.'
+fi
+
 if [ -n "$systemdsystemunitdir" ]; then
 	echo '  systemd enabled.'
 else
-- 
cgit v1.2.3


From 66911fce6dc03b0af96c9e04975b6147ae27b6c7 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Thu, 30 Jun 2011 01:29:01 +0200
Subject: configure: --skype=plugin -> --skype=1

---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 535ca0d3..367dd44c 100755
--- a/configure
+++ b/configure
@@ -540,7 +540,7 @@ elif [ "$otr" = "plugin" ]; then
 	echo 'OTR_PI=otr.so' >> Makefile.settings
 fi
 
-if [ "$skype" = "plugin" ]; then
+if [ "$skype" = "1" ]; then
 	echo 'SKYPE_PI=skype.so' >> Makefile.settings
 fi
 
@@ -746,7 +746,7 @@ else
 	echo '  Off-the-Record (OTR) Messaging disabled.'
 fi
 
-if [ "$skype" = "plugin" ]; then
+if [ "$skype" = "1" ]; then
 	echo '  Skype enabled (as a plugin).'
 else
 	echo '  Skype disabled.'
-- 
cgit v1.2.3


From 17f6079a06eaed2fba1da999332e9e5ac1dbc2a6 Mon Sep 17 00:00:00 2001
From: Wilmer van der Gaast <wilmer@gaast.net>
Date: Sun, 24 Jul 2011 13:50:21 +0100
Subject: Small changes to --skype= flag behaviour in configure script.

---
 configure | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'configure')

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"
-- 
cgit v1.2.3