Changeset 69939608

Timestamp:

2008-09-05T19:54:45Z (16 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

ef399c2

Parents:

15e2200

Message:

check for the skype4py python module and disable skyped if not available

Location:

skype

Files:

• Makefile (modified) (2 diffs)
• config.mak.in (modified) (1 diff)
• configure.ac (modified) (2 diffs)

skype/Makefile

@@ -12 +12 @@
 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
@@ -20 +21 @@
         sed -i 's|$${prefix}|$(prefix)|' $(DESTDIR)$(sysconfdir)/skyped.conf
         $(INSTALL) -m644 skyped.cnf $(DESTDIR)$(sysconfdir)
+endif
 
 client: client.c

skype/config.mak.in

@@ -3 +3 @@
 SHARED_FLAGS = @SHARED_FLAGS@
 SHARED_EXT = @SHARED_EXT@
+SKYPE4PY = @SKYPE4PY@
 INSTALL = @INSTALL@
 prefix = @prefix@

skype/configure.ac

@@ -33 +33 @@
 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)
@@ -41 +54 @@
         shared object flags:            $SHARED_FLAGS
         shared object extension:        $SHARED_EXT
+        skyped:                         $SKYPE4PY
         install program:                $INSTALL
         prefix:                         $prefix