summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJustus Winter <justus@g10code.com>2016-07-15 17:20:18 +0200
committerJustus Winter <justus@g10code.com>2016-07-15 17:24:49 +0200
commit7f4dd24b880323a5b772719dafae829c288303a8 (patch)
tree027725dc2f2010f18cf0fb1909dec2b6611b00f9 /tests
parentwks: Publish as binary file. (diff)
downloadgnupg2-7f4dd24b880323a5b772719dafae829c288303a8.tar.xz
gnupg2-7f4dd24b880323a5b772719dafae829c288303a8.zip
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@g10code.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/migrations/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/migrations/Makefile.am b/tests/migrations/Makefile.am
index 9c82d66ee..003b2a8d7 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