From 5573ab714b92f6ee899a816998e56e1238f4c573 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 19 Feb 2021 11:05:32 +0100
Subject: [PATCH] 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.
---
 configure.ac      | 45 ++++++++++++++++++++++++---------------------
 tools/Makefile.am |  4 +---
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index 07c2cbc8e..b2474e794 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,7 @@ AC_DEFINE_UNQUOTED(GNUPG_SWDB_TAG, "gnupg24", [swdb tag for this branch])
 NEED_GPGRT_VERSION=1.41
 
 NEED_LIBGCRYPT_API=1
-NEED_LIBGCRYPT_VERSION=1.9.0
+NEED_LIBGCRYPT_VERSION=1.9.1
 
 NEED_LIBASSUAN_API=2
 NEED_LIBASSUAN_VERSION=2.5.0
@@ -814,26 +814,29 @@ AM_PATH_GPG_ERROR("$NEED_GPGRT_VERSION",
 #
 AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION",
         have_libgcrypt=yes,have_libgcrypt=no)
-# And, then, check if it's newer than 1.9.0.
-have_libgcrypt_newer=no
-if test $ok = yes; then
-    if test "$major" -gt 1; then
-        have_libgcrypt_newer=yes
-    else
-        if test "$major" -eq 1; then
-            if test "$minor" -gt 9; then
-               have_libgcrypt_newer=yes
-            else
-               if test "$minor" -eq 9; then
-                   if test "$micro" -ge 0; then
-                     have_libgcrypt_newer=yes
-                   fi
-               fi
-            fi
-        fi
-    fi
-fi
-AM_CONDITIONAL(HAVE_NEWER_LIBGCRYPT, [test $have_libgcrypt_newer = yes])
+# And, then, check if it's newer than 1.9.0 so that we can
+# conditionally build some programs.
+# Note: This is not anymore needed but keep the code commented in case
+# we need it again with some future libgcrypt.
+#have_libgcrypt_newer=no
+#if test $ok = yes; then
+#    if test "$major" -gt 1; then
+#        have_libgcrypt_newer=yes
+#    else
+#        if test "$major" -eq 1; then
+#            if test "$minor" -gt 9; then
+#               have_libgcrypt_newer=yes
+#            else
+#               if test "$minor" -eq 9; then
+#                   if test "$micro" -ge 0; then
+#                     have_libgcrypt_newer=yes
+#                   fi
+#               fi
+#            fi
+#        fi
+#    fiy
+#fi
+#AM_CONDITIONAL(HAVE_NEWER_LIBGCRYPT, [test $have_libgcrypt_newer = yes])
 
 #
 # libassuan is used for IPC
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.