Date: Sat, 30 Apr 2011 17:59:54 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r221267 - in head/sys/modules: . if_carp Message-ID: <201104301759.p3UHxsL9056656@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Sat Apr 30 17:59:54 2011 New Revision: 221267 URL: http://svn.freebsd.org/changeset/base/221267 Log: 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 Modified: head/sys/modules/Makefile head/sys/modules/if_carp/Makefile Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Sat Apr 30 17:58:28 2011 (r221266) +++ head/sys/modules/Makefile Sat Apr 30 17:59:54 2011 (r221267) @@ -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 Modified: head/sys/modules/if_carp/Makefile ============================================================================== --- head/sys/modules/if_carp/Makefile Sat Apr 30 17:58:28 2011 (r221266) +++ head/sys/modules/if_carp/Makefile Sat Apr 30 17:59:54 2011 (r221267) @@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104301759.p3UHxsL9056656>