aboutsummaryrefslogtreecommitdiff
path: root/lib/libpam
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2006-03-17 18:54:44 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2006-03-17 18:54:44 +0000
commite1fe3dba5ce2826061f6489765be9b4a341736a9 (patch)
tree801e953598fc63a37f62cf997017301675552fe9 /lib/libpam
parent23801379f0e7cdddcb057ea05fe79b340a01dbf5 (diff)
downloadsrc-e1fe3dba5ce2826061f6489765be9b4a341736a9.tar.gz
src-e1fe3dba5ce2826061f6489765be9b4a341736a9.zip
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)
Notes
Notes: svn path=/head/; revision=156813
Diffstat (limited to 'lib/libpam')
-rw-r--r--lib/libpam/modules/modules.inc6
-rw-r--r--lib/libpam/modules/pam_unix/Makefile4
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/libpam/modules/modules.inc b/lib/libpam/modules/modules.inc
index c721075d3e67..c570cfd2f77c 100644
--- a/lib/libpam/modules/modules.inc
+++ b/lib/libpam/modules/modules.inc
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
MODULES =
MODULES += pam_chroot
MODULES += pam_deny
@@ -8,7 +10,7 @@ MODULES += pam_exec
MODULES += pam_ftpusers
MODULES += pam_group
MODULES += pam_guest
-.if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_KERBEROS} != "no"
MODULES += pam_krb5
MODULES += pam_ksu
.endif
@@ -24,7 +26,7 @@ MODULES += pam_rhosts
MODULES += pam_rootok
MODULES += pam_securetty
MODULES += pam_self
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
+.if ${MK_OPENSSH} != "no"
MODULES += pam_ssh
.endif
MODULES += pam_tacplus
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index fde40feff5f4..385cb9ce3b12 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -34,6 +34,8 @@
#
# $FreeBSD$
+.include <bsd.own.mk>
+
LIB= pam_unix
SRCS= pam_unix.c
MAN= pam_unix.8
@@ -41,7 +43,7 @@ MAN= pam_unix.8
DPADD= ${LIBUTIL} ${LIBCRYPT}
LDADD= -lutil -lcrypt
-.if !defined(NO_NIS)
+.if ${MK_NIS} != "no"
CFLAGS+= -DYP
DPADD+= ${LIBYPCLNT}
LDADD+= -lypclnt