From owner-svn-src-all@FreeBSD.ORG  Fri Aug  8 00:58:25 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 175E23F8
 for <svn-src-all@freebsd.org>; Fri,  8 Aug 2014 00:58:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DB47C2FFD
 for <svn-src-all@freebsd.org>; Fri,  8 Aug 2014 00:58:24 +0000 (UTC)
Received: from cy (uid 918) (envelope-from cy@FreeBSD.org) id 2253
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Fri, 08 Aug 2014 00:58:24 +0000
From: Cy Schubert <cy@FreeBSD.org>
Date: Fri, 8 Aug 2014 00:58:24 +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: r269696 - in stable/10: sbin/ipf
 sys/contrib/ipfilter/netinet
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e420b0.2253.651f7641@svn.freebsd.org>
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Aug 2014 00:58:25 -0000

Author: cy
Date: Fri Aug  8 00:58:24 2014
New Revision: 269696
URL: http://svnweb.freebsd.org/changeset/base/269696

Log:
  MFC r269585 - Honour WITH and WITHOUT_INET6_SUPPORT.
  
  Approved by:	glebius (mentor - implicit)

Modified:
  stable/10/sbin/ipf/Makefile.inc
  stable/10/sys/contrib/ipfilter/netinet/ip_compat.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/ipf/Makefile.inc
==============================================================================
--- stable/10/sbin/ipf/Makefile.inc	Thu Aug  7 22:14:37 2014	(r269695)
+++ stable/10/sbin/ipf/Makefile.inc	Fri Aug  8 00:58:24 2014	(r269696)
@@ -1,5 +1,7 @@
 #	$FreeBSD$
 
+.include <bsd.own.mk>
+
 WARNS?=		2
 NO_WFORMAT=
 NO_WARRAY_BOUNDS=
@@ -10,6 +12,12 @@ CFLAGS+=	-I${.CURDIR}/../../../sys
 CFLAGS+=	-I${.CURDIR}/../../../sys/contrib/ipfilter
 CFLAGS+=	-DSTATETOP -D__UIO_EXPOSE
 
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+=	-DUSE_INET6
+.else
+CFLAGS+=	-DNOINET6
+.endif
+
 LIBIPF=		${.OBJDIR}/../libipf/libipf.a
 DPADD+=		${LIBIPF} ${LIBKVM}
 LDADD+=		${LIBIPF} -lkvm

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_compat.h
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_compat.h	Thu Aug  7 22:14:37 2014	(r269695)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_compat.h	Fri Aug  8 00:58:24 2014	(r269696)
@@ -118,6 +118,10 @@ struct  ether_addr {
 #  if defined(INET6) && !defined(USE_INET6)
 #   define USE_INET6
 #  endif
+# else
+#  if !defined(USE_INET6) && !defined(NOINET6)
+#   define	USE_INET6
+#  endif
 # endif
 
 # if defined(_KERNEL)