[GNUnet-SVN] [taler-exchange] branch master updated: fix #5108

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new d107baa  fix #5108
d107baa is described below

commit d107baa2c30980b85f6330f3f7c3287b4d58708b
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Oct 24 15:37:46 2017 +0200

    fix #5108
---
 Makefile.am  | 8 ++++++++
 configure.ac | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index ab0f3ac..2499efb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,17 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
 if DOC_ONLY
+if ENABLE_DOC
   SUBDIRS = . doc
 else
+  SUBDIRS = .
+endif
+else
+if ENABLE_DOC
   SUBDIRS = . src doc
+else
+  SUBDIRS = . src doc
+endif
 endif
 
 @DX_RULES@
diff --git a/configure.ac b/configure.ac
index 454de71..1b904b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -472,6 +472,14 @@ AC_TYPE_UINTMAX_T
 # Checks for library functions.
 AC_CHECK_FUNCS([strdup])
 
+
+AC_ARG_ENABLE([[doc]],
+  [AS_HELP_STRING([[--disable-doc]], [do not build any documentation])], ,
+    [enable_doc=yes])
+test "x$enable_doc" = "xno" || enable_doc=yes
+AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"])
+
+
 else
 
 # logic if doc_only is set, make sure conditionals are still defined
@@ -482,6 +490,7 @@ AM_CONDITIONAL([HAVE_LIBCURL], [false])
 AM_CONDITIONAL([HAVE_LIBGNURL], [false])
 AM_CONDITIONAL([HAVE_DEVELOPER], [false])
 AM_CONDITIONAL([USE_COVERAGE], [false])
+AM_CONDITIONAL([ENABLE_DOC], [true])
 
 
 # end of 'doc_only'

-- 
To stop receiving notification emails like this one, please contact
address@hidden