From e54ff84f08a5bebce9f1a343e736202d56cf1a90 Mon Sep 17 00:00:00 2001 From: Shawn Routhier Date: Tue, 10 Dec 2013 04:03:12 +0000 Subject: -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: --- common/tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/tests/Makefile.am') 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) -- cgit v1.2.1