diff options
| author | cy <cy@FreeBSD.org> | 2014-08-05 13:01:21 +0000 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2014-08-05 13:01:21 +0000 |
| commit | d63d43ae3314c7680d0c22287c24ea5bc8afb4fc (patch) | |
| tree | 82a6e6412ec75f683d46ef04ddddcfb54a3f9124 | |
| parent | 3c2dc8ad2a105f4ec6b5cbb6db1d3e7a367f5dbf (diff) | |
| download | FreeBSD-src-d63d43ae3314c7680d0c22287c24ea5bc8afb4fc.zip FreeBSD-src-d63d43ae3314c7680d0c22287c24ea5bc8afb4fc.tar.gz | |
Honour WITH and WITHOUT_INET6_SUPPORT.
Approved by: glebius (mentor)
MFC after: 3 days
| -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..2d7d7b1 100644 --- a/sbin/ipf/Makefile.inc +++ b/sbin/ipf/Makefile.inc @@ -1,5 +1,7 @@ # $FreeBSD$ +.include <src.opts.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 e88ef88..6d74468 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) |
