diff options
| author | gibbs <gibbs@FreeBSD.org> | 1995-10-11 00:04:09 +0000 |
|---|---|---|
| committer | gibbs <gibbs@FreeBSD.org> | 1995-10-11 00:04:09 +0000 |
| commit | 651cbee0dbd38368992c2a0fa75af3334da5c201 (patch) | |
| tree | fc029f9aa4666b44df69ba7b0cdecfaba0979b1a | |
| parent | 02d471bd8d6d4eac0b1abc4a8db46321a14e7b71 (diff) | |
| download | FreeBSD-src-651cbee0dbd38368992c2a0fa75af3334da5c201.zip FreeBSD-src-651cbee0dbd38368992c2a0fa75af3334da5c201.tar.gz | |
Remove MAKE_EBONES conditionals. They were originally placed here because
of missing functionality in our libkrb which is no longer a problem.
| -rw-r--r-- | eBones/lib/libtelnet/Makefile | 4 | ||||
| -rw-r--r-- | eBones/libexec/telnetd/Makefile | 2 | ||||
| -rw-r--r-- | eBones/usr.bin/telnet/Makefile | 2 | ||||
| -rw-r--r-- | secure/lib/libtelnet/Makefile | 4 | ||||
| -rw-r--r-- | secure/libexec/telnetd/Makefile | 2 | ||||
| -rw-r--r-- | secure/usr.bin/telnet/Makefile | 2 |
6 files changed, 2 insertions, 14 deletions
diff --git a/eBones/lib/libtelnet/Makefile b/eBones/lib/libtelnet/Makefile index 829a87a..013f3be 100644 --- a/eBones/lib/libtelnet/Makefile +++ b/eBones/lib/libtelnet/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $Id: Makefile,v 1.9 1995/08/05 19:10:17 ache Exp $ +# $Id: Makefile,v 1.10 1995/09/14 21:29:05 gibbs Exp $ LIB= telnet SRCS= auth.c encrypt.c genget.c getent.c misc.c @@ -11,7 +11,6 @@ CFLAGS+= -DHAS_CGETENT CFLAGS+= -DENCRYPTION -DAUTHENTICATION -.ifdef MAKE_EBONES .if exists(/usr/lib/libkrb.a) CFLAGS+= -DKRB4 -I/usr/include/kerberosIV -DDES_ENCRYPTION # KRB4_ENCPWD not yet defined @@ -21,7 +20,6 @@ SRCS+= kerberos.c #SRCS+= krb4encpwd.c LDADD+= -ldes -lkrb .endif -.endif .if exists(/usr/lib/libkrb5.a) CFLAGS+= -DKRB5 -DFORWARD -DDES_ENCRYPTION diff --git a/eBones/libexec/telnetd/Makefile b/eBones/libexec/telnetd/Makefile index 0bd111c..dbce8c4 100644 --- a/eBones/libexec/telnetd/Makefile +++ b/eBones/libexec/telnetd/Makefile @@ -19,11 +19,9 @@ CFLAGS+=-I${.CURDIR}/../../lib CFLAGS+=-DAUTHENTICATION -DENCRYPTION -.ifdef MAKE_EBONES .if exists(/usr/lib/libkrb.a) LDADD+= -ldes -lkrb .endif -.endif .if exists(/usr/lib/libkrb5.a) LDADD+= -ldes -lkrb5 diff --git a/eBones/usr.bin/telnet/Makefile b/eBones/usr.bin/telnet/Makefile index 3144b0c..5314ad7 100644 --- a/eBones/usr.bin/telnet/Makefile +++ b/eBones/usr.bin/telnet/Makefile @@ -45,12 +45,10 @@ DPADD+= ${TELNETOBJDIR}/libtelnet.a CFLAGS+=-DAUTHENTICATION -DENCRYPTION -.ifdef MAKE_EBONES .if exists(/usr/lib/libkrb.a) CFLAGS+= -DKRB4 LDADD+= -ldes -lkrb .endif -.endif .if exists(/usr/lib/libkrb5.a) CFLAGS+= -DKRB5 -DFORWARD diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile index 829a87a..013f3be 100644 --- a/secure/lib/libtelnet/Makefile +++ b/secure/lib/libtelnet/Makefile @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $Id: Makefile,v 1.9 1995/08/05 19:10:17 ache Exp $ +# $Id: Makefile,v 1.10 1995/09/14 21:29:05 gibbs Exp $ LIB= telnet SRCS= auth.c encrypt.c genget.c getent.c misc.c @@ -11,7 +11,6 @@ CFLAGS+= -DHAS_CGETENT CFLAGS+= -DENCRYPTION -DAUTHENTICATION -.ifdef MAKE_EBONES .if exists(/usr/lib/libkrb.a) CFLAGS+= -DKRB4 -I/usr/include/kerberosIV -DDES_ENCRYPTION # KRB4_ENCPWD not yet defined @@ -21,7 +20,6 @@ SRCS+= kerberos.c #SRCS+= krb4encpwd.c LDADD+= -ldes -lkrb .endif -.endif .if exists(/usr/lib/libkrb5.a) CFLAGS+= -DKRB5 -DFORWARD -DDES_ENCRYPTION diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile index 0bd111c..dbce8c4 100644 --- a/secure/libexec/telnetd/Makefile +++ b/secure/libexec/telnetd/Makefile @@ -19,11 +19,9 @@ CFLAGS+=-I${.CURDIR}/../../lib CFLAGS+=-DAUTHENTICATION -DENCRYPTION -.ifdef MAKE_EBONES .if exists(/usr/lib/libkrb.a) LDADD+= -ldes -lkrb .endif -.endif .if exists(/usr/lib/libkrb5.a) LDADD+= -ldes -lkrb5 diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile index 3144b0c..5314ad7 100644 --- a/secure/usr.bin/telnet/Makefile +++ b/secure/usr.bin/telnet/Makefile @@ -45,12 +45,10 @@ DPADD+= ${TELNETOBJDIR}/libtelnet.a CFLAGS+=-DAUTHENTICATION -DENCRYPTION -.ifdef MAKE_EBONES .if exists(/usr/lib/libkrb.a) CFLAGS+= -DKRB4 LDADD+= -ldes -lkrb .endif -.endif .if exists(/usr/lib/libkrb5.a) CFLAGS+= -DKRB5 -DFORWARD |
