diff options
| author | Ingo Klöcker <[email protected]> | 2021-09-20 10:14:57 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2021-09-20 10:39:29 +0000 |
| commit | e2069d563283ab295858d33a250f229aab240f75 (patch) | |
| tree | 5dfe86f6e2eabfd6209e57b281b0a77bdacb089a | |
| parent | po: Fixed Italian translation for key expiration (diff) | |
| download | gnupg-e2069d563283ab295858d33a250f229aab240f75.tar.gz gnupg-e2069d563283ab295858d33a250f229aab240f75.zip | |
build: Fix several "include file not found" problems
* dirmngr/Makefile.am (t_ldap_parse_uri_CFLAGS): Add KSBA_CFLAGS.
* kbx/Makefile.am (libkeybox_a_CFLAGS, libkeybox509_a_CFLAGS): Add
NPTH_CFLAGS.
* tools/Makefile.am (gpgtar_CFLAGS, gpg_wks_server_CFLAGS,
gpg_wks_client_CFLAGS, gpg_pair_tool_CFLAGS): Add LIBGCRYPT_CFLAGS.
--
The tools include gcrypt.h via common/util.h.
GnuPG-bug-id: 5592
| -rw-r--r-- | dirmngr/Makefile.am | 2 | ||||
| -rw-r--r-- | kbx/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/Makefile.am | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index f56e59a3e..d154e5228 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am @@ -163,7 +163,7 @@ t_ldap_parse_uri_SOURCES = \ $(ldap_url) $(t_common_src) t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 $(USE_C99_CFLAGS) \ $(LIBGCRYPT_CFLAGS) \ - $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) + $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(KSBA_CFLAGS) t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS) t_ldap_misc_SOURCES = t-ldap-misc.c ldap-misc.c ldap-misc.h $(ldap_url) diff --git a/kbx/Makefile.am b/kbx/Makefile.am index dd727e1e0..f5fe341bc 100644 --- a/kbx/Makefile.am +++ b/kbx/Makefile.am @@ -65,8 +65,8 @@ client_sources = \ libkeybox_a_SOURCES = $(common_sources) $(client_sources) libkeybox509_a_SOURCES = $(common_sources) $(client_sources) -libkeybox_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -libkeybox509_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DKEYBOX_WITH_X509=1 +libkeybox_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) +libkeybox509_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) -DKEYBOX_WITH_X509=1 # We need W32SOCKLIBS because the init subsystem code in libcommon diff --git a/tools/Makefile.am b/tools/Makefile.am index 4c29f84ed..9e9e13eda 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -162,7 +162,7 @@ gpgtar_SOURCES = \ gpgtar-create.c \ gpgtar-extract.c \ gpgtar-list.c -gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) +gpgtar_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) gpgtar_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \ $(gpgtar_rc_objs) @@ -177,7 +177,7 @@ gpg_wks_server_SOURCES = \ mime-maker.c mime-maker.h \ send-mail.c send-mail.h -gpg_wks_server_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV) +gpg_wks_server_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV) gpg_wks_server_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBINTL) $(LIBICONV) @@ -192,7 +192,8 @@ gpg_wks_client_SOURCES = \ send-mail.c send-mail.h \ call-dirmngr.c call-dirmngr.h -gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV) +gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(LIBGCRYPT_CFLAGS) \ + $(GPG_ERROR_CFLAGS) $(INCICONV) gpg_wks_client_LDADD = $(libcommon) \ $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBINTL) $(LIBICONV) $(NETLIBS) \ @@ -201,7 +202,7 @@ gpg_wks_client_LDADD = $(libcommon) \ gpg_pair_tool_SOURCES = \ gpg-pair-tool.c -gpg_pair_tool_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV) +gpg_pair_tool_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV) gpg_pair_tool_LDADD = $(libcommon) \ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) |