aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am9
-rw-r--r--configure.ac11
2 files changed, 19 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index fdfd791..4ffb113 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
ACLOCAL_AMFLAGS = -I m4
+DISTCHECK_CONFIGURE_FLAGS = --enable-doc
# (A suitable gitlog-to-changelog script can be found in GnuPG master.)
GITLOG_TO_CHANGELOG=gitlog-to-changelog
@@ -28,7 +29,13 @@ EXTRA_DIST = autogen.sh autogen.rc README.GIT \
tests/ChangeLog-2011 contrib/ChangeLog-2011 \
build-aux/git-log-footer build-aux/git-log-fix
-SUBDIRS = m4 src doc tests
+if BUILD_DOC
+doc = doc
+else
+doc =
+endif
+
+SUBDIRS = m4 src $(doc) tests
dist-hook: gen-ChangeLog
diff --git a/configure.ac b/configure.ac
index 963a76b..cd36183 100644
--- a/configure.ac
+++ b/configure.ac
@@ -454,6 +454,17 @@ else
fi
fi
+
+#
+# Extra features
+#
+build_doc=yes
+AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc],
+ [do not build the documentation]),
+ build_doc=$enableval, build_doc=yes)
+AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno])
+
+
#
# Create the config files.
#