[git] GCRYPT - branch, master, updated. libgcrypt-1.6.0-135-gad50e36

[by Werner Koch]

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 "The GNU crypto library".

The branch, master has been updated
       via  ad50e360ef4851e66e51a03fc420175636336b58 (commit)
      from  4f46374502eb988d701b904f83819e2cf7b1755c (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 ad50e360ef4851e66e51a03fc420175636336b58
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Dec 15 12:05:32 2014 +0100

    build: Add configure option --disable-doc.
    
    * Makefile.am (AUTOMAKE_OPTIONS): Remove.
    (doc) [!BUILD_DOC]: Do not recurse into the dir.
    * configure.ac (AM_INIT_AUTOMAKE): Add option formerly in Makefile.am.
    (BUILD_DOC): Add new am_conditional.

diff --git a/Makefile.am b/Makefile.am
index 937bdaf..2d7ca43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,15 +18,21 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
-DISTCHECK_CONFIGURE_FLAGS = --disable-random-daemon \
+DISTCHECK_CONFIGURE_FLAGS = --disable-random-daemon --enable-doc \
   --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
 
 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
+if BUILD_DOC
+doc = doc
+else
+doc =
+endif
+
+
 DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
-SUBDIRS =         compat mpi cipher random src doc tests
+SUBDIRS =         compat mpi cipher random src $(doc) tests
 
 EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES      	           \
              ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011    \
diff --git a/configure.ac b/configure.ac
index c979d57..a4ea990 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ VERSION=$PACKAGE_VERSION
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/libgcrypt.vers])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([dist-bzip2])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_LIBOBJ_DIR([compat])
@@ -2090,6 +2090,16 @@ AC_SUBST([GCRYPT_HWF_MODULES])
 
 
 #
+# Option to disable building of doc file
+#
+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])
+
+
+#
 # Provide information about the build.
 #
 BUILD_REVISION="mym4_revision"

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

Summary of changes:
 Makefile.am  |   12 +++++++++---
 configure.ac |   12 +++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org


_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits