Makefile, configure.ac, doc/Makefile: Add the ability to opt-out of documentation...

diff --git a/Makefile.am b/Makefile.am
index 7fae33e0f3fab47c52c446cc5e382454d2b24b53..41967a5138612ee9561c500615a2412828771190 100644 (file)
--- 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 68922e6c085dfb150b95276f5edf66a68a5242f8..145a6aaffd1f6a455f351d845157e62a3735e682 100644 (file)
--- 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 ab8ccc4b56b8899d02cf957166182e3153724e48..28db606c5e7e48a74464687853d73d5809eac2c1 100644 (file)
--- 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