security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-11 22:52:47 +01:00
Code Activity

build: Always build gpgtar.

Browse Source 
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>
This commit is contained in:
Justus Winter 2016-07-15 17:20:18 +02:00
parent b7b37716b9
commit 7f4dd24b88
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -128,6 +128,8 @@ GNUPG_BUILD_PROGRAM(dirmngr, yes)
GNUPG_BUILD_PROGRAM(tools, yes) GNUPG_BUILD_PROGRAM(tools, yes)
GNUPG_BUILD_PROGRAM(doc, yes) GNUPG_BUILD_PROGRAM(doc, yes)
GNUPG_BUILD_PROGRAM(symcryptrun, no) 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(gpgtar, yes)
GNUPG_BUILD_PROGRAM(wks-tools, no) GNUPG_BUILD_PROGRAM(wks-tools, no)

3
tests/migrations/Makefile.am
View File

@ -19,7 +19,8 @@
# Programs required before we can run these tests. # 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 AM_CPPFLAGS = -I$(top_srcdir)/common
include $(top_srcdir)/am/cmacros.am include $(top_srcdir)/am/cmacros.am

17
tools/Makefile.am
View File

@ -45,12 +45,6 @@ else
symcryptrun = symcryptrun =
endif endif
if BUILD_GPGTAR
gpgtar = gpgtar
else
gpgtar =
endif
if BUILD_WKS_TOOLS if BUILD_WKS_TOOLS
gpg_wks_server = gpg-wks-server gpg_wks_server = gpg-wks-server
gpg_wks_client = gpg-wks-client gpg_wks_client = gpg-wks-client
@ -63,9 +57,6 @@ bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun}
if !HAVE_W32_SYSTEM if !HAVE_W32_SYSTEM
bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} ${gpg_wks_client} bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} ${gpg_wks_client}
endif endif
if !HAVE_W32CE_SYSTEM
bin_PROGRAMS += ${gpgtar}
endif
if !DISABLE_REGEX if !DISABLE_REGEX
libexec_PROGRAMS = gpg-check-pattern libexec_PROGRAMS = gpg-check-pattern
@ -75,6 +66,14 @@ if !HAVE_W32CE_SYSTEM
noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
endif endif
if !HAVE_W32CE_SYSTEM
if BUILD_GPGTAR
bin_PROGRAMS += gpgtar
else
noinst_PROGRAMS += gpgtar
endif
endif
common_libs = $(libcommon) common_libs = $(libcommon)
commonpth_libs = $(libcommonpth) commonpth_libs = $(libcommonpth)