d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update carp, gre and pf module builds to be depenent on INET and/or

Browse Source 
INET6_SUPPORT.

Reviewed by:	gnn (slightly earlier version without pf)
Sponsored by:	The FreeBSD Foundation
Sponsored by:	iXsystems
MFC after:	2 weeks
This commit is contained in:
bz 2011-04-30 17:59:54 +00:00
parent 5b8b8b0a6a
commit cbe6b32c84
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/modules/Makefile
View File

@ -116,14 +116,14 @@ SUBDIR= ${_3dfx} \
${_ida} \ ${_ida} \
${_ie} \ ${_ie} \
if_bridge \ if_bridge \
if_carp \ ${_if_carp} \
if_disc \ if_disc \
if_edsc \ if_edsc \
if_ef \ if_ef \
if_epair \ if_epair \
if_faith \ if_faith \
if_gif \ if_gif \
if_gre \ ${_if_gre} \
if_lagg \ if_lagg \
${_if_ndis} \ ${_if_ndis} \
if_stf \ if_stf \
@ -358,6 +358,15 @@ _random= random
.endif .endif
.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) .if ${MK_IPFILTER} != "no" || defined(ALL_MODULES)
_ipfilter= ipfilter _ipfilter= ipfilter
.endif .endif
@ -366,7 +375,8 @@ _ipfilter= ipfilter
_netgraph= netgraph _netgraph= netgraph
.endif .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 _pf= pf
_pflog= pflog _pflog= pflog
.endif .endif

2
sys/modules/if_carp/Makefile
View File

@ -9,8 +9,10 @@ SRCS= ip_carp.c
SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h vnode_if.h SRCS+= opt_carp.h opt_bpf.h opt_inet.h opt_inet6.h vnode_if.h
.if !defined(KERNBUILDDIR) .if !defined(KERNBUILDDIR)
.if ${MK_INET_SUPPORT} != "no"
opt_inet.h: opt_inet.h:
@echo "#define INET 1" > ${.TARGET} @echo "#define INET 1" > ${.TARGET}
.endif
.if ${MK_INET6_SUPPORT} != "no" .if ${MK_INET6_SUPPORT} != "no"
opt_inet6.h: opt_inet6.h: