aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile10
-rwxr-xr-xconfigure13
2 files changed, 22 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0a3d1677..673b7559 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endif
# Expansion of variables
subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
-all: $(OUTFILE) $(OTR_PI) systemd
+all: $(OUTFILE) $(OTR_PI) $(SKYPE_PI) systemd
$(MAKE) -C doc
uninstall: uninstall-bin uninstall-doc
@@ -108,6 +108,10 @@ ifdef OTR_PI
mkdir -p $(DESTDIR)$(PLUGINDIR)
install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
endif
+ifdef SKYPE_PI
+ mkdir -p $(DESTDIR)$(PLUGINDIR)
+ install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
+endif
systemd:
ifdef SYSTEMDSYSTEMUNITDIR
@@ -140,6 +144,10 @@ $(OTR_PI): %.so: $(SRCDIR)%.c
@echo '*' Building plugin $@
@$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $< -o $@
+$(SKYPE_PI): $(SRCDIR)protocols/skype/skype.c
+ @echo '*' Building plugin skype
+ @$(CC) $(CFLAGS) -fPIC -shared $< -o $@
+
$(objects): %.o: $(SRCDIR)%.c
@echo '*' Compiling $<
@$(CC) -c $(CFLAGS) $< -o $@
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