Remove all the RELEASE_CRUNCH instances that partially disable IPSEC
We remove IPSEC only in parts of the tree, and not others. RELEASE_CRUNCH to disable it has not kept up with all its uses. Remove it. Should there be a real need to disable IPSEC, one that hasn't shown up in the base system to date, it can be re-added behind a WITHOUT_IPSEC build option.
This commit is contained in:
parent
ad038195bd
commit
01b0122954
@ -19,9 +19,7 @@ LIBADD+= cap_dns
|
||||
CFLAGS+=-DWITH_CASPER
|
||||
.endif
|
||||
|
||||
.if !defined(RELEASE_CRUNCH)
|
||||
CFLAGS+=-DIPSEC
|
||||
LIBADD+= ipsec
|
||||
.endif
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -21,14 +21,8 @@ WARNS?= 2
|
||||
|
||||
LIBADD= telnet ncursesw
|
||||
|
||||
.if !defined(RELEASE_CRUNCH)
|
||||
CFLAGS+= -DIPSEC
|
||||
LIBADD+= ipsec
|
||||
.else
|
||||
.PATH: ${TELNETDIR}/libtelnet
|
||||
SRCS+= genget.c getent.c misc.c
|
||||
CFLAGS+= -DHAS_CGETENT
|
||||
.endif
|
||||
|
||||
.if ${MK_OPENSSL} != "no"
|
||||
SRCS+= authenc.c
|
||||
|
@ -24,10 +24,7 @@ CFLAGS+= -DLIBWRAP
|
||||
LIBADD+= wrap
|
||||
.endif
|
||||
|
||||
# XXX for src/release/picobsd
|
||||
.if !defined(RELEASE_CRUNCH)
|
||||
CFLAGS+= -DIPSEC
|
||||
LIBADD+= ipsec
|
||||
.endif
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user