diff options
author | des <des@FreeBSD.org> | 2003-05-19 15:52:01 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2003-05-19 15:52:01 +0000 |
commit | e5d2d778eb86b85f35d40aef94a1f354ae0a5ef2 (patch) | |
tree | 9be45a94055cfc0506641b2e8790903643f53b99 /usr.bin | |
parent | 9926b9490a4913a931ead2024b8b8fcc4b71a3c0 (diff) | |
download | FreeBSD-src-e5d2d778eb86b85f35d40aef94a1f354ae0a5ef2.zip FreeBSD-src-e5d2d778eb86b85f35d40aef94a1f354ae0a5ef2.tar.gz |
Retire the useless NOSECURE knob.
Approved by: re (scottl)
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/Makefile | 6 | ||||
-rw-r--r-- | usr.bin/fetch/Makefile | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 725cbdf..6b413de 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -218,8 +218,7 @@ SUBDIR= alias \ .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || defined(NO_OPENSSL) || \ - (defined(NOSECURE) && defined(NO_KERBEROS)) + defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS) # make release needs both SUBDIR+=telnet .endif @@ -248,8 +247,7 @@ SUBDIR+=doscmd \ SUBDIR+=uac .endif -.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \ - && !defined(NOSECURE) +.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) SUBDIR+=chkey newkey .endif diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile index 276947e..7b92352 100644 --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -5,7 +5,7 @@ CSTD?= c99 WARNS?= 6 DPADD= ${LIBFETCH} LDADD= -lfetch -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) DPADD+= ${LIBSSL} ${LIBCRYPTO} LDADD+= -lssl -lcrypto .endif |