From 284105499b2dd52be8261f5fb46c4491349d5398 Mon Sep 17 00:00:00 2001 From: markm Date: Sun, 20 Jul 2003 23:29:46 +0000 Subject: Test correct macro for "without crypto" option(s). --- lib/libtelnet/Makefile | 2 +- libexec/telnetd/Makefile | 2 +- usr.bin/telnet/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index 4ee31fb..200b668 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -13,7 +13,7 @@ CFLAGS+= -I${TELNETDIR} WARNS?= 2 -.if !defined(NO_CRYPTO) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA .if !defined(NO_KERBEROS) diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 96d11fe..47dc808 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -28,7 +28,7 @@ LIBTELNET= ${.CURDIR}/../../lib/libtelnet/libtelnet.a DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} -.if !defined(NO_CRYPTO) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 817a725..f3ae3ca 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -30,7 +30,7 @@ SRCS+= genget.c getent.c misc.c CFLAGS+= -DHAS_CGETENT .endif -.if !defined(NO_CRYPTO) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) SRCS+= authenc.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM} -- cgit v1.1