From owner-svn-src-stable@freebsd.org  Thu Jan 14 17:44:46 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 885BAA8314B;
 Thu, 14 Jan 2016 17:44:46 +0000 (UTC)
 (envelope-from sbruno@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 561041A8E;
 Thu, 14 Jan 2016 17:44:46 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0EHijRj087555;
 Thu, 14 Jan 2016 17:44:45 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0EHijHT087554;
 Thu, 14 Jan 2016 17:44:45 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201601141744.u0EHijHT087554@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Thu, 14 Jan 2016 17:44:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r294025 - stable/10/sys/modules/if_gif
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jan 2016 17:44:46 -0000

Author: sbruno
Date: Thu Jan 14 17:44:45 2016
New Revision: 294025
URL: https://svnweb.freebsd.org/changeset/base/294025

Log:
  Fixup option handling after r293778 by wrapping MK_INET6_SUPPORT in a
  KERNBUILDDIR check.
  
  Sponsored by:	Limelight Networks

Modified:
  stable/10/sys/modules/if_gif/Makefile

Modified: stable/10/sys/modules/if_gif/Makefile
==============================================================================
--- stable/10/sys/modules/if_gif/Makefile	Thu Jan 14 17:42:46 2016	(r294024)
+++ stable/10/sys/modules/if_gif/Makefile	Thu Jan 14 17:44:45 2016	(r294025)
@@ -17,7 +17,9 @@ OPT_INET!= cat ${KERNBUILDDIR}/opt_inet.
 .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}