diff options
author | marcel <marcel@FreeBSD.org> | 1999-11-14 15:48:29 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 1999-11-14 15:48:29 +0000 |
commit | 83affd600f40e3a73f4f4275c496fffff63cb23d (patch) | |
tree | 50ae947726d423d3bc93dbaa6af6823fb4a15bf4 /lib/libpam | |
parent | 17ed6e05da9e78604972eb2120615a505953fd25 (diff) | |
download | FreeBSD-src-83affd600f40e3a73f4f4275c496fffff63cb23d.zip FreeBSD-src-83affd600f40e3a73f4f4275c496fffff63cb23d.tar.gz |
Don't include Kerberos if NOCRYPT is defined, because it isn't build
if NOCRYPT is defined. Likewise, don't include DES if NOSECURE is
defined.
Diffstat (limited to 'lib/libpam')
-rw-r--r-- | lib/libpam/libpam/Makefile | 4 | ||||
-rw-r--r-- | lib/libpam/modules/Makefile | 2 | ||||
-rw-r--r-- | lib/libpam/modules/pam_kerberosIV/Makefile | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index 0e87162..f8143a5 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -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 diff --git a/lib/libpam/modules/Makefile b/lib/libpam/modules/Makefile index 74136ba..8018dbd 100644 --- a/lib/libpam/modules/Makefile +++ b/lib/libpam/modules/Makefile @@ -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 diff --git a/lib/libpam/modules/pam_kerberosIV/Makefile b/lib/libpam/modules/pam_kerberosIV/Makefile index fea3247..ee4e6a6 100644 --- a/lib/libpam/modules/pam_kerberosIV/Makefile +++ b/lib/libpam/modules/pam_kerberosIV/Makefile @@ -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 |