From 8a3e6d90e52b4227bc3e4b8ff408f0ceedc2e59a Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 14 Nov 2014 21:10:45 +0000
Subject: [PATCH] Automate options INET/INET6 turning into MK_$opt_SUPPORT
 correctly. Fixes if_gfe when building without INET6 and simplifies if_gif's
 Makefile.

Sponsored by: Netflix, Inc
---
 sys/conf/kern.opts.mk       | 12 ++++++++++++
 sys/modules/if_gif/Makefile |  7 -------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index 8c7a0baac5d4..16bb13447a71 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -79,6 +79,18 @@ MK_${var}:=	no
 .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no"
 MK_${var}_SUPPORT:= no
 .else
+.if defined(KERNBUILDDIR)	# See if there's an opt_foo.h
+OPT_${var}!= cat ${KERNBUILDDIR}/opt_${var:tl}.h; echo
+.if ${OPT_${var}} == ""		# nothing -> no
+MK_${var}_SUPPORT:= no
+.else
 MK_${var}_SUPPORT:= yes
 .endif
+.else				# otherwise, yes
+MK_${var}_SUPPORT:= yes
+.endif
+.endif
 .endfor
+
+
+
diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile
index af8c3c72fea9..663c679f4631 100644
--- a/sys/modules/if_gif/Makefile
+++ b/sys/modules/if_gif/Makefile
@@ -8,13 +8,6 @@ SYSDIR?=${.CURDIR}/../..
 KMOD=	if_gif
 SRCS=	if_gif.c in_gif.c opt_inet.h opt_inet6.h
 
-.if defined(KERNBUILDDIR)
-OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h; echo
-.if empty(OPT_INET6)
-MK_INET6_SUPPORT=no
-.endif
-.endif
-
 .if ${MK_INET6_SUPPORT} != "no"
 SRCS+=	in6_gif.c
 .endif