diff options
| -rw-r--r-- | skype/Makefile | 12 | ||||
| -rw-r--r-- | skype/config.mak.in | 1 | ||||
| -rw-r--r-- | skype/configure.ac | 6 |
3 files changed, 17 insertions, 2 deletions
diff --git a/skype/Makefile b/skype/Makefile index 30094892..04e532e5 100644 --- a/skype/Makefile +++ b/skype/Makefile @@ -12,12 +12,20 @@ ifeq ($(AMPATH),) AMPATH = $(shell find /usr/share/ -maxdepth 1 -name 'automake-*'|tail -n 1) endif +ifeq ($(ASCIIDOC),yes) +MANPAGES = skyped.1 +else +MANPAGES = +endif + ifeq ($(BITLBEE),yes) -all: skype.$(SHARED_EXT) skyped.1 +LIBS = skype.$(SHARED_EXT) else -all: skyped.1 +LIBS = endif +all: $(LIBS) $(MANPAGES) + skype.$(SHARED_EXT): skype.c config.mak ifeq ($(BITLBEE),yes) $(CC) $(CFLAGS) $(SHARED_FLAGS) -o skype.$(SHARED_EXT) skype.c $(LDFLAGS) diff --git a/skype/config.mak.in b/skype/config.mak.in index 443343c5..ceea7691 100644 --- a/skype/config.mak.in +++ b/skype/config.mak.in @@ -4,6 +4,7 @@ SHARED_FLAGS = @SHARED_FLAGS@ SHARED_EXT = @SHARED_EXT@ SKYPE4PY = @SKYPE4PY@ BITLBEE = @BITLBEE@ +ASCIIDOC = @ASCIIDOC@ INSTALL = @INSTALL@ prefix = @prefix@ sysconfdir = @sysconfdir@/skyped diff --git a/skype/configure.ac b/skype/configure.ac index 16bdfd1d..f04a8e7c 100644 --- a/skype/configure.ac +++ b/skype/configure.ac @@ -54,6 +54,12 @@ else fi AC_SUBST(BITLBEE) +dnl Check for a2x +AC_ARG_ENABLE([asciidoc], AS_HELP_STRING([--disable-asciidoc], [Disable asciidoc support (default: test)])) +if test "$enable_asciidoc" != "no"; then + AC_CHECK_PROG(ASCIIDOC, asciidoc, yes, []) +fi + dnl Check for Skype4Py AC_MSG_CHECKING(for Python module Skype4Py) python -c "import Skype4Py" 2>&AS_MESSAGE_LOG_FD |