diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-12-03 01:52:01 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-12-03 01:52:01 +0100 |
| commit | 3f967a4ccf1846514bd638f38e4f487bb4e1c317 (patch) | |
| tree | 07bb4f6a9b1defea1df208a2f5097433a2e9787e /Makefile.am | |
| parent | 5449f1e3312e5467ce321fc2d7aa16a0ce0c60d2 (diff) | |
| parent | 964ef14c2525f3a0311acb24c6814c5bfbe43cfc (diff) | |
Merge pull request #2087 from poettering/dnssec
Basic DNSSEC support, and unrelated fixes
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index cecd139e4f..29c7f322ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5136,12 +5136,13 @@ polkitpolicy_in_files += \ src/import/org.freedesktop.import1.policy.in EXTRA_DIST += \ - units/systemd-importd.service.in \ - src/resolve/resolved.conf.in + units/systemd-importd.service.in # ------------------------------------------------------------------------------ if ENABLE_RESOLVED +if HAVE_GCRYPT + systemd_resolved_SOURCES = \ src/resolve/resolved.c \ src/resolve/resolved-manager.c \ @@ -5181,6 +5182,8 @@ systemd_resolved_SOURCES = \ src/resolve/resolved-dns-zone.c \ src/resolve/resolved-dns-stream.h \ src/resolve/resolved-dns-stream.c \ + src/resolve/resolved-dns-dnssec.h \ + src/resolve/resolved-dns-dnssec.c \ src/resolve/dns-type.c \ src/resolve/dns-type.h @@ -5226,9 +5229,6 @@ GENERAL_ALIASES += \ nodist_pkgsysconf_DATA += \ src/resolve/resolved.conf -tests += \ - test-dns-domain - libnss_resolve_la_SOURCES = \ src/nss-resolve/nss-resolve.sym \ src/nss-resolve/nss-resolve.c @@ -5272,10 +5272,34 @@ systemd_resolve_host_LDADD = \ rootlibexec_PROGRAMS += \ systemd-resolve-host +tests += \ + test-dns-domain \ + test-dnssec + +test_dnssec_SOURCES = \ + src/resolve/test-dnssec.c \ + src/resolve/resolved-dns-packet.c \ + src/resolve/resolved-dns-packet.h \ + src/resolve/resolved-dns-rr.c \ + src/resolve/resolved-dns-rr.h \ + src/resolve/resolved-dns-answer.c \ + src/resolve/resolved-dns-answer.h \ + src/resolve/resolved-dns-question.c \ + src/resolve/resolved-dns-question.h \ + src/resolve/resolved-dns-dnssec.c \ + src/resolve/resolved-dns-dnssec.h \ + src/resolve/dns-type.c \ + src/resolve/dns-type.h + +test_dnssec_LDADD = \ + libshared.la + +endif endif EXTRA_DIST += \ - units/systemd-resolved.service.m4.in + units/systemd-resolved.service.m4.in \ + src/resolve/resolved.conf.in # ------------------------------------------------------------------------------ if ENABLE_NETWORKD |