build: Remove '--disable-tools' configuration option.
authorJustus Winter <justus@g10code.com>
Wed, 15 Mar 2017 09:51:03 +0000 (10:51 +0100)
committerJustus Winter <justus@g10code.com>
Wed, 15 Mar 2017 09:51:03 +0000 (10:51 +0100)
* 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@g10code.com>
Makefile.am
configure.ac

index 71e691a..7d023c1 100644 (file)
@@ -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
 
index bd618e5..df7a059 100644 (file)
@@ -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")