From owner-p4-projects@FreeBSD.ORG  Mon May 12 09:36:16 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AE89337B404; Mon, 12 May 2003 09:36:15 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4E3B837B401
	for <perforce@freebsd.org>; Mon, 12 May 2003 09:36:15 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EB29343FA3
	for <perforce@freebsd.org>; Mon, 12 May 2003 09:36:14 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4CGaE0U010641
	for <perforce@freebsd.org>; Mon, 12 May 2003 09:36:14 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4CGaEFC010638
	for perforce@freebsd.org; Mon, 12 May 2003 09:36:14 -0700 (PDT)
Date: Mon, 12 May 2003 09:36:14 -0700 (PDT)
Message-Id: <200305121636.h4CGaEFC010638@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 31015 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 May 2003 16:36:16 -0000

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

Change 31015 by peter@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