Conditionalize building radius support into libpam, ppp, etc via

MK_RADIUS_SUPPORT

MFC after: 1 week
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2015-02-04 06:53:45 +00:00
parent 79fe80ef10
commit 31a741f473
6 changed files with 22 additions and 3 deletions
Makefile.inc1
lib
Makefile
libpam/modules
share/mk
tools/build/options
usr.sbin/ppp

View File

@ -1634,7 +1634,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \
${_lib_libcapsicum} \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus \
${_lib_libradius} lib/libsbuf lib/libtacplus \
lib/libgeom \
${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
${_cddl_lib_libuutil} \
@ -1657,6 +1657,10 @@ lib/libgeom__L: lib/libexpat__L
_lib_libthr= lib/libthr
.endif
.if ${MK_RADIUS_SUPPORT} != "no"
_lib_libradius= lib/libradius
.endif
.if ${MK_OFED} != "no"
_ofed_lib= contrib/ofed/usr.lib/
.endif

View File

@ -82,7 +82,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
${_libpmc} \
${_libproc} \
libprocstat \
libradius \
${_libradius} \
librpcsvc \
librt \
${_librtld_db} \
@ -142,7 +142,7 @@ SUBDIR_DEPEND_liblibrpcsec_gss= libgssapi
SUBDIR_DEPEND_libmagic= libz
SUBDIR_DEPEND_libmemstat= libkvm
SUBDIR_DEPEND_libopie= libmd
SUBDIR_DEPEND_libpam= libcrypt libopie libradius librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err}
SUBDIR_DEPEND_libpam= libcrypt libopie ${_libradius} librpcsvc libtacplus libutil ${_libypclnt} ${_libcom_err}
SUBDIR_DEPEND_libpjdlog= libutil
SUBDIR_DEPEND_libprocstat= libkvm libutil
SUBDIR_DEPEND_libradius= libmd
@ -286,6 +286,10 @@ _libmp= libmp
_libpmc= libpmc
.endif
.if ${MK_RADIUS_SUPPORT} != "no"
_libradius= libradius
.endif
.if ${MK_SENDMAIL} != "no"
_libmilter= libmilter
_libsm= libsm

View File

@ -21,7 +21,9 @@ MODULES += pam_opie
MODULES += pam_opieaccess
MODULES += pam_passwdqc
MODULES += pam_permit
.if ${MK_RADIUS_SUPPORT} != "no"
MODULES += pam_radius
.endif
MODULES += pam_rhosts
MODULES += pam_rootok
MODULES += pam_securetty

View File

@ -135,6 +135,7 @@ __DEFAULT_YES_OPTIONS = \
PORTSNAP \
PPP \
QUOTAS \
RADIUS_SUPPORT \
RCMDS \
RCS \
RESCUE \

View File

@ -0,0 +1,5 @@
.\" $FreeBSD$
Set to not build radius support into various applications, like
.Xr pam_radius 8
and
.Xr ppp 8 .

View File

@ -31,6 +31,9 @@ PPP_NO_NETGRAPH=
.if ${MK_PAM_SUPPORT} == "no"
PPP_NO_PAM=
.endif
.if ${MK_RADIUS_SUPPORT} == "no"
PPP_NO_RADIUS=
.endif
.if defined(PPP_NO_SUID)
BINMODE=554