summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2002-01-23 15:54:17 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2002-01-23 15:54:17 +0000
commit0509dca0c3687d52cef8e5ffab8a2f7d52be672a (patch)
treea5bcd89550bea724a32663eb66e8d4f6b444874d /lib
parentb6b756b58b4787f31b67f70956d94b3441623e3f (diff)
Notes
Diffstat (limited to 'lib')
-rw-r--r--lib/libpam/libpam/Makefile4
-rw-r--r--lib/libpam/modules/pam_ssh/Makefile5
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index 5bfc749d7baf..70cde475ce77 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -60,7 +60,7 @@ MLINKS+= pam.8 pam.conf.5 pam.8 pam.d.5
HDRS0= pam_client.h
# Files from ${PAMDIR}/libpam_misc:
-SRCS+= help_env.c misc_conv.c xstrdup.c
+SRCS+= help_env.c misc_conv.c
HDRS2= pam_misc.h
# Files from ${.CURDIR}:
@@ -86,7 +86,9 @@ STATIC_MODULES+= ${MODOBJDIR}/pam_radius/libpam_radius.a
STATIC_MODULES+= ${MODOBJDIR}/pam_rootok/libpam_rootok.a
STATIC_MODULES+= ${MODOBJDIR}/pam_securetty/libpam_securetty.a
STATIC_MODULES+= ${MODOBJDIR}/pam_self/libpam_self.a
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
STATIC_MODULES+= ${MODOBJDIR}/pam_ssh/libpam_ssh.a
+.endif
STATIC_MODULES+= ${MODOBJDIR}/pam_tacplus/libpam_tacplus.a
STATIC_MODULES+= ${MODOBJDIR}/pam_unix/libpam_unix.a
STATIC_MODULES+= ${MODOBJDIR}/pam_wheel/libpam_wheel.a
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
index 84dfac93e05e..9d862703f8eb 100644
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -7,9 +7,8 @@ LIB= pam_ssh
SHLIB_NAME= pam_ssh.so
SRCS= pam_ssh.c
CFLAGS+= -I${SSHSRC}
-DPADD= ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
-LDADD= -L${.OBJDIR}/../../../../secure/lib/libssh -lssh -lcrypto \
- -lcrypt -lutil -lz
+DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ${LIBZ}
+LDADD= -lssh -lcrypto -lcrypt -lutil -lz
MAN= pam_ssh.8
.include <bsd.lib.mk>