summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>1996-03-09 13:39:00 +0000
committerache <ache@FreeBSD.org>1996-03-09 13:39:00 +0000
commitfd4a236df26ccb04d826eb17c6c35a606c82553d (patch)
treefe40422debe884c2df7d66cc4727b3e8ac0d76c7
parent14fe133184165583e4cf0402730b51e562aba465 (diff)
downloadFreeBSD-src-fd4a236df26ccb04d826eb17c6c35a606c82553d.zip
FreeBSD-src-fd4a236df26ccb04d826eb17c6c35a606c82553d.tar.gz
Sense MAKE_EBONES, DESTDIR
SRCS, DPADD cleanup
-rw-r--r--eBones/libexec/telnetd/Makefile16
-rw-r--r--secure/libexec/telnetd/Makefile16
2 files changed, 22 insertions, 10 deletions
diff --git a/eBones/libexec/telnetd/Makefile b/eBones/libexec/telnetd/Makefile
index dbce8c4..002dc3f 100644
--- a/eBones/libexec/telnetd/Makefile
+++ b/eBones/libexec/telnetd/Makefile
@@ -17,15 +17,21 @@ CFLAGS+=-I${.CURDIR}/../../lib
#ifdef ENCRYPTION
-CFLAGS+=-DAUTHENTICATION -DENCRYPTION
+CFLAGS += -DENCRYPTION
-.if exists(/usr/lib/libkrb.a)
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \
+ || defined(MAKE_KERBEROS))
+CFLAGS+=-DAUTHENTICATION
LDADD+= -ldes -lkrb
+DPADD+= ${LIBDES} ${LIBKRB}
.endif
-.if exists(/usr/lib/libkrb5.a)
-LDADD+= -ldes -lkrb5
-.endif
+#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \
+# || defined(MAKE_KERBEROS))
+#CFLAGS+=-DAUTHENTICATION
+#LDADD+= -ldes -lkrb5
+#DPADD+= ${LIBDES}
+#.endif
# Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active
#LDADD+= -ldescrypt
diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
index dbce8c4..002dc3f 100644
--- a/secure/libexec/telnetd/Makefile
+++ b/secure/libexec/telnetd/Makefile
@@ -17,15 +17,21 @@ CFLAGS+=-I${.CURDIR}/../../lib
#ifdef ENCRYPTION
-CFLAGS+=-DAUTHENTICATION -DENCRYPTION
+CFLAGS += -DENCRYPTION
-.if exists(/usr/lib/libkrb.a)
+.if exists(${DESTDIR}/usr/lib/libkrb.a) && (defined(MAKE_EBONES) \
+ || defined(MAKE_KERBEROS))
+CFLAGS+=-DAUTHENTICATION
LDADD+= -ldes -lkrb
+DPADD+= ${LIBDES} ${LIBKRB}
.endif
-.if exists(/usr/lib/libkrb5.a)
-LDADD+= -ldes -lkrb5
-.endif
+#.if exists(${DESTDIR}/usr/lib/libkrb5.a) && (defined(MAKE_EBONES) \
+# || defined(MAKE_KERBEROS))
+#CFLAGS+=-DAUTHENTICATION
+#LDADD+= -ldes -lkrb5
+#DPADD+= ${LIBDES}
+#.endif
# Used only in krb4encpwd.c and rsaencpwd.c (libtelnet), not yet active
#LDADD+= -ldescrypt
OpenPOWER on IntegriCloud