Index: stable/10/sys/modules/if_gif/Makefile
===================================================================
--- stable/10/sys/modules/if_gif/Makefile	(revision 293777)
+++ stable/10/sys/modules/if_gif/Makefile	(revision 293778)
@@ -1,32 +1,43 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 .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
 
 .if ${MK_INET6_SUPPORT} != "no"
 opt_inet6.h:
 	echo "#define INET6 1" > ${.TARGET}
 .endif
 
 opt_mrouting.h:
 	echo "#define MROUTING 1" > ${.TARGET}
 .else
 OPT_INET6!= cat ${KERNBUILDDIR}/opt_inet6.h; echo
 .if empty(OPT_INET6)
 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
 
 .include <bsd.kmod.mk>
Index: stable/10
===================================================================
--- stable/10	(revision 293777)
+++ stable/10	(revision 293778)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /user/ngie/stable-10-fix-LINT-NOINET:r293623-293724