Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add -lcrypt to link lines for applications using -lkrb5, so that they 

link successfully when MKPIC=no, as is always the case for our ports
which do not support shared libraries.

Discussed with thorpej and christos.
This commit is contained in:
he 2005-03-04 20:44:55 +00:00
parent 8e8728c45c
commit 5152518685
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libexec/telnetd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.42 2005/03/04 20:41:09 he Exp $ # $NetBSD: Makefile,v 1.43 2005/03/04 20:44:55 he Exp $
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93 # from: @(#)Makefile 8.2 (Berkeley) 12/15/93
.include <bsd.own.mk> .include <bsd.own.mk>
@ -21,8 +21,8 @@ LIBTELNETDIR!= cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR}
.if (${USE_KERBEROS} != "no") .if (${USE_KERBEROS} != "no")
CPPFLAGS+=-I${DESTDIR}/usr/include/krb5 CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
CPPFLAGS+=-DKRB5 -DAUTHENTICATION -DENCRYPTION CPPFLAGS+=-DKRB5 -DAUTHENTICATION -DENCRYPTION
LDADD+= -lkrb5 -lasn1 -lcrypto LDADD+= -lkrb5 -lasn1 -lcrypto -lcrypt
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
.if (${USE_KERBEROS4} != "no") .if (${USE_KERBEROS4} != "no")
CPPFLAGS+=-DKRB4 CPPFLAGS+=-DKRB4

6
usr.bin/ssh/ssh/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.20 2005/02/13 22:44:07 christos Exp $ # $NetBSD: Makefile,v 1.21 2005/03/04 20:44:55 he Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -19,8 +19,8 @@ LDADD+= -lgssapi
DPADD+= ${LIBGSSAPI} DPADD+= ${LIBGSSAPI}
CPPFLAGS+=-DKRB5 -DAFS -I${DESTDIR}/usr/include/krb5 CPPFLAGS+=-DKRB5 -DAFS -I${DESTDIR}/usr/include/krb5
LDADD+= -lkrb5 -lkafs -lasn1 LDADD+= -lkrb5 -lkafs -lasn1 -lcrypt
DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} ${LIBCRYPT}
.if ${MKKERBEROS4} != "no" .if ${MKKERBEROS4} != "no"
CPPFLAGS+=-I${DESTDIR}/usr/include/kerberosIV -DKRB4 CPPFLAGS+=-I${DESTDIR}/usr/include/kerberosIV -DKRB4

6
usr.bin/telnet/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.37 2005/03/04 20:41:09 he Exp $ # $NetBSD: Makefile,v 1.38 2005/03/04 20:44:55 he Exp $
# #
# Copyright (c) 1990 The Regents of the University of California. # Copyright (c) 1990 The Regents of the University of California.
# All rights reserved. # All rights reserved.
@ -61,8 +61,8 @@ LIBTELNETDIR!= cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR}
.if (${USE_KERBEROS} != "no") .if (${USE_KERBEROS} != "no")
CPPFLAGS+=-I${DESTDIR}/usr/include/krb5 CPPFLAGS+=-I${DESTDIR}/usr/include/krb5
CPPFLAGS+=-DKRB5 -DFORWARD -DAUTHENTICATION -DENCRYPTION CPPFLAGS+=-DKRB5 -DFORWARD -DAUTHENTICATION -DENCRYPTION
LDADD+= -lkrb5 -lasn1 -lcrypto LDADD+= -lkrb5 -lasn1 -lcrypto -lcrypt
DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT}
.if (${USE_KERBEROS4} != "no") .if (${USE_KERBEROS4} != "no")
CPPFLAGS+= -DKRB4 CPPFLAGS+= -DKRB4