diff options
author | ru <ru@FreeBSD.org> | 2002-01-23 15:54:17 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2002-01-23 15:54:17 +0000 |
commit | c9d8bf860852b7610efc15075539f0a6e59db321 (patch) | |
tree | a5bcd89550bea724a32663eb66e8d4f6b444874d /share/mk | |
parent | e64688fcfb6f0f21dfe93591e7e15c93f4a68a3c (diff) | |
download | FreeBSD-src-c9d8bf860852b7610efc15075539f0a6e59db321.zip FreeBSD-src-c9d8bf860852b7610efc15075539f0a6e59db321.tar.gz |
Add pam_ssh support to the static PAM library, libpam.a:
- Spam /usr/lib some more by making libssh a standard library.
- Tweak ${LIBPAM} and ${MINUSLPAM}.
- Garbage collect unused libssh_pic.a.
- Add fake -lz dependency to secure/ makefiles needed for
dynamic linkage with -lssh.
Reviewed by: des, markm
Approved by: markm
Diffstat (limited to 'share/mk')
-rw-r--r-- | share/mk/bsd.libnames.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 71a46cc..052c6b6 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -73,12 +73,14 @@ MINUSLPAM+= -lkrb5 -lasn1 -lroken LIBPAM+= ${LIBCOM_ERR} MINUSLPAM+= -lcom_err .endif -LIBPAM+= -LIBPAM+= ${LIBRADIUS} ${LIBRPCSVC} ${LIBTACPLUS} \ - ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} \ - ${LIBUTIL} ${LIBOPIE} ${LIBMD} ${LIBZ} -MINUSLPAM+= -lradius -lrpcsvc -ltacplus -lssh -lcrypto -lcrypt \ - -lutil -lopie -lmd -lz +LIBPAM+= ${LIBRADIUS} ${LIBRPCSVC} ${LIBTACPLUS} ${LIBCRYPT} \ + ${LIBUTIL} ${LIBOPIE} ${LIBMD} +MINUSLPAM+= -lradius -lrpcsvc -ltacplus -lcrypt \ + -lutil -lopie -lmd +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) +LIBPAM+= ${LIBSSH} ${LIBCRYPTO} +MINUSLPAM+= -lssh -lcrypto +.endif .endif LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a @@ -93,6 +95,7 @@ LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a # XXX in secure dist, not base LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a +LIBSSH?= ${DESTDIR}${LIBDIR}/libssh.a # XXX in secure dist, not base LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a # XXX in secure dist, not base LIBSTDCPLUSPLUS?= ${DESTDIR}${LIBDIR}/libstdc++.a LIBTACPLUS?= ${DESTDIR}${LIBDIR}/libtacplus.a |