diff options
author | ru <ru@FreeBSD.org> | 2004-02-03 09:37:12 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2004-02-03 09:37:12 +0000 |
commit | 3964693be17c42cfe84affb1d945fe6834405952 (patch) | |
tree | b25703c49d88a762ffd54af581b4de73d3fd05f5 /share/mk/bsd.libnames.mk | |
parent | 32fc0033c67c9b18165f0e3da03e1894e99aafd7 (diff) | |
download | FreeBSD-src-3964693be17c42cfe84affb1d945fe6834405952.zip FreeBSD-src-3964693be17c42cfe84affb1d945fe6834405952.tar.gz |
Fixed MINUSLPAM:
- Added missing NOCRYPT and NO_OPENSSL checks for Kerberos.
- Don't depend on -lcrypto and -lcrypt in pam_ssh to resolve
dependencies in pam_krb5 and pam_ksu -- the former may not
be compiled at all if NO_OPENSSH knob is enabled.
- Added missing -lcrypt to pam_ssh dependencies.
- Moved librpcsvc after libypclnt.
(The last two aren't strictly speaking necessary to resolve
the dependencies of static versions of pam_ssh and pam_unix,
respectively, but they correspond to dynamic dependencies
of libssh and libypclnt, and are put here for consistency.)
In collaboration with: bde
Reviewed by: des
Diffstat (limited to 'share/mk/bsd.libnames.mk')
-rw-r--r-- | share/mk/bsd.libnames.mk | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 3a62ddb..c3e23b3 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -74,21 +74,20 @@ LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a # The static PAM library doesn't know its secondary dependencies, # so we have to specify them explicitly. LIBPAM?= ${DESTDIR}${LIBDIR}/libpam.a -MINUSLPAM?= -lpam +MINUSLPAM= -lpam .if defined(LDFLAGS) && !empty(LDFLAGS:M-static) -.if !defined(NO_KERBEROS) -LIBPAM+= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} -MINUSLPAM+= -lkrb5 -lasn1 -lroken -LIBPAM+= ${LIBCOM_ERR} -MINUSLPAM+= -lcom_err +.if !defined(NO_KERBEROS) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +LIBPAM+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \ + ${LIBROKEN} ${LIBCOM_ERR} +MINUSLPAM+= -lkrb5 -lasn1 -lcrypto -lcrypt -lroken -lcom_err .endif -LIBPAM+= ${LIBRADIUS} ${LIBRPCSVC} ${LIBTACPLUS} ${LIBCRYPT} \ - ${LIBUTIL} ${LIBOPIE} ${LIBMD} ${LIBYPCLNT} -MINUSLPAM+= -lradius -lrpcsvc -ltacplus -lcrypt \ - -lutil -lopie -lmd -lypclnt -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) -LIBPAM+= ${LIBSSH} ${LIBCRYPTO} -MINUSLPAM+= -lssh -lcrypto +LIBPAM+= ${LIBRADIUS} ${LIBTACPLUS} ${LIBCRYPT} \ + ${LIBUTIL} ${LIBOPIE} ${LIBMD} ${LIBYPCLNT} ${LIBRPCSVC} +MINUSLPAM+= -lradius -ltacplus -lcrypt \ + -lutil -lopie -lmd -lypclnt -lrpcsvc +.if !defined(NO_OPENSSH) && !defined(NOCRYPT) && !defined(NO_OPENSSL) +LIBPAM+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} +MINUSLPAM+= -lssh -lcrypto -lcrypt .endif .endif |