diff options
| author | kris <kris@FreeBSD.org> | 2000-03-09 06:29:05 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2000-03-09 06:29:05 +0000 |
| commit | 0d1f47825b8bc213c9c4e1fdef06b1a35096446d (patch) | |
| tree | f1fa21cc8ddc4c376857a5866b4b4cb27002706c /lib | |
| parent | 45f640e388df179b42641eb7ff526b05617cce21 (diff) | |
| download | FreeBSD-src-0d1f47825b8bc213c9c4e1fdef06b1a35096446d.zip FreeBSD-src-0d1f47825b8bc213c9c4e1fdef06b1a35096446d.tar.gz | |
Buildworld fixes for NO_OPENSSH and NO_OPENSSL
Approved by: jkh
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 0492e70..357b0b0 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 c4cb0a4..4142380 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 fec6b77..61eb0b4 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 |
