Changeset c8b8c83

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.

Files:

• Makefile (modified) (4 diffs)
• configure (modified) (5 diffs)
• protocols/skype/.bzrignore (added)
• protocols/skype/.mailmap (added)
• protocols/skype/HACKING (added)
• protocols/skype/Makefile (added)
• protocols/skype/NEWS (added)
• protocols/skype/README (added)
• protocols/skype/asciidoc.conf (added)
• protocols/skype/client.sh (added)
• protocols/skype/skype.c (added)
• protocols/skype/skyped.cnf (added)
• protocols/skype/skyped.py (added)
• protocols/skype/skyped.txt (added)
• protocols/skype/t/Makefile (added)
• protocols/skype/t/bitlbee.conf (added)
• protocols/skype/t/irssi/livetest-irssi.sh (added)
• protocols/skype/t/irssi/skype-call.test (added)
• protocols/skype/t/irssi/skype-info.test (added)
• protocols/skype/t/irssi/skype-login.test (added)
• protocols/skype/t/irssi/skype-msg.test (added)
• protocols/skype/t/irssi/trigger.pl (added)
• protocols/skype/t/livetest-bitlbee.sh (added)

Makefile

@@ -27 +27 @@
 subdirobjs = $(foreach dir,$(subdirs),$(dir)/$(dir).o)
 
-all: $(OUTFILE) $(OTR_PI) systemd
+all: $(OUTFILE) $(OTR_PI) $(SKYPE_PI) systemd
         $(MAKE) -C doc
+ifdef SKYPE_PI
+        $(MAKE) -C protocols/skype doc
+endif
 
 uninstall: uninstall-bin uninstall-doc 
@@ -71 +74 @@
 install-doc:
         $(MAKE) -C doc install
+ifdef SKYPE_PI
+        $(MAKE) -C protocols/skype install-doc
+endif
 
 uninstall-doc:
         $(MAKE) -C doc uninstall
+ifdef SKYPE_PI
+        $(MAKE) -C protocols/skype uninstall-doc
+endif
 
 install-bin:
@@ -109 +118 @@
         install -m 0755 otr.so $(DESTDIR)$(PLUGINDIR)
 endif
+ifdef SKYPE_PI
+        mkdir -p $(DESTDIR)$(PLUGINDIR)
+        install -m 0755 skype.so $(DESTDIR)$(PLUGINDIR)
+        mkdir -p $(DESTDIR)$(ETCDIR)/../skyped
+        install -m 0644 $(SRCDIR)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
+        install -m 0644 $(SRCDIR)protocols/skype/skyped.conf $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
+        install -m 0755 $(SRCDIR)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
+endif
 
 systemd:
@@ -141 +158 @@
         @$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@
 
+$(SKYPE_PI): $(SRCDIR)protocols/skype/skype.c
+        @echo '*' Building plugin skype
+        @$(CC) $(CFLAGS) -fPIC -shared $< -o $@
+
 $(objects): %.o: $(SRCDIR)%.c
         @echo '*' Compiling $<

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*)