aboutsummaryrefslogtreecommitdiff
path: root/sys/modules
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2011-04-30 17:59:54 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2011-04-30 17:59:54 +0000
commitaf8a927e14e3216e5c03edcb9365f010356cc260 (patch)
treec86c93e0bdd698fc5ce13859d489b995e67e6445 /sys/modules
parent970a76538938aeba73edd7b836700e461f51b161 (diff)
Notes
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/Makefile16
-rw-r--r--sys/modules/if_carp/Makefile2
2 files changed, 15 insertions, 3 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index b63fe0c395623..f3e67c93cb610 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -116,14 +116,14 @@ SUBDIR= ${_3dfx} \
${_ida} \
${_ie} \
if_bridge \
- if_carp \
+ ${_if_carp} \
if_disc \
if_edsc \
if_ef \
if_epair \
if_faith \
if_gif \
- if_gre \
+ ${_if_gre} \
if_lagg \
${_if_ndis} \
if_stf \
@@ -358,6 +358,15 @@ _random= random
.endif
.endif
+.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES)
+_if_gre= if_gre
+.endif
+
+.if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
+ defined(ALL_MODULES)
+_if_carp= if_carp
+.endif
+
.if ${MK_IPFILTER} != "no" || defined(ALL_MODULES)
_ipfilter= ipfilter
.endif
@@ -366,7 +375,8 @@ _ipfilter= ipfilter
_netgraph= netgraph
.endif
-.if ${MK_PF} != "no" || defined(ALL_MODULES)
+.if (${MK_PF} != "no" && (${MK_INET_SUPPORT} != "no" || \
+ ${MK_INET6_SUPPORT} != "no")) || defined(ALL_MODULES)
_pf= pf
_pflog= pflog
.endif
diff --git a/sys/modules/if_carp/Makefile b/sys/modules/if_carp/Makefile
index f315a8092631e..f1a0dea881279 100644
--- a/sys/modules/if_carp/Makefile
+++ b/sys/modules/if_carp/Makefile
@@ -9,8 +9,10 @@ SRCS= ip_carp.c
SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h vnode_if.h
.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
opt_inet.h:
@echo "#define INET 1" > ${.TARGET}
+.endif
.if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h: