Merged rt43473 (libtool instal)

diff --git a/dhcpctl/cltest.c b/dhcpctl/cltest.c
index 8a671dc9707516ffd6ff17b4f1a3d7873202a32e..3bd524f0a116a4b7e09701e91b84b90069578aca 100644 (file)
--- 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 adf4b9aee583b9661573e3f8720b700a6d3455e9..aaf8981cee676c9f0dd6849ba9af4fea6d38912d 100644 (file)
--- 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 4f604a22de03db8b4c7b8529add0154da273eded..f4943879a3ebc1e96d1b5f5176acdbfd3a884b3b 100644 (file)
--- 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 9ef221a12819123d3a665af1acdaf45c7c8a3200..718758e1a1d1add54f8c6cd3a98d00ec75764db8 100644 (file)
--- a/tests/t_api_dhcp.c
+++ b/tests/t_api_dhcp.c
@@ -18,6 +18,11 @@ void
 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 7c7a4a3338bc5564b0450137bfdaa520f50fb600..ccf77971865d65851c851af84a87dc0626f27071 100644 (file)
--- 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: