Changeset 69939608


Ignore:
Timestamp:
2008-09-05T19:54:45Z (11 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:
3 edited

Legend:

Unmodified
Added
Removed
  • skype/Makefile

    r15e2200 r69939608  
    1212install: skype.$(SHARED_EXT) skyped.py
    1313        $(INSTALL) -d $(DESTDIR)$(plugindir)
     14        $(INSTALL) skype.$(SHARED_EXT) $(DESTDIR)$(plugindir)
     15ifeq ($(SKYPED),yes)
    1416        $(INSTALL) -d $(DESTDIR)$(bindir)
    1517        $(INSTALL) -d $(DESTDIR)$(sysconfdir)
    16         $(INSTALL) skype.$(SHARED_EXT) $(DESTDIR)$(plugindir)
    1718        $(INSTALL) skyped.py $(DESTDIR)$(bindir)/skyped
    1819        sed -i 's|/usr/local/etc/skyped|$(sysconfdir)|' $(DESTDIR)$(bindir)/skyped
     
    2021        sed -i 's|$${prefix}|$(prefix)|' $(DESTDIR)$(sysconfdir)/skyped.conf
    2122        $(INSTALL) -m644 skyped.cnf $(DESTDIR)$(sysconfdir)
     23endif
    2224
    2325client: client.c
  • skype/config.mak.in

    r15e2200 r69939608  
    33SHARED_FLAGS = @SHARED_FLAGS@
    44SHARED_EXT = @SHARED_EXT@
     5SKYPE4PY = @SKYPE4PY@
    56INSTALL = @INSTALL@
    67prefix = @prefix@
  • skype/configure.ac

    r15e2200 r69939608  
    3333LDFLAGS="$LDFLAGS $BITLBEE_LIBS"
    3434prefix=`$PKG_CONFIG --variable=prefix bitlbee`
     35
     36dnl Check for Skype4Py
     37AC_MSG_CHECKING(for Python module Skype4Py)
     38python -c "import Skype4Py"
     39if test "$?" != "0"; then
     40        AC_MSG_RESULT(no)
     41        SKYPE4PY="no"
     42else
     43        AC_MSG_RESULT(yes)
     44        SKYPE4PY="yes"
     45fi
     46AC_SUBST(SKYPE4PY)
     47
    3548AC_OUTPUT(config.mak)
    3649AC_OUTPUT(skyped.conf.dist)
     
    4154        shared object flags:            $SHARED_FLAGS
    4255        shared object extension:        $SHARED_EXT
     56        skyped:                         $SKYPE4PY
    4357        install program:                $INSTALL
    4458        prefix:                         $prefix
Note: See TracChangeset for help on using the changeset viewer.