From 723cf5853fa655cec32478e13cd74b5b483fae7f Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Tue, 9 Feb 2021 16:00:06 +0900 Subject: Imported Upstream version 2.1.10 --- dirmngr/Makefile.am | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) (limited to 'dirmngr/Makefile.am') diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index cee777a..c3bce0d 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am @@ -19,7 +19,7 @@ ## Process this file with automake to produce Makefile.in -EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 +EXTRA_DIST = OAUTHORS ONEWS ChangeLog-2011 tls-ca.pem bin_PROGRAMS = dirmngr dirmngr-client @@ -27,7 +27,7 @@ if USE_LDAPWRAPPER libexec_PROGRAMS = dirmngr_ldap endif -noinst_PROGRAMS = $(module_tests) +noinst_PROGRAMS = $(module_tests) $(module_maint_tests) TESTS = $(module_tests) AM_CPPFLAGS = -I$(top_srcdir)/common @@ -61,7 +61,8 @@ dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c \ certcache.c certcache.h \ cdb.h cdblib.c misc.c dirmngr-err.h \ ocsp.c ocsp.h validate.c validate.h \ - dns-cert.c dns-cert.h \ + dns-stuff.c dns-stuff.h \ + http.c http.h \ ks-action.c ks-action.h ks-engine.h \ ks-engine-hkp.c ks-engine-http.c ks-engine-finger.c ks-engine-kdns.c @@ -75,7 +76,7 @@ ldaplibs = endif -dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \ +dirmngr_LDADD = $(libcommonpth) \ $(DNSLIBS) $(LIBASSUAN_LIBS) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) @@ -108,24 +109,41 @@ no-libgcrypt.c : $(top_srcdir)/tools/no-libgcrypt.c t_common_src = t-support.h -# We need libcommontls, because we use the http functions. -t_common_ldadd = $(libcommontls) $(libcommon) no-libgcrypt.o \ +t_common_ldadd = $(libcommon) no-libgcrypt.o $(LIBASSUAN_LIBS) \ $(GPG_ERROR_LIBS) $(NETLIBS) \ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \ $(DNSLIBS) $(LIBINTL) $(LIBICONV) -module_tests = t-dns-cert +module_tests = t-dns-stuff if USE_LDAP module_tests += t-ldap-parse-uri endif +if MAINTAINER_MODE +module_maint_tests = t-http +else +module_maint_tests = +endif + + +# http tests +t_http_SOURCES = t-http.c http.c dns-stuff.c +t_http_CFLAGS = -DWITHOUT_NPTH=1 \ + $(LIBGCRYPT_CFLAGS) $(NTBTLS_CFLAGS) $(LIBGNUTLS_CFLAGS) \ + $(GPG_ERROR_CFLAGS) +t_http_LDADD = $(t_common_ldadd) \ + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(DNSLIBS) + t_ldap_parse_uri_SOURCES = \ t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h \ + http.c dns-stuff.c \ $(ldap_url) $(t_common_src) -t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) +t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 +t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) $(DNSLIBS) -t_dns_cert_SOURCES = t-dns-cert.c dns-cert.c -t_dns_cert_LDADD = $(t_common_ldadd) +t_dns_stuff_CFLAGS = -DWITHOUT_NPTH=1 +t_dns_stuff_SOURCES = t-dns-stuff.c dns-stuff.c +t_dns_stuff_LDADD = $(t_common_ldadd) $(DNSLIBS) -$(PROGRAMS) : $(libcommon) $(libcommonpth) $(libcommontls) $(libcommontlsnpth) +$(PROGRAMS) : $(libcommon) $(libcommonpth) -- cgit v1.2.3