diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2000-03-09 06:29:05 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2000-03-09 06:29:05 +0000 |
| commit | bb49f794f5ee647d19e458b23eca844a3a85f813 (patch) | |
| tree | 241cba11dae37496c9a301b88acaa078786e551a /lib | |
| parent | d1a417f17ed3893fe20613320b44ecd60c0435b2 (diff) | |
Notes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/libpam/libpam/Makefile | 6 | ||||
| -rw-r--r-- | lib/libpam/modules/Makefile | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/Makefile b/lib/Makefile index 0492e70cfb14..357b0b0070d2 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -43,7 +43,7 @@ _libbind= libbind .endif _libcrypt= libcrypt -.if exists(${.CURDIR}/../secure) && !defined(NOSECURE) && !defined(NOCRYPT) +.if exists(${.CURDIR}/../secure) && !defined(NOSECURE) && !defined(NOCRYPT) && !defined(NO_DESCRYPT) # Build both libraries. They have different names, so no harm, # and this avoids having stale libscrypt.* _libcrypt+= ../secure/lib/libcrypt diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index c4cb0a468026..4142380f34d8 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -62,16 +62,16 @@ 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) && !defined(NOCRYPT) +.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT) && !defined(NO_OPENSSL) STATIC_MODULES+= ${MODOBJDIR}/pam_kerberosIV/libpam_kerberosIV.a .endif -.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT) +.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT) && !defined(NO_OPENSSL) STATIC_MODULES+= ${MODOBJDIR}/pam_kerberos5/libpam_kerberos5.a .endif STATIC_MODULES+= ${MODOBJDIR}/pam_permit/libpam_permit.a STATIC_MODULES+= ${MODOBJDIR}/pam_radius/libpam_radius.a STATIC_MODULES+= ${MODOBJDIR}/pam_skey/libpam_skey.a -.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NO_OPENSSL) +.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) STATIC_MODULES+= ${MODOBJDIR}/pam_ssh/libpam_ssh.a .endif STATIC_MODULES+= ${MODOBJDIR}/pam_tacplus/libpam_tacplus.a diff --git a/lib/libpam/modules/Makefile b/lib/libpam/modules/Makefile index fec6b77d89f1..61eb0b455de0 100644 --- a/lib/libpam/modules/Makefile +++ b/lib/libpam/modules/Makefile @@ -26,16 +26,16 @@ SUBDIR+= pam_cleartext_pass_ok SUBDIR+= pam_deny -.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT) +.if defined(MAKE_KERBEROS4) && !defined(NOCRYPT) && !defined(NO_OPENSSL) SUBDIR+= pam_kerberosIV .endif -.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT) +.if defined(MAKE_KERBEROS5__) && !defined(NOCRYPT) && !defined(NO_OPENSSL) SUBDIR+= pam_kerberos5 .endif SUBDIR+= pam_permit SUBDIR+= pam_radius SUBDIR+= pam_skey -.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NO_OPENSSL) +.if exists(${.CURDIR}/../../../crypto/openssh) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) SUBDIR+= pam_ssh .endif SUBDIR+= pam_tacplus |