diff options
| author | ru <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2006-03-17 18:54:44 +0000 |
| commit | 388e590f951441f619cd32710dc151e0ac810a10 (patch) | |
| tree | 801e953598fc63a37f62cf997017301675552fe9 /secure/usr.bin | |
| parent | a251964eaca5833ff2c4651fe4f7f8cac7199da5 (diff) | |
| download | FreeBSD-src-388e590f951441f619cd32710dc151e0ac810a10.zip FreeBSD-src-388e590f951441f619cd32710dc151e0ac810a10.tar.gz | |
Reimplementation of world/kernel build options. For details, see:
http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html
The src.conf(5) manpage is to follow in a few days.
Brought to you by: imp, jhb, kris, phk, ru (all bugs are mine)
Diffstat (limited to 'secure/usr.bin')
| -rw-r--r-- | secure/usr.bin/Makefile | 6 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index 4d78845..b10a43b 100644 --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -1,9 +1,11 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= -.if !defined(NO_OPENSSL) +.if ${MK_OPENSSL} != "no" SUBDIR+=bdes openssl -.if !defined(NO_OPENSSH) +.if ${MK_OPENSSH} != "no" SUBDIR+=scp sftp ssh ssh-add ssh-agent ssh-keygen ssh-keyscan .endif .endif diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 9d1e0b5..43ade12 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,6 +1,8 @@ # $FreeBSD$ # +.include <bsd.own.mk> + PROG= ssh CFLAGS+=-I${SSHDIR} LINKS= ${BINDIR}/ssh ${BINDIR}/slogin @@ -14,7 +16,7 @@ SRCS= ssh.c readconf.c clientloop.c sshtty.c \ DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} LDADD= -lssh -lutil -lz -.if !defined(NO_KERBEROS) +.if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL DPADD+= ${LIBGSSAPI} LDADD+= -lgssapi |
