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 /server/tests | |
| 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 'server/tests')
| -rw-r--r-- | server/tests/Makefile.am | 5 | ||||
| -rw-r--r-- | server/tests/Makefile.in | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am index d9945a12..1b257462 100644 --- a/server/tests/Makefile.am +++ b/server/tests/Makefile.am @@ -18,8 +18,9 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \ ../ldap.c ../ldap_casa.c ../dhcpd.c DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ - $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libdns.a \ - $(top_builddir)/bind/lib/libisc.a + $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libirs.a \ + $(top_builddir)/bind/lib/libdns.a $(top_builddir/bind/lib/libisccfg.a \ + $(top_builddir)/bind/lib/libisc.a ATF_TESTS = TESTS = diff --git a/server/tests/Makefile.in b/server/tests/Makefile.in index e5250b30..5c100a33 100644 --- a/server/tests/Makefile.in +++ b/server/tests/Makefile.in @@ -565,8 +565,9 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpars.c ../db.c ../class.c \ ../ldap.c ../ldap_casa.c ../dhcpd.c DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \ - $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libdns.a \ - $(top_builddir)/bind/lib/libisc.a + $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libirs.a \ + $(top_builddir)/bind/lib/libdns.a $(top_builddir/bind/lib/libisccfg.a \ + $(top_builddir)/bind/lib/libisc.a ATF_TESTS = $(am__append_1) @HAVE_ATF_TRUE@dhcpd_unittests_SOURCES = $(DHCPSRC) simple_unittest.c |