[med-svn] [cnrun] 10/14: configure.ac: make docs, tools conditionally, not by default

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch WIP
in repository cnrun.

commit 4d10f5f4585a8268a7c9d69de8d888a4bc6a7e24
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Wed Feb 18 02:35:09 2015 +0200

    configure.ac: make docs, tools conditionally, not by default
---
 upstream/configure.ac    | 12 ++++++++----
 upstream/doc/Makefile.am |  2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/upstream/configure.ac b/upstream/configure.ac
index c4aa450..7a86dfe 100644
--- a/upstream/configure.ac
+++ b/upstream/configure.ac
@@ -72,11 +72,14 @@ fi
 AC_ARG_ENABLE(
 	[tools],
 	AS_HELP_STRING( [--enable-tools], [build spike2sdf, varfold & hh-latency-estimator (default = no)]),
-	[do_tools=$enableval], [do_tools=yes])
+	[do_tools=$enableval], [do_tools=no])
 AM_CONDITIONAL(DO_TOOLS, [test x"$do_tools" = xyes])
-if test x"$do_tools" != xyes; then
-   do_tools=no
-fi
+
+AC_ARG_ENABLE(
+	[lua-api-docs],
+	AS_HELP_STRING( [--enable-lua-api-docs], [build lua API docs (default = no)]),
+	[do_luaapidocs=$enableval], [do_luaapidocs=no])
+AM_CONDITIONAL(DO_LUAAPIDOCS, [test x"$do_luaapidocs" = xyes])
 
 AC_OUTPUT([
 	Makefile
@@ -103,5 +106,6 @@ AC_MSG_RESULT([
    LUA:                 $LUA_VERSION (execdir: $luaexecdir)
 
    build tools:		${do_tools}
+   build lua API docs:	${do_luaapidocs}
 
 ])
diff --git a/upstream/doc/Makefile.am b/upstream/doc/Makefile.am
index d4ef37c..059d251 100644
--- a/upstream/doc/Makefile.am
+++ b/upstream/doc/Makefile.am
@@ -1,4 +1,6 @@
+if DO_LUAAPIDOCS
 SUBDIRS = lua-api
+endif
 
 doc_DATA = \
 	README

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/cnrun.git