From be4324bd784c540dd352e5bf43c0ef7ebaeae387 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 31 Dec 2011 01:09:51 +0100 Subject: [PATCH] build system: Check for a2x and xsltproc. If these tools are not found, don't try to build the documentation. --- Makefile.am | 5 ++++- configure.ac | 26 ++++++++++++++++++++++++++ doc/Makefile.am | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 61071f0..28f1bbd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,7 @@ -SUBDIRS = doc src +SUBDIRS = src +if BUILD_DOCUMENTATION +SUBDIRS += doc +endif EXTRA_DIST = autogen.sh version-gen.sh diff --git a/configure.ac b/configure.ac index ec99e90..3ef8703 100644 --- a/configure.ac +++ b/configure.ac @@ -180,6 +180,25 @@ AC_SUBST([STRICT_CFLAGS]) AC_CHECK_HEADERS(libgen.h) dnl Check for dependencies. +build_documentation="yes" + +have_xsltproc="yes" +AC_PATH_PROG([XSLTPROC], [xsltproc]) +if test "x$XSLTPROC" = "x"; then + have_xsltproc="no" + build_documentation="no (missing xsltproc)" +fi + +have_a2x="yes" +AC_PATH_PROG([A2X], [a2x]) +if test "x$A2X" = "x"; then + have_a2x="no" + build_documentation="no (missing a2x)" +fi +AC_SUBST([A2X]) + +AM_CONDITIONAL([BUILD_DOCUMENTATION], test "x$build_documentation" = "xyes") + PKG_CHECK_MODULES([CAIRO], [cairo]) PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) PKG_CHECK_MODULES([POPPLER_GLIB], [poppler-glib]) @@ -199,11 +218,18 @@ Configuration summary: package version: $PACKAGE_VERSION build date: `date --utc '+%F %T'` (UTC) + Tools: + AsciiDoc (a2x): . . . . . . $have_a2x + xsltproc: . . . . . . . . . $have_xsltproc + Libraries: libcairo: . . . . . . . . . `$PKG_CONFIG --modversion cairo` libgtk-2.0: . . . . . . . . `$PKG_CONFIG --modversion gtk+-2.0` libpoppler-glib: . . . . . `$PKG_CONFIG --modversion poppler-glib` + Features: + documentation: . . . . . . $build_documentation + This package is maintained by $PACKAGE_MAINTAINER. Please report bugs to $PACKAGE_BUGREPORT. diff --git a/doc/Makefile.am b/doc/Makefile.am index 62399e6..c733c61 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -6,5 +6,5 @@ man_MANS = tpdfview.1 tpdfview.1: tpdfview.txt ../version .txt.1: - a2x -d manpage -f manpage -atpdfv_version=$(PACKAGE_VERSION) $< + @A2X@ -d manpage -f manpage -atpdfv_version=$(PACKAGE_VERSION) $< -- 2.30.2