security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-05-29 21:58:04 +02:00
Code Activity

build: Remove now obsolete HAVE_NEWER_LIBGCRYPT AM conditional.

Browse Source 
* 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.
This commit is contained in:
Werner Koch 2021-02-19 11:05:32 +01:00
parent 6d4280b13d
commit 5573ab714b
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
configure.ac
View File

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

4
tools/Makefile.am
View File

@ -53,6 +53,7 @@ bin_PROGRAMS += gpgconf-w32
endif endif
libexec_PROGRAMS += gpg-check-pattern libexec_PROGRAMS += gpg-check-pattern
libexec_PROGRAMS += gpg-pair-tool
if !HAVE_W32CE_SYSTEM if !HAVE_W32CE_SYSTEM
noinst_PROGRAMS = clean-sat make-dns-cert noinst_PROGRAMS = clean-sat make-dns-cert
@ -182,8 +183,6 @@ gpg_wks_client_LDADD = $(libcommon) \
$(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
$(LIBINTL) $(LIBICONV) $(NETLIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
if HAVE_NEWER_LIBGCRYPT
libexec_PROGRAMS += gpg-pair-tool
gpg_pair_tool_SOURCES = \ gpg_pair_tool_SOURCES = \
gpg-pair-tool.c gpg-pair-tool.c
@ -191,7 +190,6 @@ gpg_pair_tool_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV)
gpg_pair_tool_LDADD = $(libcommon) \ gpg_pair_tool_LDADD = $(libcommon) \
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
$(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
endif
# Make sure that all libs are build before we use them. This is # Make sure that all libs are build before we use them. This is
# important for things like make -j2. # important for things like make -j2.