diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2016-02-18 00:39:38 -0800 |
|---|---|---|
| committer | Filipe Brandenburger <filbranden@google.com> | 2016-02-18 00:39:38 -0800 |
| commit | e49a8dcc296a218d8fdb09cb86a671ec89c93a6f (patch) | |
| tree | d11da85d3560c8ef556b63fb195d57ad774f1ca5 /Makefile.am | |
| parent | 5031c4e21b4379c1824033be675517978090fd36 (diff) | |
build-sys: Do not build tests that depend on resolved when it has been disabled
If ./configure --disable-resolved has been used, do not try to build
test-dns-packet and test-resolve-tables which depend on it.
Previously, the SOURCES, LIBS and LDADDs for these tests were made conditional
while the main rules for them weren't, causing build failures trying to build a
binary with no sources.
This was uncovered when trying to build udeb for systemd in CI, which uses
--disable-resolved for a minimal build, which uncovered the issue.
Fixes #2651.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 8c151f538f..9ffa40bbd7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1476,8 +1476,6 @@ tests += \ test-af-list \ test-arphrd-list \ test-dns-domain \ - test-dns-packet \ - test-resolve-tables \ test-install-root \ test-rlimit-util \ test-signal-util @@ -5208,6 +5206,8 @@ bin_PROGRAMS += \ systemd-resolve tests += \ + test-dns-packet \ + test-resolve-tables \ test-dns-domain \ test-dnssec |