[git] GnuPG - branch, master, updated. gnupg-2.1.14-7-g7f4dd24

[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  7f4dd24b880323a5b772719dafae829c288303a8 (commit)
      from  b7b37716b9d2cd1b71b5f7f0e4fb2c1a43eee90a (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 7f4dd24b880323a5b772719dafae829c288303a8
Author: Justus Winter <justus at g10code.com>
Date:   Fri Jul 15 17:20:18 2016 +0200

    build: Always build gpgtar.
    
    We use gpgtar to unpack test data, hence we always build it.  If the
    user opts out, we simply don't install it.
    
    * configure.ac: Add comment.
    * tests/migrations/Makefile.am (required_pgms): Make sure gpgtar is
    built.
    * tools/Makefile.am: Always build gpgtar, but do not install it if the
    user used '--disable-gpgtar'.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/configure.ac b/configure.ac
index 14a55ca..9fcf79d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,6 +128,8 @@ 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
+# user opts out, we simply don't install it.
 GNUPG_BUILD_PROGRAM(gpgtar, yes)
 GNUPG_BUILD_PROGRAM(wks-tools, no)
 
diff --git a/tests/migrations/Makefile.am b/tests/migrations/Makefile.am
index 9c82d66..003b2a8 100644
--- a/tests/migrations/Makefile.am
+++ b/tests/migrations/Makefile.am
@@ -19,7 +19,8 @@
 
 
 # Programs required before we can run these tests.
-required_pgms = ../../g10/gpg$(EXEEXT) ../../agent/gpg-agent$(EXEEXT)
+required_pgms = ../../g10/gpg$(EXEEXT) ../../agent/gpg-agent$(EXEEXT) \
+	../../tools/gpgtar$(EXEEXT)
 
 AM_CPPFLAGS = -I$(top_srcdir)/common
 include $(top_srcdir)/am/cmacros.am
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 7bc1456..bc159d9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -45,12 +45,6 @@ else
   symcryptrun =
 endif
 
-if BUILD_GPGTAR
-  gpgtar = gpgtar
-else
-  gpgtar =
-endif
-
 if BUILD_WKS_TOOLS
   gpg_wks_server = gpg-wks-server
   gpg_wks_client = gpg-wks-client
@@ -63,9 +57,6 @@ bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun}
 if !HAVE_W32_SYSTEM
 bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} ${gpg_wks_client}
 endif
-if !HAVE_W32CE_SYSTEM
-bin_PROGRAMS += ${gpgtar}
-endif
 
 if !DISABLE_REGEX
 libexec_PROGRAMS = gpg-check-pattern
@@ -75,6 +66,14 @@ if !HAVE_W32CE_SYSTEM
 noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
 endif
 
+if !HAVE_W32CE_SYSTEM
+if BUILD_GPGTAR
+  bin_PROGRAMS += gpgtar
+else
+  noinst_PROGRAMS += gpgtar
+endif
+endif
+
 common_libs = $(libcommon)
 commonpth_libs = $(libcommonpth)
 

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

Summary of changes:
 configure.ac                 |  2 ++
 tests/migrations/Makefile.am |  3 ++-
 tools/Makefile.am            | 17 ++++++++---------
 3 files changed, 12 insertions(+), 10 deletions(-)


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