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:
Bjoern A. Zeeb 2011-04-30 17:59:54 +00:00
parent 970a765389
commit af8a927e14
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} \
${_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

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
.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: