diff options
| author | sobomax <sobomax@FreeBSD.org> | 2001-08-02 15:47:03 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2001-08-02 15:47:03 +0000 |
| commit | b4222d1bf255eb311660f6e06faa297585ee55a5 (patch) | |
| tree | e57ef2cb189550dfc059623a6398225ee4260fe7 | |
| parent | 2c666d5bfc7a548e04e062d32708b0f83011b5e0 (diff) | |
| download | FreeBSD-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
| -rw-r--r-- | lib/Makefile | 6 | ||||
| -rw-r--r-- | usr.bin/Makefile | 6 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 5 |
3 files changed, 13 insertions, 4 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> 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> diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index eff6ad4..f4eea33 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -46,7 +46,6 @@ SUBDIR= IPXrouted \ kbdcontrol \ kbdmap \ kernbb \ - keyserv \ lastlogin \ manctl \ memcontrol \ @@ -185,4 +184,8 @@ SUBDIR+=boot0cfg SUBDIR+=boot98cfg .endif +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +SUBDIR+=keyserv +.endif + .include <bsd.subdir.mk> |
