This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 58b177f Doc: Make building docs an active configuration option.
58b177f is described below
commit 58b177f0fcc01b509024d8e64b8fd8fc698bec1d
Author: Alan M. Carroll <[email protected]>
AuthorDate: Wed Nov 30 13:50:35 2016 -0600
Doc: Make building docs an active configuration option.
---
Makefile.am | 5 ++++-
ci/jenkins/bin/docs.sh | 2 +-
configure.ac | 13 +++++++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 12de2d1..f1a8747 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,10 @@ export CCACHE_BASEDIR
# proxy/api/ts has to be built first, since so much of libraries and "core
# depends on the generates ts/ts.h include file.
-SUBDIRS = proxy/api/ts iocore lib proxy/hdrs proxy/shared mgmt proxy cmd
plugins tools example rc doc
+SUBDIRS = proxy/api/ts iocore lib proxy/hdrs proxy/shared mgmt proxy cmd
plugins tools example rc
+if BUILD_DOCS
+SUBDIRS += doc
+endif
DIST_BUILD_USER=`id -nu`
diff --git a/ci/jenkins/bin/docs.sh b/ci/jenkins/bin/docs.sh
index 6754040..f5b2a17 100644
--- a/ci/jenkins/bin/docs.sh
+++ b/ci/jenkins/bin/docs.sh
@@ -22,7 +22,7 @@ test ! -z "${WORKSPACE}" && cd "${WORKSPACE}/src"
# This avoids redoing the configure on every doc build, which is somewhat
annoying
[ ! -f configure ] && autoreconf -fi
-[ ! -f config.nice ] && ./configure
+[ ! -f config.nice ] && ./configure --enable-docs
cd doc
diff --git a/configure.ac b/configure.ac
index d9c51aa..f906135 100644
--- a/configure.ac
+++ b/configure.ac
@@ -248,6 +248,19 @@ TS_ARG_ENABLE_VAR([has], [tests])
AM_CONDITIONAL([BUILD_TESTS], [test 0 -ne $has_tests])
#
+# Build documentation?
+#
+
+AC_MSG_CHECKING([whether to build documentation])
+AC_ARG_ENABLE([docs],
+ [AS_HELP_STRING([--enable-docs],[enable documentation building])],
+ [],
+ [enable_doc_build=no]
+)
+AC_MSG_RESULT([$enable_doc_build])
+AM_CONDITIONAL([BUILD_DOCS], [test "xyes" = "x$enable_doc_build"])
+
+#
# Remote Coverity Prevent commit
#
AC_MSG_CHECKING([whether to commit cov defects to remote host])
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
