From 8b1f525acd20f36c836e827de3c251088961c5d9 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Thu, 13 Oct 2011 15:56:46 -0400
Subject: BUILDSYS: Fix --without-manpages

We weren't honoring the --without-manpages option, and this was
causing builds to break.

Note: 'make dist[check]' will not work if you have configured with
--without-manpages because it will not be able to pre-generate the
translation files necessary for tarball release.
---
 Makefile.am  | 8 +++++++-
 configure.ac | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 78ec82e7..58c79282 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
 DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb
 
-SUBDIRS = po src/man
+SUBDIRS = po
+
+if HAVE_MANPAGES
+SUBDIRS += src/man
+endif
 
 # Some old versions of automake don't define builddir
 builddir ?= .
@@ -1063,7 +1067,9 @@ endif
 # TRANSLATIONS #
 ################
 update-po:
+if HAVE_MANPAGES
 	$(MAKE) -C src/man update-po
+endif
 	$(MAKE) -C po update-po
 
 #######################
diff --git a/configure.ac b/configure.ac
index 19ee498a..21484ca8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,6 +145,7 @@ if test x$HAVE_MANPAGES != x; then
                      [Docbook XSL templates])
     AC_CHECK_PROG([PO4A],[po4a],[po4a],[no])
 fi
+AM_CONDITIONAL([HAVE_MANPAGES], [test "x$HAVE_MANPAGES" != "x"])
 AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"])
 
 if test x$HAVE_PYTHON_BINDINGS != x; then
-- 
cgit