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.sbin | |
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.sbin')
-rw-r--r-- | secure/usr.sbin/Makefile | 4 | ||||
-rw-r--r-- | secure/usr.sbin/sshd/Makefile | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile index b8636e5..e08025c 100644 --- a/secure/usr.sbin/Makefile +++ b/secure/usr.sbin/Makefile @@ -1,7 +1,9 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= -.if !defined(NO_OPENSSH) && !defined(NO_OPENSSL) +.if ${MK_OPENSSH} != "no" SUBDIR+=sshd .endif diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 0e23288..7567505 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -1,6 +1,8 @@ # $FreeBSD$ # +.include <bsd.own.mk> + PROG= sshd SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ sshpty.c sshlogin.c servconf.c serverloop.c \ @@ -23,13 +25,13 @@ CFLAGS+=-I${SSHDIR} DPADD= ${LIBSSH} ${LIBUTIL} ${LIBZ} ${LIBWRAP} ${LIBPAM} LDADD= -lssh -lutil -lz -lwrap ${MINUSLPAM} -.if !defined(NO_AUDIT) +.if ${MK_AUDIT} != "no" CFLAGS+= -DUSE_BSM_AUDIT DPADD+= ${LIBBSM} LDADD+= -lbsm .endif -.if !defined(NO_KERBEROS) +.if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lroken |