svn commit: r293624 - user/ngie/stable-10-fix-LINT-NOINET/sys/modules/if_gif

[Garrett Cooper]

Author: ngie
Date: Sun Jan 10 00:01:03 2016
New Revision: 293624
URL: https://svnweb.freebsd.org/changeset/base/293624

Log:
  - Generate opt_inet.h appropriately
  - Set MK_INET_SUPPORT, respecting the user knob
  - Add in_gif.c to SRCS when MK_INET_SUPPORT != no to unbreak the build

Modified:
  user/ngie/stable-10-fix-LINT-NOINET/sys/modules/if_gif/Makefile

Modified: user/ngie/stable-10-fix-LINT-NOINET/sys/modules/if_gif/Makefile
==============================================================================
--- user/ngie/stable-10-fix-LINT-NOINET/sys/modules/if_gif/Makefile	Sat Jan  9 23:49:11 2016	(r293623)
+++ user/ngie/stable-10-fix-LINT-NOINET/sys/modules/if_gif/Makefile	Sun Jan 10 00:01:03 2016	(r293624)
@@ -5,12 +5,21 @@
 .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
 
 KMOD=	if_gif
-SRCS=	if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
+SRCS=	if_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
 
 .if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
 opt_inet.h:
 	echo "#define INET 1" > ${.TARGET}
+.endif
+.else
+OPT_INET!= cat ${KERNBUILDDIR}/opt_inet.h; echo
+.if empty(OPT_INET)
+MK_INET_SUPPORT= no
+.endif
+.endif
 
+.if !defined(KERNBUILDDIR)
 .if ${MK_INET6_SUPPORT} != "no"
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
@@ -25,6 +34,10 @@ MK_INET6_SUPPORT= no
 .endif
 .endif
 
+.if ${MK_INET_SUPPORT} != "no"
+SRCS+=	in_gif.c
+.endif
+
 .if ${MK_INET6_SUPPORT} != "no"
 SRCS+=	in6_gif.c
 .endif