Changeset a85a8ab

Timestamp:

2015-02-23T04:50:32Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

a67e781

Parents:

570f183

Message:

Add --doc= configure option to disable helpfile generation

It will get disabled automatically if the deps (xmlto and xsltproc)
are missing

Also added checks for asciidoc (a2x) for the skype plugin, which needs
it for the skyped man page, and will also get that disabled if --doc=0
is passed or if asciidoc isn't installed.

This should keep those ugly deps under control for now.

I'd like to replace them at some point with something less dumb.

Files:

• Makefile (modified) (3 diffs)
• configure (modified) (4 diffs)
• doc/Makefile (modified) (2 diffs)
• protocols/skype/Makefile (modified) (2 diffs)

Makefile

@@ -25 +25 @@
 
 doc:
+ifdef DOC
         $(MAKE) -C doc
+endif
 
 uninstall: uninstall-bin uninstall-doc 
@@ -73 +75 @@
 
 install-doc:
+ifdef DOC
         $(MAKE) -C doc install
+endif
 ifdef SKYPE_PI
         $(MAKE) -C protocols/skype install-doc
@@ -79 +83 @@
 
 uninstall-doc:
+ifdef DOC
         $(MAKE) -C doc uninstall
+endif
 ifdef SKYPE_PI
         $(MAKE) -C protocols/skype uninstall-doc

configure

@@ -37 +37 @@
 purple=0
 
+doc=1
 debug=0
 strip=1
@@ -59 +60 @@
 # Cygwin and Darwin don't support PIC/PIE
 case "$arch" in
-    CYGWIN* )
-        pie=0;;
-    Darwin )
-        pie=0;;
+        CYGWIN* )
+                pie=0;;
+        Darwin )
+                pie=0;;
 esac
 
@@ -94 +95 @@
                 (automatically disables other protocol modules)
 
+--doc=0/1       Disable/enable help.txt generation      $doc
 --debug=0/1     Disable/enable debugging                $debug
 --strip=0/1     Disable/enable binary stripping         $strip
@@ -647 +649 @@
 fi
 
-if [ ! -e doc/user-guide/help.txt ] && ! type xmlto > /dev/null 2> /dev/null; then
-        echo
-        echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.'
-        echo 'Install xmlto if you want online help to work.'
+if [ "$doc" = "1" ]; then
+        if [ ! -e doc/user-guide/help.txt ] && \
+             ! type xmlto > /dev/null 2> /dev/null || \
+             ! type xsltproc > /dev/null 2> /dev/null
+        then
+                echo
+                echo 'WARNING: Building from an unreleased source tree without prebuilt helpfile.'
+                echo 'Install xmlto and xsltproc if you want online help to work.'
+        else
+                echo "DOC=1" >> Makefile.settings
+        fi
+
+        if [ "$skype" = "1" -o "$skype" = "plugin" ]; then
+                # skype also needs asciidoc
+                if ! type a2x > /dev/null 2> /dev/null; then
+                        echo
+                        echo 'WARNING: The skyped man page requires asciidoc. It will not be generated.'
+                else
+                        echo "ASCIIDOC=1" >> Makefile.settings
+                fi
+        fi
 fi
 

doc/Makefile

@@ -6 +6 @@
 all:
         # Only build the docs if this is a git tree
-        -test ! '(' -d ../.git -o -d ../.bzr ')' || $(MAKE) -C user-guide
+        test ! '(' -d ../.git -o -d ../.bzr ')' || $(MAKE) -C user-guide
 
 install:
@@ -12 +12 @@
         $(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.8 $(DESTDIR)$(MANDIR)/man8/
         $(INSTALL) -m 0644 $(_SRCDIR_)bitlbee.conf.5 $(DESTDIR)$(MANDIR)/man5/
-        -$(MAKE) -C user-guide $@
+        $(MAKE) -C user-guide $@
 
 uninstall:

protocols/skype/Makefile

@@ -6 +6 @@
 DATE := $(shell date +%Y-%m-%d)
 INSTALL = install
-ASCIIDOC = yes
 
-ifeq ($(ASCIIDOC),yes)
+
+ifdef ASCIIDOC
 MANPAGES = skyped.1
 else
@@ -29 +29 @@
 
 install-doc: doc
-ifeq ($(ASCIIDOC),yes)
+ifdef ASCIIDOC
         $(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
         $(INSTALL) -m644 $(MANPAGES) $(DESTDIR)$(MANDIR)/man1