[GNUnet-SVN] [taler-merchant] branch master updated: simply remove --with-doc (#5048)

[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 c3f49bc  simply remove --with-doc (#5048)
c3f49bc is described below

commit c3f49bcf796c74ffa6c671a88b8536359acab4a3
Author: Christian Grothoff <address@hidden>
AuthorDate: Sun Jun 4 21:19:58 2017 +0200

    simply remove --with-doc (#5048)
---
 Makefile.am  |  5 +----
 configure.ac | 15 ---------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index fdab91e..c42e33d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,10 +3,7 @@
 if DOC_ONLY
   SUBDIRS = . doc
 else
-  SUBDIRS = . src
-if WITH_DOC
-  SUBDIRS += doc
-endif
+  SUBDIRS = . src doc
 endif
 
 @DX_RULES@
diff --git a/configure.ac b/configure.ac
index 6f6650c..548ea9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,20 +45,6 @@ CFLAGS="-Wall $CFLAGS"
 # Checks for header files.
 AC_CHECK_HEADERS([stdint.h stdlib.h string.h unistd.h])
 
-# Check for compiling documentation
-with_doc = yes
-AC_MSG_CHECKING([for compiling documentation])
-AC_ARG_WITH(doc,
-            [AS_HELP_STRING([--with-doc], [Compile documentation])],
-            [AC_MSG_RESULT([given])],
-            [AC_MSG_RESULT(not given)
-           with_doc = no])
-
-AS_CASE([$with_doc],
-        [yes], AC_CHECK_PROG([texicomp], [texi2pdf], [yes]))
-AS_IF([test "x$with_doc" = "xyes" -a "x$texicomp" != "xyes"], AC_MSG_ERROR([A 
texinfo compiler is needed. Install texi2pdf.]))
-AM_CONDITIONAL([WITH_DOC], [test "x$with_doc" = "xyes"])
-
 # Check for GNUnet's libgnunetutil.
 libgnunetutil=0
 AC_MSG_CHECKING([for libgnunetutil])
@@ -296,7 +282,6 @@ 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])

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