summaryrefslogtreecommitdiffstats
path: root/usr.bin/Makefile
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2001-08-02 15:47:03 +0000
committersobomax <sobomax@FreeBSD.org>2001-08-02 15:47:03 +0000
commitb4222d1bf255eb311660f6e06faa297585ee55a5 (patch)
treee57ef2cb189550dfc059623a6398225ee4260fe7 /usr.bin/Makefile
parent2c666d5bfc7a548e04e062d32708b0f83011b5e0 (diff)
downloadFreeBSD-src-b4222d1bf255eb311660f6e06faa297585ee55a5.zip
FreeBSD-src-b4222d1bf255eb311660f6e06faa297585ee55a5.tar.gz
Fix a cryptoless world by disconnecting libmp from the build when there is no
crypto bits installed and/or NOCRYPTO/NO_OPENSSL is defined. This unfortunately meants that usr.bin/chkey, usr.bin/newkey and usr.sbin/keyserv have also to be disconnected. IMO it is merely a workaround, the proper solution is to move libmp to src/crypto where it belongs and use libgmp for the cryptoless builds instead. Missed by: dd
Diffstat (limited to 'usr.bin/Makefile')
-rw-r--r--usr.bin/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index a32ac6f..bc053b5 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -20,7 +20,6 @@ SUBDIR= apply \
chat \
checknr \
chflags \
- chkey \
chpass \
cksum \
cmp \
@@ -105,7 +104,6 @@ SUBDIR= apply \
mt \
ncal \
netstat \
- newkey \
nfsstat \
nice \
nl \
@@ -230,4 +228,8 @@ SUBDIR+=ar \
SUBDIR+=uac
.endif
+.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+SUBDIR+=chkey newkey
+.endif
+
.include <bsd.subdir.mk>
OpenPOWER on IntegriCloud