| William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 1 | From 9ace8f1b68ab708c44dce4c0152b975fbceb0398 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Saul Wold <sgw@linux.intel.com> |
| 3 | Date: Wed, 16 Aug 2017 11:18:01 +0800 |
| Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame] | 4 | Subject: [PATCH] dirmngr uses libgpg error |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Pending |
| 7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
| 8 | |
| 9 | Rebase to 2.1.23 |
| 10 | |
| 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| Andrew Geissler | c9f7865 | 2020-09-18 14:11:35 -0500 | [diff] [blame] | 12 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 13 | --- |
| William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 14 | dirmngr/Makefile.am | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 16 | |
| 17 | diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am |
| William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 18 | index 77ca3f5..1446775 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 19 | --- a/dirmngr/Makefile.am |
| 20 | +++ b/dirmngr/Makefile.am |
| William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 21 | @@ -86,7 +86,7 @@ endif |
| 22 | dirmngr_LDADD = $(libcommonpth) \ |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | $(DNSLIBS) $(LIBASSUAN_LIBS) \ |
| 24 | $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ |
| William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 25 | - $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) |
| 26 | + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) $(GPG_ERROR_LIBS) |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 27 | if USE_LDAP |
| 28 | dirmngr_LDADD += $(ldaplibs) |
| William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 29 | endif |