d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include Kerberos if NOCRYPT is defined, because it isn't build

Browse Source 
if NOCRYPT is defined. Likewise, don't include DES if NOSECURE is
defined.
This commit is contained in:
Marcel Moolenaar 1999-11-14 15:48:29 +00:00
parent 0917704bd4
commit ee98eb8e13
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=53153
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libpam/libpam/Makefile
View File

@ -62,10 +62,10 @@ HDRS3= pam_mod_misc.h
# Static PAM modules:
STATIC_MODULES+= ${MODOBJDIR}/pam_cleartext_pass_ok/libpam_cleartext_pass_ok.a
STATIC_MODULES+= ${MODOBJDIR}/pam_deny/libpam_deny.a
.if defined(MAKE_KERBEROS4)
.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT)
STATIC_MODULES+= ${MODOBJDIR}/pam_kerberosIV/libpam_kerberosIV.a
.endif
.if defined(MAKE_KERBEROS5)
.if defined(MAKE_KERBEROS5) && !defined(NOCRYPT)
STATIC_MODULES+= ${MODOBJDIR}/pam_kerberos5/libpam_kerberos5.a
.endif
STATIC_MODULES+= ${MODOBJDIR}/pam_permit/libpam_permit.a

2
lib/libpam/modules/Makefile
View File

@ -26,7 +26,7 @@
SUBDIR+= pam_cleartext_pass_ok
SUBDIR+= pam_deny
.if defined(MAKE_KERBEROS4)
.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT)
SUBDIR+= pam_kerberosIV
.endif
SUBDIR+= pam_permit

10
lib/libpam/modules/pam_kerberosIV/Makefile
View File

@ -33,8 +33,14 @@ CFLAGS+= -Wall
CFLAGS+= -I${PAMDIR}/libpam/include
CFLAGS+= -I${.CURDIR}/../../libpam
CFLAGS+= -DKERBEROS
DPADD+= ${LIBKRB} ${LIBDES} ${LIBGCC_PIC} ${LIBCOM_ERR}
LDADD+= -lkrb -ldes -lgcc_pic -lcom_err
DPADD+= ${LIBKRB}
LDADD+= -lkrb
.if !defined(NOSECURE)
DPADD+= ${LIBDES}
LDADD+= -ldes
.endif
DPADD+= ${LIBGCC_PIC} ${LIBCOM_ERR}
LDADD+= -lgcc_pic -lcom_err
INTERNALLIB= yes
INTERNALSTATICLIB=yes