diff options
| -rw-r--r-- | skype/Makefile | 10 | ||||
| -rw-r--r-- | skype/README | 4 | ||||
| -rw-r--r-- | skype/config.mak.in | 2 | ||||
| -rw-r--r-- | skype/configure.ac | 16 |
4 files changed, 25 insertions, 7 deletions
diff --git a/skype/Makefile b/skype/Makefile index f1c0f45f..0f3c3f9b 100644 --- a/skype/Makefile +++ b/skype/Makefile @@ -4,14 +4,14 @@ VERSION = 0.4.0 AMVERSION = $(shell automake --version|sed 's/.* //;s/\([0-9]\+\.[0-9]\+\)\.[0-9]\+/\1/;q') -skype.so: skype.c config.mak - $(CC) $(CFLAGS) -shared -o skype.so skype.c $(LDFLAGS) +skype.$(SHARED_EXT): skype.c config.mak + $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) skype.c $(LDFLAGS) -install: skype.so skyped.py +install: skype.$(SHARED_EXT) skyped.py $(INSTALL) -d $(DESTDIR)$(plugindir) $(INSTALL) -d $(DESTDIR)$(bindir) $(INSTALL) -d $(DESTDIR)$(sysconfdir) - $(INSTALL) skype.so $(DESTDIR)$(plugindir) + $(INSTALL) skype.$(SHARED_EXT) $(DESTDIR)$(plugindir) $(INSTALL) skyped.py $(DESTDIR)$(bindir)/skyped sed -i 's|/usr/local/etc/skyped|$(sysconfdir)|' $(DESTDIR)$(bindir)/skyped $(INSTALL) -m644 skyped.conf.dist $(DESTDIR)$(sysconfdir)/skyped.conf @@ -25,7 +25,7 @@ prepare: configure.ac autoconf clean: - rm -f skype.so + rm -f skype.$(SHARED_EXT) distclean: clean rm -rf autom4te.cache config.log config.mak config.status diff --git a/skype/README b/skype/README index 00346539..b05e4eb5 100644 --- a/skype/README +++ b/skype/README @@ -36,8 +36,8 @@ not..) * PyGObject >= 2.8.0. Older versions are part of PyGTK. (And you don't want to install GTK for nothing, right?) -`bitlbee-skype` has been tested under Linux and Windows. Skype and Skype4py is -available under OSX, too, so it probably works, but this has not been tested. +`bitlbee-skype` has been tested under Linux and Mac OS X. Skype and Skype4py is +available under Windows, too, so it probably works, but this has not been tested. == How to set it up diff --git a/skype/config.mak.in b/skype/config.mak.in index 7a63bf35..5f06a5b9 100644 --- a/skype/config.mak.in +++ b/skype/config.mak.in @@ -1,5 +1,7 @@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ +SHARED_FLAGS = @SHARED_FLAGS@ +SHARED_EXT = @SHARED_EXT@ INSTALL = @INSTALL@ prefix = @prefix@ sysconfdir = @sysconfdir@/skyped diff --git a/skype/configure.ac b/skype/configure.ac index 08ba6f91..e169ad69 100644 --- a/skype/configure.ac +++ b/skype/configure.ac @@ -11,6 +11,22 @@ else AC_MSG_RESULT(no) fi +case "`$CC -dumpmachine`" in + *linux*) + SHARED_FLAGS="-shared" + SHARED_EXT="so" + ;; + *apple-darwin*) + SHARED_FLAGS="-dynamiclib -Wl,-headerpad_max_install_names,-undefined,dynamic_lookup" + SHARED_EXT="dynlib" + ;; + *) + AC_MSG_ERROR([Your machine is not yet supported]) + ;; +esac +AC_SUBST(SHARED_FLAGS) +AC_SUBST(SHARED_EXT) + dnl Check for bitlbee PKG_CHECK_MODULES(BITLBEE, bitlbee) CFLAGS="$CFLAGS $BITLBEE_CFLAGS" |