diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2013-09-10 22:26:11 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2013-09-10 22:26:11 +0000 |
| commit | 9cfa8b3fee2f79940b0b9e5a4ffbc5f095861529 (patch) | |
| tree | ab68ba5a5b6f4e8ee717558d70c0221f0b1ef6dc /secure/usr.bin/ssh | |
| parent | 27789e56b28fd6d95ebb2bc7d9436305b193fe40 (diff) | |
| download | src-9cfa8b3fee2f79940b0b9e5a4ffbc5f095861529.tar.gz src-9cfa8b3fee2f79940b0b9e5a4ffbc5f095861529.zip | |
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)
Notes
Notes:
svn path=/head/; revision=255460
Diffstat (limited to 'secure/usr.bin/ssh')
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index a5e580879d6b..459d21f386a0 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,5 +1,4 @@ # $FreeBSD$ -# .include <bsd.own.mk> @@ -16,10 +15,17 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c -DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} -LDADD= -lssh -lutil -lz +DPADD= ${LIBSSH} ${LIBUTIL} +LDADD= -lssh -lutil USEPRIVATELIB= ssh +.if ${MK_LDNS} != "no" +CFLAGS+= -DHAVE_LDNS=1 +DPADD+= ${LIBLDNS} +LDADD+= -lldns +USEPRIVATELIB+= ldns +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL DPADD+= ${LIBGSSAPI} @@ -30,8 +36,8 @@ LDADD+= -lgssapi CFLAGS+= -DNONE_CIPHER_ENABLED .endif -DPADD+= ${LIBCRYPT} ${LIBCRYPTO} -LDADD+= -lcrypt -lcrypto +DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lcrypt -lcrypto -lz .if defined(LOCALBASE) CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" |