Merge tag '1_26_2' into w32_1_26_2w32_1_26_2

2 files changed, 1 insertions, 3 deletions

diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index c34c8d6f0..90fb313b5 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -16,7 +16,6 @@ config UDHCPD
 config DHCPRELAY
         bool "dhcprelay"
         default y
-        depends on UDHCPD
         help
           dhcprelay listens for dhcp requests on one or more interfaces
           and forwards these requests to a different interface or dhcp
@@ -25,7 +24,6 @@ config DHCPRELAY
 config DUMPLEASES
         bool "Lease display utility (dumpleases)"
         default y
-        depends on UDHCPD
         help
           dumpleases displays the leases written out by the udhcpd server.
           Lease times are stored in the file by time remaining in lease, or
diff --git a/networking/udhcp/Kbuild.src b/networking/udhcp/Kbuild.src
index 5ea77df06..fcb725fbc 100644
--- a/networking/udhcp/Kbuild.src
+++ b/networking/udhcp/Kbuild.src
@@ -15,7 +15,7 @@ lib-$(CONFIG_UDHCPD)     += common.o packet.o signalpipe.o socket.o
 lib-$(CONFIG_UDHCPC)     += dhcpc.o
 lib-$(CONFIG_UDHCPD)     += dhcpd.o arpping.o
 lib-$(CONFIG_DUMPLEASES) += dumpleases.o
-lib-$(CONFIG_DHCPRELAY)  += dhcprelay.o
+lib-$(CONFIG_DHCPRELAY)  += dhcprelay.o common.o socket.o packet.o
 
 lib-$(CONFIG_FEATURE_UDHCPC_ARPING) += arpping.o
 lib-$(CONFIG_FEATURE_UDHCP_RFC3397) += domain_codec.o