diff options
author | cy <cy@FreeBSD.org> | 2014-08-08 00:58:24 +0000 |
---|---|---|
committer | cy <cy@FreeBSD.org> | 2014-08-08 00:58:24 +0000 |
commit | 1a5e7231e414c881517d4da5a140a2f127ea75e4 (patch) | |
tree | b8b5f9b94e573479c1c5affeeaea22f3cc15e308 | |
parent | 2bfd7007417a2cd7c442bf1162e609303f217744 (diff) | |
download | FreeBSD-src-1a5e7231e414c881517d4da5a140a2f127ea75e4.zip FreeBSD-src-1a5e7231e414c881517d4da5a140a2f127ea75e4.tar.gz |
MFC r269585 - Honour WITH and WITHOUT_INET6_SUPPORT.
Approved by: glebius (mentor - implicit)
-rw-r--r-- | sbin/ipf/Makefile.inc | 8 | ||||
-rw-r--r-- | sys/contrib/ipfilter/netinet/ip_compat.h | 4 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc index b3efd6f..f8c9977 100644 --- a/sbin/ipf/Makefile.inc +++ b/sbin/ipf/Makefile.inc @@ -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 diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h index 0cd5d5b..5f86a87 100644 --- a/sys/contrib/ipfilter/netinet/ip_compat.h +++ b/sys/contrib/ipfilter/netinet/ip_compat.h @@ -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) |