diff options
| author | Werner Koch <wk@gnupg.org> | 2021-02-19 11:05:32 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2021-02-19 11:05:32 +0100 |
| commit | 5573ab714b92f6ee899a816998e56e1238f4c573 (patch) | |
| tree | e9707f8e6acc48a24d86d1c99df17c0ced026fbf /tools | |
| parent | scd: Minor tweak for easier backporting (diff) | |
| download | gnupg2-5573ab714b92f6ee899a816998e56e1238f4c573.tar.xz gnupg2-5573ab714b92f6ee899a816998e56e1238f4c573.zip | |
build: Remove now obsolete HAVE_NEWER_LIBGCRYPT AM conditional.
* configure.ac (HAVE_NEWER_LIBGCRYPT): Remove conditional.
* tools/Makefile.am (gpg_pair_tool_SOURCES): We build it always.
--
This is because we require libgcrypt 1.9 anyway.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 4ece726b3..07edf09aa 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -53,6 +53,7 @@ bin_PROGRAMS += gpgconf-w32 endif libexec_PROGRAMS += gpg-check-pattern +libexec_PROGRAMS += gpg-pair-tool if !HAVE_W32CE_SYSTEM noinst_PROGRAMS = clean-sat make-dns-cert @@ -182,8 +183,6 @@ gpg_wks_client_LDADD = $(libcommon) \ $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBINTL) $(LIBICONV) $(NETLIBS) -if HAVE_NEWER_LIBGCRYPT -libexec_PROGRAMS += gpg-pair-tool gpg_pair_tool_SOURCES = \ gpg-pair-tool.c @@ -191,7 +190,6 @@ gpg_pair_tool_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV) gpg_pair_tool_LDADD = $(libcommon) \ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) -endif # Make sure that all libs are build before we use them. This is # important for things like make -j2. |