Final cleanup pass through Makefiles, now this stuff

autodetect kerberos/eBones and work even with eBones,
but with reduced functionality (don't pick up des/krb stuff
in this case)

6 files changed, 40 insertions, 24 deletions

diff --git a/eBones/lib/libtelnet/Makefile b/eBones/lib/libtelnet/Makefile
index 2764bca..5b700e6 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.6 1995/07/24 21:49:06 ache Exp $
+#	$Id: Makefile,v 1.7 1995/07/24 21:57:58 ache Exp $
 
 # This stuff need original libdes to run (new_rnd_key.c module),
 # current eBones/des lib don't have it
@@ -12,27 +12,29 @@ SRCS+=	spx.c rsaencpwd.c read_password.c
 CFLAGS+= -DHAS_CGETENT
 
 #ifdef	ENCRYPTION
-CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DDES_ENCRYPTION
-LDADD+= -ldescrypt
+
+CFLAGS+= -DENCRYPTION -DAUTHENTICATION
 
 .ifdef  MAKE_KERBEROS
 .if exists(/usr/lib/libkrb.a)
-CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
+CFLAGS+= -DKRB4 -I/usr/include/kerberosIV -DDES_ENCRYPTION
 # KRB4_ENCPWD not yet defined
 #CFLAGS+= -DKRB4_ENCPWD
 SRCS+=  kerberos.c
 # KRB4_ENCPWD not yet defined
 #SRCS+=   krb4encpwd.c
-LDADD+= -lkrb -ldes
+LDADD+= -ldes -lkrb
 .endif
 .endif
 
 .if exists(/usr/lib/libkrb5.a)
-CFLAGS+= -DKRB5 -DFORWARD
+CFLAGS+= -DKRB5 -DFORWARD -DDES_ENCRYPTION
 SRCS+=	kerberos5.c forward.c
-LDADD+= -lkrb5 -ldes
+LDADD+= -ldes -lkrb5
 .endif
 
+LDADD+= -ldescrypt
+
 #endif	/* ENCRYPTION */
 
 # These are the sources that have encryption stuff in them.
diff --git a/eBones/libexec/telnetd/Makefile b/eBones/libexec/telnetd/Makefile
index 3b341ad..4fc6042 100644
--- a/eBones/libexec/telnetd/Makefile
+++ b/eBones/libexec/telnetd/Makefile
@@ -18,14 +18,19 @@ MAN8=	telnetd.8
 #ifdef	ENCRYPTION
 
 CFLAGS+=-DAUTHENTICATION -DENCRYPTION
-LDADD+= -ldescrypt
 
 .ifdef MAKE_KERBEROS
 .if exists(/usr/lib/libkrb.a)
-LDADD+=	-lkrb -ldes
+LDADD+= -ldes -lkrb
+.endif
 .endif
+
+.if exists(/usr/lib/libkrb5.a)
+LDADD+= -ldes -lkrb5
 .endif
 
+LDADD+= -ldescrypt
+
 #endif	/* ENCRYPTION */
 
 # These are the sources that have encryption stuff in them.
diff --git a/eBones/usr.bin/telnet/Makefile b/eBones/usr.bin/telnet/Makefile
index 7e59c78..b03c006 100644
--- a/eBones/usr.bin/telnet/Makefile
+++ b/eBones/usr.bin/telnet/Makefile
@@ -47,20 +47,21 @@ LDADD+= -ltermcap -ltelnet
 #ifdef	ENCRYPTION
 
 CFLAGS+=-DAUTHENTICATION -DENCRYPTION
-LDADD+= -ldescrypt
 
 .ifdef MAKE_KERBEROS
 .if exists(/usr/lib/libkrb.a)
 CFLAGS+= -DKRB4
-LDADD+= -lkrb -ldes
+LDADD+= -ldes -lkrb
 .endif
 .endif
 
 .if exists(/usr/lib/libkrb5.a)
 CFLAGS+= -DKRB5 -DFORWARD
-LDADD+=  -lkrb5 -ldes
+LDADD+=  -ldes -lkrb5
 .endif
 
+LDADD+= -ldescrypt
+
 #endif	/* ENCRYPTION */
 
 DPADD=	${LIBTERMCAP}
diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile
index 2764bca..5b700e6 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.6 1995/07/24 21:49:06 ache Exp $
+#	$Id: Makefile,v 1.7 1995/07/24 21:57:58 ache Exp $
 
 # This stuff need original libdes to run (new_rnd_key.c module),
 # current eBones/des lib don't have it
@@ -12,27 +12,29 @@ SRCS+=	spx.c rsaencpwd.c read_password.c
 CFLAGS+= -DHAS_CGETENT
 
 #ifdef	ENCRYPTION
-CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DDES_ENCRYPTION
-LDADD+= -ldescrypt
+
+CFLAGS+= -DENCRYPTION -DAUTHENTICATION
 
 .ifdef  MAKE_KERBEROS
 .if exists(/usr/lib/libkrb.a)
-CFLAGS+= -DKRB4 -I/usr/include/kerberosIV
+CFLAGS+= -DKRB4 -I/usr/include/kerberosIV -DDES_ENCRYPTION
 # KRB4_ENCPWD not yet defined
 #CFLAGS+= -DKRB4_ENCPWD
 SRCS+=  kerberos.c
 # KRB4_ENCPWD not yet defined
 #SRCS+=   krb4encpwd.c
-LDADD+= -lkrb -ldes
+LDADD+= -ldes -lkrb
 .endif
 .endif
 
 .if exists(/usr/lib/libkrb5.a)
-CFLAGS+= -DKRB5 -DFORWARD
+CFLAGS+= -DKRB5 -DFORWARD -DDES_ENCRYPTION
 SRCS+=	kerberos5.c forward.c
-LDADD+= -lkrb5 -ldes
+LDADD+= -ldes -lkrb5
 .endif
 
+LDADD+= -ldescrypt
+
 #endif	/* ENCRYPTION */
 
 # These are the sources that have encryption stuff in them.
diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
index 3b341ad..4fc6042 100644
--- a/secure/libexec/telnetd/Makefile
+++ b/secure/libexec/telnetd/Makefile
@@ -18,14 +18,19 @@ MAN8=	telnetd.8
 #ifdef	ENCRYPTION
 
 CFLAGS+=-DAUTHENTICATION -DENCRYPTION
-LDADD+= -ldescrypt
 
 .ifdef MAKE_KERBEROS
 .if exists(/usr/lib/libkrb.a)
-LDADD+=	-lkrb -ldes
+LDADD+= -ldes -lkrb
+.endif
 .endif
+
+.if exists(/usr/lib/libkrb5.a)
+LDADD+= -ldes -lkrb5
 .endif
 
+LDADD+= -ldescrypt
+
 #endif	/* ENCRYPTION */
 
 # These are the sources that have encryption stuff in them.
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile
index 7e59c78..b03c006 100644
--- a/secure/usr.bin/telnet/Makefile
+++ b/secure/usr.bin/telnet/Makefile
@@ -47,20 +47,21 @@ LDADD+= -ltermcap -ltelnet
 #ifdef	ENCRYPTION
 
 CFLAGS+=-DAUTHENTICATION -DENCRYPTION
-LDADD+= -ldescrypt
 
 .ifdef MAKE_KERBEROS
 .if exists(/usr/lib/libkrb.a)
 CFLAGS+= -DKRB4
-LDADD+= -lkrb -ldes
+LDADD+= -ldes -lkrb
 .endif
 .endif
 
 .if exists(/usr/lib/libkrb5.a)
 CFLAGS+= -DKRB5 -DFORWARD
-LDADD+=  -lkrb5 -ldes
+LDADD+=  -ldes -lkrb5
 .endif
 
+LDADD+= -ldescrypt
+
 #endif	/* ENCRYPTION */
 
 DPADD=	${LIBTERMCAP}