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.
This commit is contained in:
Peter Wemm 2000-02-25 08:21:35 +00:00
parent 07a0979e84
commit 8df7a1fa29
7 changed files with 1 additions and 25 deletions
secure
usr.bin
openssl
scp
ssh-add
ssh-agent
ssh-keygen
ssh
usr.sbin/sshd

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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