Changeset 752a591

Timestamp:

2008-09-05T19:54:45Z (16 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:

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

skype/Makefile

@@ -8 +8 @@
 
 skype.$(SHARED_EXT): skype.c config.mak
+ifeq ($(BITLBEE),yes)
         $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) skype.c $(LDFLAGS)
+endif
 
 install: skype.$(SHARED_EXT) skyped.py
+ifeq ($(BITLBEE),yes)
         $(INSTALL) -d $(DESTDIR)$(plugindir)
         $(INSTALL) skype.$(SHARED_EXT) $(DESTDIR)$(plugindir)
+endif
 ifeq ($(SKYPED),yes)
         $(INSTALL) -d $(DESTDIR)$(bindir)
@@ -27 +31 @@
 autogen: configure.ac
         cp /usr/share/automake-$(AMVERSION)/install-sh ./
-        cp /usr/share/aclocal/pkg.m4 aclocal.m4
         autoconf
 

skype/config.mak.in

@@ -4 +4 @@
 SHARED_EXT = @SHARED_EXT@
 SKYPE4PY = @SKYPE4PY@
+BITLBEE = @BITLBEE@
 INSTALL = @INSTALL@
 prefix = @prefix@

skype/configure.ac

@@ -29 +29 @@
 
 dnl Check for bitlbee
-PKG_CHECK_MODULES(BITLBEE, bitlbee)
-CFLAGS="$CFLAGS $BITLBEE_CFLAGS"
-LDFLAGS="$LDFLAGS $BITLBEE_LIBS"
-prefix=`$PKG_CONFIG --variable=prefix bitlbee`
+AC_MSG_CHECKING(for BitlBee)
+pkg-config --exists bitlbee
+if test "$?" != "0"; then
+        AC_MSG_RESULT(no)
+        BITLBEE="no"
+else
+        AC_MSG_RESULT(yes)
+        BITLBEE="yes"
+        if test -z "$CFLAGS"; then
+                CFLAGS="`pkg-config --cflags bitlbee`"
+        else
+                CFLAGS="$CFLAGS `pkg-config --cflags bitlbee`"
+        fi
+        if test -z "$LDFLAGS"; then
+                LDFLAGS="`pkg-config --libs bitlbee`"
+        else
+                LDFLAGS="$LDFLAGS `pkg-config --libs bitlbee`"
+        fi
+        prefix=`pkg-config --variable=prefix bitlbee`
+fi
+AC_SUBST(BITLBEE)
 
 dnl Check for Skype4Py
@@ -46 +63 @@
 AC_SUBST(SKYPE4PY)
 
+if test "$BITLBEE" = "no" -a "$SKYPE4PY" = "no"; then
+        AC_ERROR([In order to use bitlbee-skype you need at least BitlBee or Skype4Py installed.])
+fi
+
 AC_OUTPUT(config.mak)
 AC_OUTPUT(skyped.conf.dist)
 
 echo "
-        compiler flags:                 $CFLAGS
+        BitlBee plugin:                 $BITLBEE
+        skyped:                         $SKYPE4PY
+        prefix:                         $prefix
+        install program:                $INSTALL"
+if test "$BITLBEE" = "yes"; then
+        echo "  compiler flags:                 $CFLAGS
         linker flags:                   $LDFLAGS
         shared object flags:            $SHARED_FLAGS
-        shared object extension:        $SHARED_EXT
-        skyped:                         $SKYPE4PY
-        install program:                $INSTALL
-        prefix:                         $prefix
-        sysconfig dir:                  $sysconfdir/skyped
-"
+        shared object extension:        $SHARED_EXT"
+fi
+if test "$SKYPE4PY" = "yes"; then
+        echo "  sysconfig dir:                  $sysconfdir/skyped"
+fi
+echo