security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-13 22:21:09 +02:00
Code Activity

build: Build gpg-pair-tool only when there is newer libgcrypt.

Browse Source 
* configure.ac (HAVE_NEWER_LIBGCRYPT): New.
* tools/Makefile.am: Conditionalize build of gpg-pair-tool.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2019-09-20 14:19:18 +09:00
parent 7c81e5cb97
commit bb5ed9fe1a
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.ac
View File

@ -801,7 +801,26 @@ AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_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.
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])
# #
# libassuan is used for IPC # libassuan is used for IPC

6
tools/Makefile.am
View File

@ -49,7 +49,7 @@ else
gpg_wks_server = gpg_wks_server =
endif endif
libexec_PROGRAMS = gpg-wks-client gpg-pair-tool libexec_PROGRAMS = gpg-wks-client
bin_PROGRAMS = gpgconf gpg-connect-agent gpg-card ${symcryptrun} bin_PROGRAMS = gpgconf gpg-connect-agent gpg-card ${symcryptrun}
if !HAVE_W32_SYSTEM if !HAVE_W32_SYSTEM
@ -187,6 +187,8 @@ gpg_wks_client_LDADD = $(libcommon) \
$(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
$(LIBINTL) $(LIBICONV) $(LIBINTL) $(LIBICONV)
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
@ -194,7 +196,7 @@ 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.