From 8df7a1fa297795e48ec8e70d0e003d580ec64b65 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 25 Feb 2000 08:21:35 +0000
Subject: Don't pull in libRSAglue for the rsaref case.  Since this is linked
 dynamically by default, we use the dlopen() calls to load librsaref.so on US
 code trees.

---
 secure/usr.bin/openssl/Makefile    | 2 +-
 secure/usr.bin/scp/Makefile        | 4 ----
 secure/usr.bin/ssh-add/Makefile    | 4 ----
 secure/usr.bin/ssh-agent/Makefile  | 4 ----
 secure/usr.bin/ssh-keygen/Makefile | 4 ----
 secure/usr.bin/ssh/Makefile        | 4 ----
 secure/usr.sbin/sshd/Makefile      | 4 ----
 7 files changed, 1 insertion(+), 25 deletions(-)

(limited to 'secure')

diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile
index 79229313b892..fe633b30d84a 100644
--- a/secure/usr.bin/openssl/Makefile
+++ b/secure/usr.bin/openssl/Makefile
@@ -18,7 +18,7 @@ LOCALBASE?=	/usr/local
 CFLAGS+= -DNO_RSA -DNO_SSL2
 .else
 CFLAGS+= -DRSAref
-LDADD+=	-lRSAglue ${LOCALBASE}/lib/librsaref.a
+LDADD+=	${LOCALBASE}/lib/librsaref.a
 .endif
 .endif
 
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
index 896f62ccd748..80ad08832dcc 100644
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -16,7 +16,3 @@ SRCS=	scp.c
 
 LDADD+=	-lcrypto -lutil -lz -L${.OBJDIR}/../../lib/libssh -lssh
 DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
-.if defined(RSAREF) && ${RSAREF} == YES
-LDADD+=	-lRSAglue
-DPADD+= ${LIBRSAGLUE}
-.endif
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
index bd53d7222d1d..5e8dbf290ea8 100644
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -16,7 +16,3 @@ SRCS=	ssh-add.c log-client.c
 
 LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
 DPADD+= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
-.if defined(RSAREF) && ${RSAREF} == YES
-LDADD+=	-lRSAglue
-DPADD+= ${LIBRSAGLUE}
-.endif
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile
index dc30ead0a5f5..901f09efbd66 100644
--- a/secure/usr.bin/ssh-agent/Makefile
+++ b/secure/usr.bin/ssh-agent/Makefile
@@ -16,7 +16,3 @@ SRCS=	ssh-agent.c log-client.c
 
 LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
 DPADD+=	${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
-.if defined(RSAREF) && ${RSAREF} == YES
-LDADD+=	-lRSAglue
-DPADD+= ${LIBRSAGLUE}
-.endif
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
index 962ad41d4de9..27a230f6259e 100644
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -16,7 +16,3 @@ SRCS=	ssh-keygen.c log-client.c
 
 LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lcrypt -lutil -lz
 DPADD+=	${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
-.if defined(RSAREF) && ${RSAREF} == YES
-LDADD+=	-lRSAglue
-DPADD+= ${LIBRSAGLUE}
-.endif
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile
index 3741ba405550..33887f9ed5e6 100644
--- a/secure/usr.bin/ssh/Makefile
+++ b/secure/usr.bin/ssh/Makefile
@@ -35,7 +35,3 @@ DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR}
 
 LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypto -lutil -lz
 DPADD+=	${LIBCRYPTO} ${LIBUTIL} ${LIBZ}
-.if defined(RSAREF) && ${RSAREF} == YES
-LDADD+=	-lRSAglue
-DPADD+= ${LIBRSAGLUE}
-.endif
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index 6a36c290f5c4..a0e4fac15a96 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -37,7 +37,3 @@ DPADD+=	 ${LIBKRB5} ${LIBCOM_ERR}
 
 LDADD+=	-L${.OBJDIR}/../../lib/libssh -lssh -lcrypt -lcrypto -lutil -lz -lwrap
 DPADD+=	${LIBCRYPT} ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} ${LIBWRAP}
-.if defined(RSAREF) && ${RSAREF} == YES
-LDADD+=	-lRSAglue
-DPADD+= ${LIBRSAGLUE}
-.endif
-- 
cgit v1.3