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
This commit is contained in:
Ruslan Ermilov 2004-02-03 09:37:12 +00:00
parent 51088c9b7b
commit 53fcfc9167

View File

@ -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