From f95d923090e119a7a05eef13bbbc108ed98e513a Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 30 Jul 2020 11:34:01 +0900 Subject: [PATCH] w32: Add link to $(NETLIB) for -lws2_32. * dirmngr/Makefile.am (dirmngr_LDADD): Add $(NETLIBS). * sm/Makefile.am (gpgsm_LDADD): Ditto. * tools/Makefile.am (gpg_wks_client_LDADD): Ditto. -- Cherry-picked master commit of: d69f5570ee5e1b099e39fdf64e18add23ff5c815 GnuPG-bug-id: 4994 Signed-off-by: NIIBE Yutaka --- dirmngr/Makefile.am | 2 +- sm/Makefile.am | 2 +- tools/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index 098e711e9..2bf0cb75b 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am @@ -86,7 +86,7 @@ endif dirmngr_LDADD = $(libcommonpth) \ $(DNSLIBS) $(LIBASSUAN_LIBS) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ - $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) if USE_LDAP dirmngr_LDADD += $(ldaplibs) endif diff --git a/sm/Makefile.am b/sm/Makefile.am index ddc2e225f..475924a01 100644 --- a/sm/Makefile.am +++ b/sm/Makefile.am @@ -62,7 +62,7 @@ common_libs = ../kbx/libkeybox509.a $(libcommon) gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \ $(GPG_ERROR_LIBS) $(LIBREADLINE) $(LIBINTL) \ - $(LIBICONV) $(resource_objs) $(extra_sys_libs) + $(LIBICONV) $(resource_objs) $(extra_sys_libs) $(NETLIBS) gpgsm_LDFLAGS = $(extra_bin_ldflags) # Make sure that all libs are build before we use them. This is diff --git a/tools/Makefile.am b/tools/Makefile.am index 579c4141c..e9e5564e9 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -171,7 +171,7 @@ gpg_wks_client_SOURCES = \ gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV) gpg_wks_client_LDADD = $(libcommon) \ $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ - $(LIBINTL) $(LIBICONV) + $(LIBINTL) $(LIBICONV) $(NETLIBS) # Make sure that all libs are build before we use them. This is