diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-09-05 21:54:45 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2008-09-05 21:54:45 +0200 |
| commit | 69939608df5a3af1aba01bf78513137758590cf1 (patch) | |
| tree | 51255fc8a9127c207d26631881a0436ba1271014 | |
| parent | 15e220045ffd8fdc88a953cf4b4bbfc3ca1c5692 (diff) | |
check for the skype4py python module and disable skyped if not available
| -rw-r--r-- | skype/Makefile | 4 | ||||
| -rw-r--r-- | skype/config.mak.in | 1 | ||||
| -rw-r--r-- | skype/configure.ac | 14 |
3 files changed, 18 insertions, 1 deletions
diff --git a/skype/Makefile b/skype/Makefile index 8d1fb153..fd298f20 100644 --- a/skype/Makefile +++ b/skype/Makefile @@ -11,14 +11,16 @@ skype.$(SHARED_EXT): skype.c config.mak install: skype.$(SHARED_EXT) skyped.py $(INSTALL) -d $(DESTDIR)$(plugindir) + $(INSTALL) skype.$(SHARED_EXT) $(DESTDIR)$(plugindir) +ifeq ($(SKYPED),yes) $(INSTALL) -d $(DESTDIR)$(bindir) $(INSTALL) -d $(DESTDIR)$(sysconfdir) - $(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 sed -i 's|$${prefix}|$(prefix)|' $(DESTDIR)$(sysconfdir)/skyped.conf $(INSTALL) -m644 skyped.cnf $(DESTDIR)$(sysconfdir) +endif client: client.c diff --git a/skype/config.mak.in b/skype/config.mak.in index 5f06a5b9..e133ed87 100644 --- a/skype/config.mak.in +++ b/skype/config.mak.in @@ -2,6 +2,7 @@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ SHARED_FLAGS = @SHARED_FLAGS@ SHARED_EXT = @SHARED_EXT@ +SKYPE4PY = @SKYPE4PY@ INSTALL = @INSTALL@ prefix = @prefix@ sysconfdir = @sysconfdir@/skyped diff --git a/skype/configure.ac b/skype/configure.ac index 4fefe614..a168d5ac 100644 --- a/skype/configure.ac +++ b/skype/configure.ac @@ -32,6 +32,19 @@ PKG_CHECK_MODULES(BITLBEE, bitlbee) CFLAGS="$CFLAGS $BITLBEE_CFLAGS" LDFLAGS="$LDFLAGS $BITLBEE_LIBS" prefix=`$PKG_CONFIG --variable=prefix bitlbee` + +dnl Check for Skype4Py +AC_MSG_CHECKING(for Python module Skype4Py) +python -c "import Skype4Py" +if test "$?" != "0"; then + AC_MSG_RESULT(no) + SKYPE4PY="no" +else + AC_MSG_RESULT(yes) + SKYPE4PY="yes" +fi +AC_SUBST(SKYPE4PY) + AC_OUTPUT(config.mak) AC_OUTPUT(skyped.conf.dist) @@ -40,6 +53,7 @@ echo " linker flags: $LDFLAGS shared object flags: $SHARED_FLAGS shared object extension: $SHARED_EXT + skyped: $SKYPE4PY install program: $INSTALL prefix: $prefix sysconfig dir: $sysconfdir/skyped |