diff options
| author | Shawn Routhier <sar@isc.com> | 2013-12-10 04:03:12 +0000 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.com> | 2013-12-10 04:03:12 +0000 |
| commit | e54ff84f08a5bebce9f1a343e736202d56cf1a90 (patch) | |
| tree | 443a15d1b80c163ad16c02b7266df4c922a85df1 /common/tests/Makefile.am | |
| parent | 64fb661cc8ec8ab08b1a8e54f235ccd2d46b1636 (diff) | |
| download | isc-dhcp-e54ff84f08a5bebce9f1a343e736202d56cf1a90.tar.gz | |
-n master Patch for 30461 and update the auto generated files
Update the auto genrated files to add the required bind9
libraries
Fix up dhcpctl/Makefile.am to include the isccfg lib
Patch for 30461 to allow the DHCP server to find
the name server to update via the DNS
Conflicts:
Diffstat (limited to 'common/tests/Makefile.am')
| -rw-r--r-- | common/tests/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am index 233c293c..ddb2e9da 100644 --- a/common/tests/Makefile.am +++ b/common/tests/Makefile.am @@ -13,8 +13,8 @@ ATF_TESTS += alloc_unittest dns_unittest alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c alloc_unittest_LDADD = $(ATF_LDFLAGS) alloc_unittest_LDADD += ../libdhcp.a \ - ../../omapip/libomapi.a ../../bind/lib/libdns.a \ - ../../bind/lib/libisc.a + ../../omapip/libomapi.a ../../bind/lib/libirs.a \ + ../../bind/lib/libdns.a ../bind/lib/libisccfg.a ../../bind/lib/libisc.a dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c dns_unittest_LDADD = $(ATF_LDFLAGS) |