diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-07-19 10:43:18 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-07-19 10:43:18 +0000 |
| commit | 30a7c886aed3390e0e44b0dda729a16d9032ff99 (patch) | |
| tree | 6aab0b40d89a347d1f2925fc6683a44b625b357f | |
| parent | ab4a6f35d61c677f9299760d370ee0fd088c7493 (diff) | |
well, with the most recent reorganization, it now turns out that any
program which links -lkrb5 also must link -lkafs as well! someone please
mail hin@ an alpha or a powerpc, so that he can become aware of how
binutils ("the other linker we use") works.
| -rw-r--r-- | gnu/usr.bin/cvs/configure | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/configure.in | 4 | ||||
| -rw-r--r-- | libexec/telnetd/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/telnet/Makefile | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/gnu/usr.bin/cvs/configure b/gnu/usr.bin/cvs/configure index 1839d45dacd..82469c4b8a5 100644 --- a/gnu/usr.bin/cvs/configure +++ b/gnu/usr.bin/cvs/configure @@ -3287,9 +3287,9 @@ EOF includeopt="${includeopt} -I$GSSAPI/include/kerberosV" # FIXME: This is ugly, but these things don't seem to be standardized. if test "$ac_cv_header_gssapi_h" = "yes"; then - LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcrypto -lcom_err" + LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcrypto -lcom_err -lkafs" else - LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err" + LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err -lkafs" fi save_CPPFLAGS=$CPPFLAGS CPPFLAGS="-I$GSSAPI/include/kerberosV $CPPFLAGS" diff --git a/gnu/usr.bin/cvs/configure.in b/gnu/usr.bin/cvs/configure.in index 56ba4d96425..d01b776ddce 100644 --- a/gnu/usr.bin/cvs/configure.in +++ b/gnu/usr.bin/cvs/configure.in @@ -233,9 +233,9 @@ if test "$ac_cv_header_krb5_h" = "yes" && includeopt="${includeopt} -I$GSSAPI/include/kerberosV" # FIXME: This is ugly, but these things don't seem to be standardized. if test "$ac_cv_header_gssapi_h" = "yes"; then - LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcrypto -lcom_err" + LIBS="$LIBS -L$GSSAPI/lib -lgssapi -lkrb5 -lasn1 -lcrypto -lcom_err -lkafs" else - LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err" + LIBS="$LIBS -L$GSSAPI/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err -lkafs" fi save_CPPFLAGS=$CPPFLAGS CPPFLAGS="-I$GSSAPI/include/kerberosV $CPPFLAGS" diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index ec89db919b4..39dab911d1c 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2001/06/26 04:57:44 hin Exp $ +# $OpenBSD: Makefile,v 1.15 2001/07/19 10:43:17 deraadt Exp $ # from: @(#)Makefile 8.2 (Berkeley) 12/15/93 # $NetBSD: Makefile,v 1.6 1996/02/24 01:22:12 jtk Exp $ @@ -21,7 +21,7 @@ DPADD+= ${LIBDES} ${LIBKRB} .endif .if (${KERBEROS5:L} == "yes") -LDADD+= -lkrb5 -lasn1 -lcrypto -lcom_err +LDADD+= -lkrb5 -lasn1 -lcrypto -lcom_err -lkafs .endif .include <bsd.prog.mk> diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 8bcc42aea81..ac89c1fa3a0 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2001/06/23 02:11:43 hin Exp $ +# $OpenBSD: Makefile,v 1.14 2001/07/19 10:43:15 deraadt Exp $ # # Copyright (c) 1990 The Regents of the University of California. # All rights reserved. @@ -54,7 +54,7 @@ DPADD+= ${LIBDES} ${LIBKRB} .if (${KERBEROS5:L} == "yes") CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB5 -LDADD+= -lkrb5 -lasn1 -lcrypto -lcom_err +LDADD+= -lkrb5 -lasn1 -lcrypto -lcom_err -lkafs DPADD+= ${LIBKRB5} .endif |