From a52672e93841a87b90b686e389c6862dff8d4ebe Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Thu, 1 May 2003 19:38:15 +0000 Subject: [PATCH] Build non-crypto telnet(1) and telnetd(8) if NO_OPENSSL is defined. Submitted by: Marius Strobl --- lib/Makefile | 2 +- libexec/Makefile | 2 +- usr.bin/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 3bb7412d099..9ada362aa29 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -79,7 +79,7 @@ _libdisk= libdisk .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || \ + defined(NOCRYPT) || defined(NO_OPENSSL) || \ (defined(NOSECURE) && !defined(MAKE_KERBEROS5)) _libtelnet= libtelnet .endif diff --git a/libexec/Makefile b/libexec/Makefile index aa3f26f0f25..c3daa2f1f89 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -40,7 +40,7 @@ SUBDIR+=mail.local smrsh .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || \ + defined(NOCRYPT) || defined(NO_OPENSSL) || \ (defined(NOSECURE) && !defined(MAKE_KERBEROS5)) # make release needs both SUBDIR+=telnetd diff --git a/usr.bin/Makefile b/usr.bin/Makefile index a4d76321282..c44c47819f2 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -218,7 +218,7 @@ SUBDIR= alias \ .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || \ + defined(NOCRYPT) || defined(NO_OPENSSL) || \ (defined(NOSECURE) && !defined(MAKE_KERBEROS5)) # make release needs both SUBDIR+=telnet