[git] Pinentry - branch, master, updated. pinentry-1.1.0-15-g8f8d907

[by Damien Goutte-Gattat]

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 standard pinentry collection".

The branch, master has been updated
       via  8f8d907f53b2749642ee273e2cec28f7d68f26ff (commit)
      from  21f0883059c84de7145d402877cd178fcfed44e3 (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 8f8d907f53b2749642ee273e2cec28f7d68f26ff
Author: Damien Goutte-Gattat <dgouttegattat at incenp.org>
Date:   Tue Nov 20 12:48:43 2018 +0000

    build: Add --disable-doc option.
    
    * configure.ac (BUILD_DOC): Add new am_conditional.
    * Makefile.am: Skip doc subdir if BUILD_DOC is not set.
    
    GnuPG-bug-id: 4263
    Signed-off-by: Damien Goutte-Gattat <dgouttegattat at incenp.org>.

diff --git a/Makefile.am b/Makefile.am
index b8fd0e1..5d3e3d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,10 +88,16 @@ else
 pinentry_efl =
 endif
 
+if BUILD_DOC
+doc = doc
+else
+doc =
+endif
+
 SUBDIRS = m4 secmem pinentry ${pinentry_curses} ${pinentry_tty} \
 	${pinentry_emacs} ${pinentry_gtk_2} ${pinentry_gnome_3} \
 	${pinentry_qt} ${pinentry_tqt} ${pinentry_w32} \
-	${pinentry_fltk} ${pinentry_efl} doc
+	${pinentry_fltk} ${pinentry_efl} ${doc}
 
 
 install-exec-local:
diff --git a/configure.ac b/configure.ac
index 51a2313..a4d54da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -754,6 +754,12 @@ AH_BOTTOM([
 #endif /*GNUPG_CONFIG_H_INCLUDED*/
 ])
 
+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])
+
 
 AC_CONFIG_FILES([
 m4/Makefile

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

Summary of changes:
 Makefile.am  | 8 +++++++-
 configure.ac | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org