diff options
| author | bz <bz@FreeBSD.org> | 2011-04-30 17:59:54 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2011-04-30 17:59:54 +0000 |
| commit | cbe6b32c84a7b46c75094170b67168a68e2c6416 (patch) | |
| tree | c86c93e0bdd698fc5ce13859d489b995e67e6445 /sys/modules | |
| parent | 5b8b8b0a6ae8544e627604541b436e4f730f5f8d (diff) | |
| download | FreeBSD-src-cbe6b32c84a7b46c75094170b67168a68e2c6416.zip FreeBSD-src-cbe6b32c84a7b46c75094170b67168a68e2c6416.tar.gz | |
Update carp, gre and pf module builds to be depenent on INET and/or
INET6_SUPPORT.
Reviewed by: gnn (slightly earlier version without pf)
Sponsored by: The FreeBSD Foundation
Sponsored by: iXsystems
MFC after: 2 weeks
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/Makefile | 16 | ||||
| -rw-r--r-- | sys/modules/if_carp/Makefile | 2 |
2 files changed, 15 insertions, 3 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index b63fe0c..f3e67c9 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 f315a80..f1a0dea 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: |
