svn commit: r269696 - in stable/10: sbin/ipf sys/contrib/ipfilter/netinet

[Cy Schubert]

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)