summaryrefslogtreecommitdiffstats
path: root/build-aux
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2021-03-15 09:00:00 +0100
committerWerner Koch <wk@gnupg.org>2021-03-15 09:50:30 +0100
commit8d6123faa8cae0bad6f82c9021e9ac6686b2f55d (patch)
tree17e934e738feac0ffefc25b964b5777eafc4acde /build-aux
parentscd: Add handling of Ed448 key. (diff)
downloadgnupg2-8d6123faa8cae0bad6f82c9021e9ac6686b2f55d.tar.xz
gnupg2-8d6123faa8cae0bad6f82c9021e9ac6686b2f55d.zip
build: new option to disable building of tpm2daemon
* configure.ac (build_tpmd): New configure option --disable-tpm2d (BUILD_WITH_TPM2D): New. * Makefile.am (tests): Use conditionally BUILD_TPM2D instead of HAVE_LIBTSS. * build-aux/speedo.mk (speedo_pkg_gnupg_configure) [W32]: Do not build tpm2d. * autogen.rc: Ditto.
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/speedo.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 1c5e268a1..fb1c23b4f 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -614,7 +614,7 @@ speedo_pkg_ntbtls_configure = --disable-shared
ifeq ($(TARGETOS),w32)
speedo_pkg_gnupg_configure = \
- --disable-g13 --enable-ntbtls
+ --disable-g13 --enable-ntbtls --disable-tpm2d
else
speedo_pkg_gnupg_configure = --disable-g13 --enable-wks-tools
endif