summaryrefslogtreecommitdiffstats
path: root/lib/libtelnet
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2014-06-06 04:09:07 +0000
committerimp <imp@FreeBSD.org>2014-06-06 04:09:07 +0000
commit0ed032933fe4bf3f047df5412d8df4df9da9c4d3 (patch)
tree59c8f747159b3db5af5ad9aa0b3246c6c9382ff5 /lib/libtelnet
parent76945251893ff381099d670ad70698e1b0d67285 (diff)
downloadFreeBSD-src-0ed032933fe4bf3f047df5412d8df4df9da9c4d3.zip
FreeBSD-src-0ed032933fe4bf3f047df5412d8df4df9da9c4d3.tar.gz
When building picobsd, define WITHOUT_OPENSSL and WITHOUT_KERBEROS and
remove the now-redundant checks for RELEASE_CRUNCH. This originally was defined for building smaller sysinstall images, but was later also used by picobsd builds for a similar purpose. Now that we've moved away from sysinstall, picobsd is the only remaining consumer of this interface. Adding these two options reduces the RELEASE_CRUNCH special cases in the tree by half.
Diffstat (limited to 'lib/libtelnet')
-rw-r--r--lib/libtelnet/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 1d38879..3ddecf0 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -15,7 +15,6 @@ CFLAGS+= -I${TELNETDIR}
WARNS?= 2
-.if !defined(RELEASE_CRUNCH)
.if ${MK_OPENSSL} != "no"
SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA
@@ -26,7 +25,6 @@ SRCS+= kerberos5.c
CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write
.endif
-.endif
INCS= ${TELNETDIR}/arpa/telnet.h
INCSDIR= ${INCLUDEDIR}/arpa
OpenPOWER on IntegriCloud