From 49829c29e541546084950b8a153067db371d101a Mon Sep 17 00:00:00 2001 From: Ben Kibbey Date: Mon, 8 Aug 2016 18:40:03 -0400 Subject: Cleanup initialization of libgcrypt. * common/init.c (init_common_subsystems): Initialize libgcrypt. * dirmngr/Makefile.am (dirmngr_ldap): Link with libgcrypt. -- Most other modules already call gcry_check_version() after init_common_subsystems() so may as well move initialization of libgcrypt to here. Also fixes a warning in the system log from gpgconf --homedir. Signed-off-by: Ben Kibbey --- dirmngr/Makefile.am | 4 ++-- dirmngr/dirmngr.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'dirmngr') diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index aaa905089..64bc05868 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am @@ -94,8 +94,8 @@ dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url) dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS) dirmngr_ldap_LDFLAGS = dirmngr_ldap_LDADD = $(libcommon) no-libgcrypt.o \ - $(GPG_ERROR_LIBS) $(LDAPLIBS) $(LBER_LIBS) $(LIBINTL) \ - $(LIBICONV) + $(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \ + $(LBER_LIBS) $(LIBINTL) $(LIBICONV) endif dirmngr_client_SOURCES = dirmngr-client.c diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 7e629db96..007fa1002 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -755,10 +755,6 @@ main (int argc, char **argv) /* Check that the libraries are suitable. Do it here because the option parsing may need services of the libraries. */ - - if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) ) - log_fatal (_("%s is too old (need %s, have %s)\n"), "libgcrypt", - NEED_LIBGCRYPT_VERSION, gcry_check_version (NULL) ); if (!ksba_check_version (NEED_KSBA_VERSION) ) log_fatal( _("%s is too old (need %s, have %s)\n"), "libksba", NEED_KSBA_VERSION, ksba_check_version (NULL) ); -- cgit v1.2.3