diff options
Diffstat (limited to '')
| -rw-r--r-- | dirmngr/Makefile.am | 30 | ||||
| -rw-r--r-- | dirmngr/dirmngr.h | 2 | ||||
| -rw-r--r-- | dirmngr/http.c (renamed from common/http.c) | 0 | ||||
| -rw-r--r-- | dirmngr/http.h (renamed from common/http.h) | 0 | ||||
| -rw-r--r-- | dirmngr/ks-engine.h | 2 | ||||
| -rw-r--r-- | dirmngr/t-http.c (renamed from common/t-http.c) | 0 | ||||
| -rw-r--r-- | dirmngr/tls-ca.pem (renamed from common/tls-ca.pem) | 0 |
7 files changed, 25 insertions, 9 deletions
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index cee777a6a..a9f09fde5 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 @@ -62,6 +62,7 @@ dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c \ cdb.h cdblib.c misc.c dirmngr-err.h \ ocsp.c ocsp.h validate.c validate.h \ dns-cert.c dns-cert.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,8 +109,7 @@ 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 \ $(GPG_ERROR_LIBS) $(NETLIBS) \ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \ $(DNSLIBS) $(LIBINTL) $(LIBICONV) @@ -120,12 +120,28 @@ 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 +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 \ + t-ldap-parse-uri.c ldap-parse-uri.c ldap-parse-uri.h http.c \ $(ldap_url) $(t_common_src) +t_ldap_parse_uri_CFLAGS = -DWITHOUT_NPTH=1 t_ldap_parse_uri_LDADD = $(ldaplibs) $(t_common_ldadd) t_dns_cert_SOURCES = t-dns-cert.c dns-cert.c t_dns_cert_LDADD = $(t_common_ldadd) -$(PROGRAMS) : $(libcommon) $(libcommonpth) $(libcommontls) $(libcommontlsnpth) +$(PROGRAMS) : $(libcommon) $(libcommonpth) diff --git a/dirmngr/dirmngr.h b/dirmngr/dirmngr.h index b2b94f9c8..dff902aa5 100644 --- a/dirmngr/dirmngr.h +++ b/dirmngr/dirmngr.h @@ -33,7 +33,7 @@ #include "../common/membuf.h" #include "../common/sysutils.h" /* (gnupg_fd_t) */ #include "../common/i18n.h" -#include "../common/http.h" /* (parsed_uri_t) */ +#include "http.h" /* (parsed_uri_t) */ /* This objects keeps information about a particular LDAP server and is used as item of a single linked list of servers. */ diff --git a/common/http.c b/dirmngr/http.c index edd8a6d27..edd8a6d27 100644 --- a/common/http.c +++ b/dirmngr/http.c diff --git a/common/http.h b/dirmngr/http.h index 73a423cd5..73a423cd5 100644 --- a/common/http.h +++ b/dirmngr/http.h diff --git a/dirmngr/ks-engine.h b/dirmngr/ks-engine.h index aff6cf472..6684a12b2 100644 --- a/dirmngr/ks-engine.h +++ b/dirmngr/ks-engine.h @@ -21,7 +21,7 @@ #ifndef DIRMNGR_KS_ENGINE_H #define DIRMNGR_KS_ENGINE_H 1 -#include "../common/http.h" +#include "http.h" /*-- ks-action.c --*/ gpg_error_t ks_print_help (ctrl_t ctrl, const char *text); diff --git a/common/t-http.c b/dirmngr/t-http.c index 41b2dd118..41b2dd118 100644 --- a/common/t-http.c +++ b/dirmngr/t-http.c diff --git a/common/tls-ca.pem b/dirmngr/tls-ca.pem index c29646674..c29646674 100644 --- a/common/tls-ca.pem +++ b/dirmngr/tls-ca.pem |