From owner-svn-src-user@freebsd.org  Sun Jan 10 00:01:04 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 782F2A6A73B
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Sun, 10 Jan 2016 00:01:04 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 48E1A1D10;
 Sun, 10 Jan 2016 00:01:04 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0A013To076468;
 Sun, 10 Jan 2016 00:01:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0A013Sj076467;
 Sun, 10 Jan 2016 00:01:03 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601100001.u0A013Sj076467@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 10 Jan 2016 00:01:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293624 -
 user/ngie/stable-10-fix-LINT-NOINET/sys/modules/if_gif
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jan 2016 00:01:04 -0000

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