[git] Assuan - branch, master, updated. libassuan-2.4.3-5-g859f9a9

by Marcus Brinkmann cvs at cvs.gnupg.org
Mon Jun 19 13:33:59 CEST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPC library used by GnuPG".

The branch, master has been updated
       via  859f9a9754708572a6289853d7d95b9ee3eae589 (commit)
      from  62f3123d3877c8a84961e5f907bf959d4593fa5c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 859f9a9754708572a6289853d7d95b9ee3eae589
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Mon Jun 19 13:31:10 2017 +0200

    configure: Add flag to disable documentation build.
    
    * configure.ac: Add new option --disable-doc.
    (BUILD_DOC): New automake conditional.
    * Makefile.am (SUBDIRS): Make doc optional based on BUILD_DOC.
    (DISTCHECK_CONFIGURE_FLAGS): New variable.
    
    Signed-Off-By: Marcus Brinkmann <mb at g10code.com>

diff --git a/Makefile.am b/Makefile.am
index fdfd791..4ffb113 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@
 
 
 ACLOCAL_AMFLAGS = -I m4
+DISTCHECK_CONFIGURE_FLAGS = --enable-doc
 
 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
@@ -28,7 +29,13 @@ EXTRA_DIST = autogen.sh autogen.rc README.GIT         	                \
              tests/ChangeLog-2011 contrib/ChangeLog-2011     		\
              build-aux/git-log-footer build-aux/git-log-fix
 
-SUBDIRS = m4 src doc tests
+if BUILD_DOC
+doc = doc
+else
+doc =
+endif
+
+SUBDIRS = m4 src $(doc) tests
 
 
 dist-hook: gen-ChangeLog
diff --git a/configure.ac b/configure.ac
index 963a76b..cd36183 100644
--- a/configure.ac
+++ b/configure.ac
@@ -454,6 +454,17 @@ else
   fi
 fi
 
+
+#
+# Extra features
+#
+build_doc=yes
+AC_ARG_ENABLE([doc], AC_HELP_STRING([--disable-doc],
+                                    [do not build the documentation]),
+                     build_doc=$enableval, build_doc=yes)
+AM_CONDITIONAL([BUILD_DOC], [test "x$build_doc" != xno])
+
+
 #
 # Create the config files.
 #

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am  |  9 ++++++++-
 configure.ac | 11 +++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
IPC library used by GnuPG
http://git.gnupg.org




More information about the Gnupg-commits mailing list