diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2011-10-13 15:56:46 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2011-10-14 08:57:28 -0400 |
| commit | 66e95be41e025398e2b8650888e37d759faa830c (patch) | |
| tree | 5e2e5f083ed309308feeb858cbb5e05c08e0039f | |
| parent | 7c77e790204f82bce88dd6ecd237c941a9389349 (diff) | |
| download | sssd_unused-66e95be41e025398e2b8650888e37d759faa830c.tar.gz sssd_unused-66e95be41e025398e2b8650888e37d759faa830c.tar.xz sssd_unused-66e95be41e025398e2b8650888e37d759faa830c.zip | |
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.
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index c2f1a483..b9ad9899 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 ?= . @@ -1018,7 +1022,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 6ae664a6..d86b16a7 100644 --- a/configure.ac +++ b/configure.ac @@ -147,6 +147,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 |