From owner-freebsd-current Sun Mar 5 13:47:42 2000 Delivered-To: freebsd-current@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 758) id 806CA37B853; Sun, 5 Mar 2000 13:47:39 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by hub.freebsd.org (Postfix) with ESMTP id 7C57D2E8158; Sun, 5 Mar 2000 13:47:39 -0800 (PST) (envelope-from kris@hub.freebsd.org) Date: Sun, 5 Mar 2000 13:47:39 -0800 (PST) From: Kris Kennaway To: Randy Bush Cc: FreeBSD Current Subject: Re: libcrypto.a - deja vu? In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Oops, my buildworld -DNOCLEAN just failed again. Updated patch: Index: libpam/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libpam/libpam/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- libpam/Makefile 2000/02/28 21:00:48 1.11 +++ libpam/Makefile 2000/03/05 21:46:10 @@ -62,16 +62,16 @@ # 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) STATIC_MODULES+= ${MODOBJDIR}/pam_ssh/libpam_ssh.a .endif STATIC_MODULES+= ${MODOBJDIR}/pam_tacplus/libpam_tacplus.a Index: modules/Makefile =================================================================== RCS file: /home/ncvs/src/lib/libpam/modules/Makefile,v retrieving revision 1.7 diff -u -r1.7 Makefile --- modules/Makefile 2000/02/28 21:00:50 1.7 +++ modules/Makefile 2000/03/05 21:46:25 @@ -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) SUBDIR+= pam_ssh .endif SUBDIR+= pam_tacplus ---- In God we Trust -- all others must submit an X.509 certificate. -- Charles Forsythe To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message