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 /relay | |
| 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 'relay')
| -rw-r--r-- | relay/Makefile.am | 3 | ||||
| -rw-r--r-- | relay/Makefile.in | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/relay/Makefile.am b/relay/Makefile.am index d8757cac..198d5cd6 100644 --- a/relay/Makefile.am +++ b/relay/Makefile.am @@ -3,7 +3,8 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' sbin_PROGRAMS = dhcrelay dhcrelay_SOURCES = dhcrelay.c dhcrelay_LDADD = ../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 man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) diff --git a/relay/Makefile.in b/relay/Makefile.in index 199631a8..be95fb71 100644 --- a/relay/Makefile.in +++ b/relay/Makefile.in @@ -95,7 +95,8 @@ PROGRAMS = $(sbin_PROGRAMS) am_dhcrelay_OBJECTS = dhcrelay.$(OBJEXT) dhcrelay_OBJECTS = $(am_dhcrelay_OBJECTS) dhcrelay_DEPENDENCIES = ../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 AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -286,7 +287,8 @@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' dhcrelay_SOURCES = dhcrelay.c dhcrelay_LDADD = ../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 man_MANS = dhcrelay.8 EXTRA_DIST = $(man_MANS) |