about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-09-20T16·13+0200
committerGitHub <noreply@github.com>2016-09-20T16·13+0200
commit3fcfd899f829da15b73fde233d249b4a98aee36e (patch)
treef86e5610a761a36a1c2698c8d06ea2af1f03402d
parentbeaefdf70648776cf83f80daf146eb774ff4c20c (diff)
parent7ef053c6327441bc7306ff6ee12fde2a42301ab4 (diff)
Merge pull request #1066 from adevress/disable-doc
Add a new option to disable documentation generation at configure time
-rw-r--r--Makefile.config.in1
-rw-r--r--configure.ac7
-rw-r--r--doc/manual/local.mk9
3 files changed, 17 insertions, 0 deletions
diff --git a/Makefile.config.in b/Makefile.config.in
index 3e7847e365c7..2db7172b15c9 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -33,5 +33,6 @@ pkglibdir = $(libdir)/$(PACKAGE_NAME)
 prefix = @prefix@
 storedir = @storedir@
 sysconfdir = @sysconfdir@
+doc_generate = @doc_generate@
 xmllint = @xmllint@
 xsltproc = @xsltproc@
diff --git a/configure.ac b/configure.ac
index 1ae0e782d3b5..91ed9947abdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,6 +265,13 @@ AC_ARG_ENABLE(init-state, AC_HELP_STRING([--disable-init-state],
 #AM_CONDITIONAL(INIT_STATE, test "$init_state" = "yes")
 
 
+# documentation generation switch
+AC_ARG_ENABLE(doc-gen, AC_HELP_STRING([--disable-doc-gen],
+  [disable documentation generation]),
+  doc_generate=$enableval, doc_generate=yes)
+AC_SUBST(doc_generate)
+
+
 # Setuid installations.
 AC_CHECK_FUNCS([setresuid setreuid lchown])
 
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index d89555899a70..4376c3644d38 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -1,3 +1,6 @@
+
+ifeq ($(doc_generate),yes)
+
 XSLTPROC = $(xsltproc) --nonet $(xmlflags) \
   --param section.autolabel 1 \
   --param section.label.includes.component.label 1 \
@@ -71,8 +74,14 @@ $(foreach file, $(wildcard $(d)/images/callouts/*.gif), $(eval $(call install-da
 
 $(eval $(call install-symlink, manual.html, $(docdir)/manual/index.html))
 
+
 all: $(d)/manual.html
 
+
+
 clean-files += $(d)/manual.html
 
 dist-files += $(d)/manual.html
+
+
+endif