From d78c11891694d603e264051b72f7bfd1374b67a1 Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Tue, 7 Jun 2005 09:31:28 +0000
Subject: Revert the commits that made libssh an INTERNALLIB; they caused too
 much trouble, especially on amd64.

Requested by:	ru
---
 secure/usr.sbin/sshd/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'secure/usr.sbin')

diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index fef808b..4e73571 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -1,6 +1,5 @@
 # $FreeBSD$
-
-LIBSSH=	${.OBJDIR}/../../lib/libssh/libssh.a
+#
 
 PROG=	sshd
 SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
@@ -13,13 +12,16 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	auth-krb5.c \
 	auth2-gss.c gss-serv.c gss-serv-krb5.c \
 	loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \
-	audit.c audit-bsm.c
+	audit.c audit-bsm.c \
+	gss-genr.c
+
+# gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile
 
 MAN=	sshd.8 sshd_config.5
 CFLAGS+=-I${SSHDIR}
 
 DPADD=	${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM}
-LDADD=	${LIBSSH} -lutil -lz -lwrap ${MINUSLPAM}
+LDADD=	-lssh -lutil -lz -lwrap ${MINUSLPAM}
 
 .if !defined(NO_KERBEROS)
 CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
-- 
cgit v1.1