diff options
| author | Francis Dupont <fdupont@isc.org> | 2016-11-03 09:36:56 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2016-11-03 09:36:56 +0100 |
| commit | e4dcd805cc48b71a6f24e41ff8d4a212212f04b1 (patch) | |
| tree | a8a849d47c3105c057b54451512777e12dbd10f5 | |
| parent | e0735300c02e9ba47605a174ea3a3f79e98cda28 (diff) | |
| download | isc-dhcp-e4dcd805cc48b71a6f24e41ff8d4a212212f04b1.tar.gz | |
Merged rt43473 (libtool instal)
| -rw-r--r-- | dhcpctl/cltest.c | 6 | ||||
| -rw-r--r-- | dhcpctl/omshell.c | 6 | ||||
| -rw-r--r-- | relay/dhcrelay.c | 7 | ||||
| -rw-r--r-- | tests/t_api_dhcp.c | 5 | ||||
| -rw-r--r-- | util/Makefile.bind.in | 34 |
5 files changed, 41 insertions, 17 deletions
diff --git a/dhcpctl/cltest.c b/dhcpctl/cltest.c index 8a671dc9..3bd524f0 100644 --- a/dhcpctl/cltest.c +++ b/dhcpctl/cltest.c @@ -55,6 +55,12 @@ void bootp (struct packet *packet) { } #ifdef DHCPv6 /* XXX: should we warn or something here? */ void dhcpv6(struct packet *packet) { } +#ifdef DHCP4o6 +isc_result_t dhcpv4o6_handler(omapi_object_t *h) +{ + return ISC_R_NOTIMPLEMENTED; +} +#endif /* DHCP4o6 */ #endif /* DHCPv6 */ int check_collection (struct packet *p, struct lease *l, struct collection *c) diff --git a/dhcpctl/omshell.c b/dhcpctl/omshell.c index adf4b9ae..aaf8981c 100644 --- a/dhcpctl/omshell.c +++ b/dhcpctl/omshell.c @@ -56,6 +56,12 @@ void bootp (struct packet *packet) { } #ifdef DHCPv6 /* XXX: should we warn or something here? */ void dhcpv6(struct packet *packet) { } +#ifdef DHCP4o6 +isc_result_t dhcpv4o6_handler(omapi_object_t *h) +{ + return ISC_R_NOTIMPLEMENTED; +} +#endif /* DHCP4o6 */ #endif /* DHCPv6 */ int check_collection (struct packet *p, struct lease *l, struct collection *c) diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c index 4f604a22..f4943879 100644 --- a/relay/dhcrelay.c +++ b/relay/dhcrelay.c @@ -1886,6 +1886,13 @@ dhcp(struct packet *packet) { return; } +#if defined(DHCPv6) && defined(DHCP4o6) +isc_result_t dhcpv4o6_handler(omapi_object_t *h) +{ + return ISC_R_NOTIMPLEMENTED; +} +#endif + void classify(struct packet *p, struct class *c) { return; diff --git a/tests/t_api_dhcp.c b/tests/t_api_dhcp.c index 9ef221a1..718758e1 100644 --- a/tests/t_api_dhcp.c +++ b/tests/t_api_dhcp.c @@ -19,6 +19,11 @@ dhcpv6(struct packet *packet) { } isc_result_t +dhcpv4o6_handler(omapi_object_t *h) { + return ISC_R_NOTIMPLEMENTED; +} + +isc_result_t dhcp_set_control_state(control_object_state_t old, control_object_state_t new) { return ISC_R_NOTIMPLEMENTED; } diff --git a/util/Makefile.bind.in b/util/Makefile.bind.in index 7c7a4a33..ccf77971 100644 --- a/util/Makefile.bind.in +++ b/util/Makefile.bind.in @@ -74,23 +74,23 @@ atf: bind2: # Build and install the libraries # No need to do anything if we already have something installed. - @if test -d ${binddir}/lib ; then \ - echo Bind libraries already installed ; \ - else \ - echo Building BIND libraries - this takes some time. ; \ - for libdir in ${bindlibs} ; do \ - (cd ${bindsrcdir}/lib/$$libdir ; \ - echo Building $$libdir library in `pwd` ; \ - $(MAKE) >> ${binddir}/build.log) ; \ - done ; \ - \ - echo Installing BIND libraries to ${binddir}. ; \ - for libdir in ${bindlibs} ; do \ - (cd ${bindsrcdir}/lib/$$libdir ; \ - MAKEDEFS="${installdirs}"; export MAKEDEFS; \ - $(MAKE) ${installdirs} install >> \ - ${binddir}/install.log) ; \ - done ; \ + @if test -d ${binddir}/lib ; then \ + echo Bind libraries already installed ; \ + else \ + echo Building BIND libraries - this takes some time. ; \ + for libdir in ${bindlibs} ; do \ + (cd ${bindsrcdir}/lib/$$libdir ; \ + echo Building $$libdir library in `pwd` ; \ + $(MAKE) >> ${binddir}/build.log) ; \ + done ; \ + \ + echo Installing BIND libraries to ${binddir}. ; \ + for libdir in ${bindlibs} ; do \ + (cd ${bindsrcdir}/lib/$$libdir ; \ + MAKEDEFS="${installdirs}"; export MAKEDEFS; \ + $(MAKE) ${installdirs} LIBTOOL_MODE_INSTALL= install >> \ + ${binddir}/install.log) ; \ + done ; \ fi clean: |