Remove MAKE_EBONES conditionals. They were originally placed here because
of missing functionality in our libkrb which is no longer a problem.
This commit is contained in:
parent
02d471bd8d
commit
651cbee0db
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user