[git] GnuPG - branch, master, updated. gnupg-2.1.19-54-g6993e42

[by Justus Winter]

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 Privacy Guard".

The branch, master has been updated
       via  6993e42088c191f18468317ba2b5b8fbc8c3edff (commit)
      from  61785b679c542bbd789395fa632eb8b5133b01ad (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 6993e42088c191f18468317ba2b5b8fbc8c3edff
Author: Justus Winter <justus at g10code.com>
Date:   Wed Mar 15 10:51:03 2017 +0100

    build: Remove '--disable-tools' configuration option.
    
    * Makefile.am (SUBDIRS): Unconditionally include 'tools'.
    * configure.ac: Remove '--disable-tools' configuration option.
    --
    gpgconf is a core component nowadays and is always required.
    
    GnuPG-bug-id: 2993
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/Makefile.am b/Makefile.am
index 71e691a..7d023c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,11 +81,6 @@ dirmngr = dirmngr
 else
 dirmngr =
 endif
-if BUILD_TOOLS
-tools = tools
-else
-tools =
-endif
 if BUILD_DOC
 doc = doc
 else
@@ -94,7 +89,7 @@ endif
 
 SUBDIRS = m4 common kbx \
           ${gpg} ${sm} ${agent} ${scd} ${g13} ${dirmngr} \
-          ${tools} po ${doc} tests
+          tools po ${doc} tests
 
 dist_doc_DATA = README
 
diff --git a/configure.ac b/configure.ac
index bd618e5..df7a059 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,7 +126,6 @@ build_agent=yes
 GNUPG_BUILD_PROGRAM(scdaemon, yes)
 GNUPG_BUILD_PROGRAM(g13, no)
 GNUPG_BUILD_PROGRAM(dirmngr, yes)
-GNUPG_BUILD_PROGRAM(tools, yes)
 GNUPG_BUILD_PROGRAM(doc, yes)
 GNUPG_BUILD_PROGRAM(symcryptrun, no)
 # We use gpgtar to unpack test data, hence we always build it.  If the
@@ -1706,7 +1705,6 @@ AM_CONDITIONAL(BUILD_AGENT,       test "$build_agent" = "yes")
 AM_CONDITIONAL(BUILD_SCDAEMON,    test "$build_scdaemon" = "yes")
 AM_CONDITIONAL(BUILD_G13,         test "$build_g13" = "yes")
 AM_CONDITIONAL(BUILD_DIRMNGR,     test "$build_dirmngr" = "yes")
-AM_CONDITIONAL(BUILD_TOOLS,       test "$build_tools" = "yes")
 AM_CONDITIONAL(BUILD_DOC,         test "$build_doc" = "yes")
 AM_CONDITIONAL(BUILD_SYMCRYPTRUN, test "$build_symcryptrun" = "yes")
 AM_CONDITIONAL(BUILD_GPGTAR,      test "$build_gpgtar" = "yes")

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

Summary of changes:
 Makefile.am  | 7 +------
 configure.ac | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org