summaryrefslogtreecommitdiffstats
path: root/lib
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 /lib
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 'lib')
-rw-r--r--lib/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 79882ed..4982ef2 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -23,7 +23,7 @@ SUBDIR= ${_csu} libcom_err libcrypt msun libmd \
${_compat} libalias libatm ${_libbind} libbz2 libc ${_libc_r} \
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
libedit libfetch libform libftpio libgnumalloc ${_libio} libipsec \
- libipx libisc libkvm libmenu libmp ${_libncp} \
+ libipx libisc libkvm libmenu ${_libmp} ${_libncp} \
libnetgraph libopie libpam libpanel libpcap \
libresolv librpcsvc libsmdb libsmutil libss \
libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz
@@ -61,4 +61,8 @@ _compat= compat
_libtelnet= libtelnet
.endif
+.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+_libmp= libmp
+.endif
+
.include <bsd.subdir.mk>
OpenPOWER on IntegriCloud