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 /dhcpctl | |
| 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 'dhcpctl')
| -rw-r--r-- | dhcpctl/Makefile.am | 6 | ||||
| -rw-r--r-- | dhcpctl/Makefile.in | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am index 61049bea..dfa47095 100644 --- a/dhcpctl/Makefile.am +++ b/dhcpctl/Makefile.am @@ -6,10 +6,12 @@ EXTRA_DIST = $(man_MANS) omshell_SOURCES = omshell.c omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a + ../bind/lib/libirs.a ../bind/lib/libdns.a \ + ../bind/lib/libisccfg.a ../bind/lib/libisc.a libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c cltest_SOURCES = cltest.c cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a
\ No newline at end of file + ../bind/lib/libirs.a ../bind/lib/libdns.a \ + ../bind/lib/libisccfg.a ../bind/lib/libisc.a diff --git a/dhcpctl/Makefile.in b/dhcpctl/Makefile.in index afb76047..61cfcf12 100644 --- a/dhcpctl/Makefile.in +++ b/dhcpctl/Makefile.in @@ -137,11 +137,13 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_cltest_OBJECTS = cltest.$(OBJEXT) cltest_OBJECTS = $(am_cltest_OBJECTS) cltest_DEPENDENCIES = libdhcpctl.a ../common/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 am_omshell_OBJECTS = omshell.$(OBJEXT) omshell_OBJECTS = $(am_omshell_OBJECTS) omshell_DEPENDENCIES = libdhcpctl.a ../common/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 AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -309,12 +311,14 @@ man_MANS = omshell.1 dhcpctl.3 EXTRA_DIST = $(man_MANS) omshell_SOURCES = omshell.c omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a + ../bind/lib/libirs.a ../bind/lib/libdns.a \ + ../bind/lib/libisccfg.a ../bind/lib/libisc.a libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c cltest_SOURCES = cltest.c cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ - ../bind/lib/libdns.a ../bind/lib/libisc.a + ../bind/lib/libirs.a ../bind/lib/libdns.a \ + ../bind/lib/libisccfg.a ../bind/lib/libisc.a all: all-am |