Changeset 752a591


Ignore:
Timestamp:
2008-09-05T19:54:45Z (11 years ago)
Author:
Miklos Vajna <vmiklos@…>
Branches:
master
Children:
b414e30
Parents:
ef399c2
Message:

make bitlbee dependency optional as well

this way it's possible to build bitlbee-skype on a client where only
skyped will be running, so messing with the plugin makes no sense

Location:
skype
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • skype/Makefile

    ref399c2 r752a591  
    88
    99skype.$(SHARED_EXT): skype.c config.mak
     10ifeq ($(BITLBEE),yes)
    1011        $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) skype.c $(LDFLAGS)
     12endif
    1113
    1214install: skype.$(SHARED_EXT) skyped.py
     15ifeq ($(BITLBEE),yes)
    1316        $(INSTALL) -d $(DESTDIR)$(plugindir)
    1417        $(INSTALL) skype.$(SHARED_EXT) $(DESTDIR)$(plugindir)
     18endif
    1519ifeq ($(SKYPED),yes)
    1620        $(INSTALL) -d $(DESTDIR)$(bindir)
     
    2731autogen: configure.ac
    2832        cp /usr/share/automake-$(AMVERSION)/install-sh ./
    29         cp /usr/share/aclocal/pkg.m4 aclocal.m4
    3033        autoconf
    3134
  • skype/config.mak.in

    ref399c2 r752a591  
    44SHARED_EXT = @SHARED_EXT@
    55SKYPE4PY = @SKYPE4PY@
     6BITLBEE = @BITLBEE@
    67INSTALL = @INSTALL@
    78prefix = @prefix@
  • skype/configure.ac

    ref399c2 r752a591  
    2929
    3030dnl Check for bitlbee
    31 PKG_CHECK_MODULES(BITLBEE, bitlbee)
    32 CFLAGS="$CFLAGS $BITLBEE_CFLAGS"
    33 LDFLAGS="$LDFLAGS $BITLBEE_LIBS"
    34 prefix=`$PKG_CONFIG --variable=prefix bitlbee`
     31AC_MSG_CHECKING(for BitlBee)
     32pkg-config --exists bitlbee
     33if test "$?" != "0"; then
     34        AC_MSG_RESULT(no)
     35        BITLBEE="no"
     36else
     37        AC_MSG_RESULT(yes)
     38        BITLBEE="yes"
     39        if test -z "$CFLAGS"; then
     40                CFLAGS="`pkg-config --cflags bitlbee`"
     41        else
     42                CFLAGS="$CFLAGS `pkg-config --cflags bitlbee`"
     43        fi
     44        if test -z "$LDFLAGS"; then
     45                LDFLAGS="`pkg-config --libs bitlbee`"
     46        else
     47                LDFLAGS="$LDFLAGS `pkg-config --libs bitlbee`"
     48        fi
     49        prefix=`pkg-config --variable=prefix bitlbee`
     50fi
     51AC_SUBST(BITLBEE)
    3552
    3653dnl Check for Skype4Py
     
    4663AC_SUBST(SKYPE4PY)
    4764
     65if test "$BITLBEE" = "no" -a "$SKYPE4PY" = "no"; then
     66        AC_ERROR([In order to use bitlbee-skype you need at least BitlBee or Skype4Py installed.])
     67fi
     68
    4869AC_OUTPUT(config.mak)
    4970AC_OUTPUT(skyped.conf.dist)
    5071
    5172echo "
    52         compiler flags:                 $CFLAGS
     73        BitlBee plugin:                 $BITLBEE
     74        skyped:                         $SKYPE4PY
     75        prefix:                         $prefix
     76        install program:                $INSTALL"
     77if test "$BITLBEE" = "yes"; then
     78        echo "  compiler flags:                 $CFLAGS
    5379        linker flags:                   $LDFLAGS
    5480        shared object flags:            $SHARED_FLAGS
    55         shared object extension:        $SHARED_EXT
    56         skyped:                         $SKYPE4PY
    57         install program:                $INSTALL
    58         prefix:                         $prefix
    59         sysconfig dir:                  $sysconfdir/skyped
    60 "
     81        shared object extension:        $SHARED_EXT"
     82fi
     83if test "$SKYPE4PY" = "yes"; then
     84        echo "  sysconfig dir:                  $sysconfdir/skyped"
     85fi
     86echo
Note: See TracChangeset for help on using the changeset viewer.