summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authordarrenr <darrenr@FreeBSD.org>2004-06-08 23:52:22 +0000
committerdarrenr <darrenr@FreeBSD.org>2004-06-08 23:52:22 +0000
commit10c0032386a6a1aef02048598a920c5ab2a27e0e (patch)
treec806bfeace868e00c717825ff00cb184be25450b /sys
parentaeea66884328b345024bd425cde4a80b02b7809c (diff)
downloadFreeBSD-src-10c0032386a6a1aef02048598a920c5ab2a27e0e.zip
FreeBSD-src-10c0032386a6a1aef02048598a920c5ab2a27e0e.tar.gz
Recognise NOINET6 as an indication to not build IPv6 enabled source even
if FreeBSD header files, etc, support it. Submitted by: Sergey Mokryshev <mokr@mokr.net>
Diffstat (limited to 'sys')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_compat.h3
-rw-r--r--sys/modules/ipfilter/Makefile3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h
index d14ad2b..2611929 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/sys/contrib/ipfilter/netinet/ip_compat.h
@@ -261,7 +261,8 @@ typedef u_int32_t u_32_t;
# endif
# endif
# if !defined(_KERNEL) && !defined(IPFILTER_LKM) && !defined(USE_INET6)
-# if (defined(__FreeBSD_version) && (__FreeBSD_version >= 400000)) || \
+# if (defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \
+ !defined(NOINET6)) || \
(defined(OpenBSD) && (OpenBSD >= 200111)) || \
(defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 105000000))
# define USE_INET6
diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile
index a98d29c..7297cd2 100644
--- a/sys/modules/ipfilter/Makefile
+++ b/sys/modules/ipfilter/Makefile
@@ -6,11 +6,12 @@ KMOD= ipl
SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \
ip_log.c ip_fil.c fil.c
+.if !defined(NOINET6)
CFLAGS+= -DUSE_INET6
+.endif
CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter
CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DPFIL_HOOKS
#
-# If you don't want IPv6 functionality remove -DUSE_INET6
# If you don't want log functionality remove -DIPFILTER_LOG
#
OpenPOWER on IntegriCloud