diff options
| author | des <des@FreeBSD.org> | 2013-09-10 22:26:11 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-09-10 22:26:11 +0000 |
| commit | 2a9ec0fc3edd2edc5766e11fa312e8ab8a128d5f (patch) | |
| tree | ab68ba5a5b6f4e8ee717558d70c0221f0b1ef6dc /secure/usr.bin/ssh-agent | |
| parent | 7b25e61875a286fe4f9be2f6da79b6fed5cf609b (diff) | |
| download | FreeBSD-src-2a9ec0fc3edd2edc5766e11fa312e8ab8a128d5f.zip FreeBSD-src-2a9ec0fc3edd2edc5766e11fa312e8ab8a128d5f.tar.gz | |
Clean up the OpenSSH build. It is now possible to build most components
as static binaries, if desired. The one exception is sshd, which runs
into trouble due to libpam.a's includion of pam_ssh.
Make OpenSSH use LDNS if available. This allows it to verify signed
SSHFP records.
Approved by: re (blanket)
Diffstat (limited to 'secure/usr.bin/ssh-agent')
| -rw-r--r-- | secure/usr.bin/ssh-agent/Makefile | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 29620d1..353abac 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,16 +1,30 @@ # $FreeBSD$ +.include <bsd.own.mk> + PROG= ssh-agent SRCS= ssh-agent.c CFLAGS+=-I${SSHDIR} -include ssh_namespace.h -# required when linking with a dynamic libssh +.if !defined(NO_SHARED) +# required when linking with a dynamic libssh SRCS+= roaming_dummy.c +.endif -DPADD= ${LIBSSH} ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypt -lcrypto -lz +DPADD= ${LIBSSH} +LDADD= -lssh USEPRIVATELIB= ssh +.if ${MK_LDNS} != "no" +CFLAGS+= -DHAVE_LDNS=1 +#DPADD+= ${LIBLDNS} +#LDADD+= -lldns +#USEPRIVATELIB+= ldns +.endif + +DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lcrypt -lcrypto -lz + .include <bsd.prog.mk> .PATH: ${SSHDIR} |
