[GNUnet-SVN] [taler-merchant] branch master updated: must still define WITH_DOC

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 5ed9ada  must still define WITH_DOC
5ed9ada is described below

commit 5ed9ada634ace0d917fab8557f0a49e45f13dd3c
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Jun 4 11:52:30 2017 +0200

    must still define WITH_DOC
---
 configure.ac     | 1 +
 doc/version.texi | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3312723..6f6650c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,6 +296,7 @@ else
 
 # logic if doc_only is set, make sure conditionals are still defined
 AM_CONDITIONAL([HAVE_GNUNETPQ], [false])
+AM_CONDITIONAL([WITH_DOC], [true])
 AM_CONDITIONAL([HAVE_POSTGRESQL], [false])
 AM_CONDITIONAL([HAVE_TALERFAKEBANK], [false])
 AM_CONDITIONAL([HAVE_LIBCURL], [false])
diff --git a/doc/version.texi b/doc/version.texi
index d4370a3..b4f9054 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
address@hidden UPDATED 30 May 2017
address@hidden UPDATED-MONTH May 2017
address@hidden UPDATED 3 June 2017
address@hidden UPDATED-MONTH June 2017
 @set EDITION 0.2.0
 @set VERSION 0.2.0

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