Don't check for the existance of src/crypto/ for building items that
may contain crypto. The days of ITAR paranoia are over, and the simple macro tests that remain are sufficient.
This commit is contained in:
parent
22b4909430
commit
ebb9f0efa8
@ -5,7 +5,7 @@ SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
|
||||
LINKS= ${BINDIR}/ed ${BINDIR}/red
|
||||
MLINKS= ed.1 red.1
|
||||
|
||||
.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||
DISTRIBUTION=crypto
|
||||
CFLAGS+=-DDES
|
||||
WARNS?= 2
|
||||
|
@ -5,7 +5,7 @@ PROG= factor
|
||||
SRCS= factor.c pr_tbl.c
|
||||
CFLAGS+=-I${.CURDIR}/../primes
|
||||
|
||||
.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||
CFLAGS+=-DHAVE_OPENSSL
|
||||
LDADD+= -lcrypto
|
||||
DPADD+= ${LIBCRYPTO}
|
||||
|
@ -94,7 +94,7 @@ _libthr= libthr
|
||||
_libdisk= libdisk
|
||||
.endif
|
||||
|
||||
.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||
_libmp= libmp
|
||||
.endif
|
||||
|
||||
|
@ -248,7 +248,7 @@ SUBDIR+=ncplist \
|
||||
smbutil
|
||||
.endif
|
||||
|
||||
.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||
SUBDIR+=chkey newkey
|
||||
.endif
|
||||
|
||||
|
@ -225,7 +225,7 @@ SUBDIR+=boot98cfg
|
||||
SUBDIR+=ofwdump
|
||||
.endif
|
||||
|
||||
.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||
.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
|
||||
SUBDIR+=keyserv
|
||||
.endif
|
||||
|
||||
|
@ -70,7 +70,7 @@ CFLAGS+=-DNOSUID
|
||||
SRCS+= id.c
|
||||
.endif
|
||||
|
||||
.if !exists(${.CURDIR}/../../crypto) || defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NODES)
|
||||
.if defined(NOCRYPT) || defined(NO_OPENSSL)
|
||||
CFLAGS+=-DNODES
|
||||
.else
|
||||
DISTRIBUTION=crypto
|
||||
|
@ -30,7 +30,7 @@ DPADD+= ${LIBPCAP}
|
||||
LDADD+= -lpcap
|
||||
|
||||
# MS-CHAP support. Requires the DES library.
|
||||
.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
|
||||
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
|
||||
DISTRIBUTION=crypto
|
||||
CFLAGS+= -DCHAPMS
|
||||
SRCS+= chap_ms.c
|
||||
|
@ -57,8 +57,7 @@ LDADD+= ${LIBSMUTIL} ${LIBSM}
|
||||
SRCS+= sm_os.h
|
||||
CLEANFILES+=sm_os.h
|
||||
|
||||
.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && \
|
||||
!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
|
||||
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
|
||||
# STARTTLS support
|
||||
DISTRIBUTION= crypto
|
||||
CFLAGS+= -DSTARTTLS -D_FFR_TLS_1
|
||||
|
@ -39,8 +39,7 @@ CFLAGS+= -DLBL_ALIGN
|
||||
|
||||
DPADD= ${LIBL} ${LIBPCAP}
|
||||
LDADD= -ll -lpcap
|
||||
.if exists(../../../crypto) && !defined(NOCRYPT) && \
|
||||
!defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
|
||||
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
|
||||
DISTRIBUTION=crypto
|
||||
DPADD+= ${LIBCRYPTO}
|
||||
LDADD+= -lcrypto
|
||||
|
Loading…
Reference in New Issue
Block a user