Support kernels which implement RFC5227.

This means we don't have to open an ARP socket unless we need to ARPing.
Allow ARP an ARPing to be optional features.

1 files changed, 19 insertions, 4 deletions

diff --git a/configure b/configure
index b47f91e1..602560e2 100755
--- a/configure
+++ b/configure
@@ -7,6 +7,8 @@ exec 3>config.log
 # Ensure that we do not inherit these from env
 HOOKSET=false
 INET=
+ARP=
+ARPING=
 IPV4LL=
 INET6=
 ARC4RANDOM=
@@ -44,11 +46,15 @@ for x do
 	--enable-fork) FORK=yes;;
 	--disable-static) STATIC=no;;
 	--enable-static) STATIC=yes;;
-	--disable-ipv4|--disable-inet) INET=no;;
+	--disable-ipv4|--disable-inet) INET=no; ARP=no; ARPING=no; IPV4LL=no;;
 	--enable-ipv4|--enable-inet) INET=yes;;
+	--disable-arp) ARP=no; ARPING=no; IPV4LL=no;;
+	--enable-arp) ARP=yes; INET=yes;;
+	--disable-arping) ARPING=no;;
+	--enable-arping) ARPING=yes; ARP=yes; INET=yes;;
 	--disable-ipv4ll) IPV4LL=no;;
-	--enable-ipv4ll) IPV4LL=yes; INET=yes;;
-	--disable-ipv6|--disable-inet6) INET6=no;;
+	--enable-ipv4ll) IPV4LL=yes; ARP=yes; INET=yes;;
+	--disable-ipv6|--disable-inet6) INET6=no; DHCP6=no;;
 	--enable-ipv6|--enable-inet6) INET6=yes;;
 	--disable-dhcp6) DHCP6=no;;
 	--enable-dhcp6) DHCP6=yes;;
@@ -444,7 +450,16 @@ esac
 if [ -z "$INET" -o "$INET" = yes ]; then
 	echo "Enabling INET support"
 	echo "CPPFLAGS+=	-DINET" >>$CONFIG_MK
-	echo "DHCPCD_SRCS+=	arp.c dhcp.c ipv4.c" >>$CONFIG_MK
+	echo "DHCPCD_SRCS+=	dhcp.c ipv4.c" >>$CONFIG_MK
+	if [ -z "$ARP" -o "$ARP" = yes ]; then
+		echo "Enabling ARP support"
+		echo "CPPFLAGS+=	-DARP" >>$CONFIG_MK
+		echo "DHCPCD_SRCS+=	arp.c" >>$CONFIG_MK
+	fi
+	if [ -z "$ARPING" -o "$ARPING" = yes ]; then
+		echo "Enabling ARPing support"
+		echo "CPPFLAGS+=	-DARPING" >>$CONFIG_MK
+	fi
 	if [ -z "$IPV4LL" -o "$IPV4LL" = yes ]; then
 		echo "Enabling IPv4LL support"
 		echo "CPPFLAGS+=	-DIPV4LL" >>$CONFIG_MK