PERFORCE change 31015 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=31015

Change 31015 by peter at peter_hammer on 2003/05/12 09:35:40

	This stuff is fixed, at last.

Affected files ...

.. //depot/projects/hammer/lib/libpam/modules/modules.inc#7 edit
.. //depot/projects/hammer/share/mk/bsd.libnames.mk#8 edit

Differences ...

==== //depot/projects/hammer/lib/libpam/modules/modules.inc#7 (text+ko) ====

@@ -25,8 +25,7 @@
 MODULES		+= pam_securetty
 MODULES		+= pam_self
 .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \
-    !defined(NOSECURE) && !defined(NOPIC) && \
-    (!defined(NOSHARED) || ( ${NOSHARED} == "no" || ${NOSHARED} == "NO" ))
+    !defined(NOSECURE)
 MODULES		+= pam_ssh
 .endif
 MODULES		+= pam_tacplus

==== //depot/projects/hammer/share/mk/bsd.libnames.mk#8 (text+ko) ====

@@ -81,9 +81,7 @@
 		${LIBUTIL} ${LIBOPIE} ${LIBMD} ${LIBYPCLNT}
 MINUSLPAM+=	-lradius -lrpcsvc -ltacplus -lcrypt \
 		-lutil -lopie -lmd -lypclnt
-.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \
-    !defined(NOPIC) && \
-    (!defined(NOSHARED) || ( ${NOSHARED} == "no" || ${NOSHARED} == "NO" ))
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH)
 LIBPAM+=	${LIBSSH} ${LIBCRYPTO}
 MINUSLPAM+=	-lssh -lcrypto
 .endif