From 020893243a2dde911d5853ade8070fcef9c5fad9 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Sun, 14 Jan 2018 21:30:59 +0000
Subject: [PATCH] Makefile, configure.ac, doc/Makefile: Add the ability to
 opt-out of documentation building with --disable-documentation, defaults to
 --enable-documentation

---
 Makefile.am     |  6 +-----
 configure.ac    | 20 ++++++++++----------
 doc/Makefile.am |  7 ++++++-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7fae33e0f..41967a513 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,7 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
-if DOC_ONLY
-  SUBDIRS = doc m4 po pkgconfig
-else
-  SUBDIRS  = doc m4 src po pkgconfig
-endif
+SUBDIRS = doc m4 src po pkgconfig
 
 if !TALER_ONLY
   SUBDIRS += contrib
diff --git a/configure.ac b/configure.ac
index 68922e6c0..145a6aaff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -597,19 +597,19 @@ AC_CHECK_LIB([kstat],[kstat_open])
 
 # should the build process be restricted to only building
 # the documentation?
-AC_MSG_CHECKING(whether to build documentation ONLY)
+AC_MSG_CHECKING(whether to build documentation)
 AC_ARG_ENABLE([documentation],
-   [AS_HELP_STRING([--enable-documentation], [only build the documentation])],
-   [doc_only=${enableval}],
-   [doc_only=no])
-AC_MSG_RESULT($doc_only)
-if test "x$doc_only" = "xyes"
+   [AS_HELP_STRING([--enable-documentation], [build the documentation])],
+   [documentation=${enableval}],
+   [documentation=yes])
+AC_MSG_RESULT($documentation)
+if test "x$documentation" = "xyes"
 then
-  AM_CONDITIONAL([DOC_ONLY],true)
-  AC_DEFINE([DOC_ONLY],[1],[Building the documentation])
+  AM_CONDITIONAL([DOCUMENTATION],true)
+  AC_DEFINE([DOCUMENTATION],[1],[Building the documentation])
 else
-  AM_CONDITIONAL([DOC_ONLY],false)
-  AC_DEFINE([DOC_ONLY],[0],[Canonical compilation])
+  AM_CONDITIONAL([DOCUMENTATION],false)
+  AC_DEFINE([DOCUMENTATION],[0],[Not building the documentation])
 fi
 
 # should the build process be restricted to the code required
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ab8ccc4b5..28db606c5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,10 @@
 # This Makefile.am is in the public domain
-SUBDIRS = man doxygen documentation
+if DOCUMENTATION
+  SUBDIRS = man doxygen documentation
+endif
+if !DOCUMENTATION
+  SUBDIRS = man doxygen
+endif
 
 EXTRA_DIST =							\
 	outdated-and-old-installation-instructions.txt		
-- 
2.25.1