From owner-cvs-all@FreeBSD.ORG  Sun May 11 13:29:26 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0CE3237B401; Sun, 11 May 2003 13:29:26 -0700 (PDT)
Received: from newtrinity.zeist.de (newtrinity.zeist.de [217.24.217.8])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id B89D543F75; Sun, 11 May 2003 13:29:24 -0700 (PDT)
	(envelope-from marius@newtrinity.zeist.de)
Received: from newtrinity.zeist.de (localhost [127.0.0.1])
	h4BKTNNQ015800;	Sun, 11 May 2003 22:29:23 +0200 (CEST)
	(envelope-from marius@newtrinity.zeist.de)
Received: (from marius@localhost)
	by newtrinity.zeist.de (8.12.9/8.12.9/Submit) id h4BKTIIO015799;
	Sun, 11 May 2003 22:29:18 +0200 (CEST)
	(envelope-from marius)
Date: Sun, 11 May 2003 22:29:17 +0200
From: Marius Strobl <marius@alchemy.franken.de>
To: Mark Murray <markm@freebsd.org>
Message-ID: <20030511222917.A711@newtrinity.zeist.de>
References: <200305050844.h458ie5h046774@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5.1i
In-Reply-To: <200305050844.h458ie5h046774@repoman.freebsd.org>;
	from markm@freebsd.org on Mon, May 05, 2003 at 01:44:40AM -0700
cc: cvs-src@freebsd.org
cc: src-committers@freebsd.org
cc: cvs-all@freebsd.org
Subject: Re: cvs commit: src Makefile.inc1
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 May 2003 20:29:26 -0000

On Mon, May 05, 2003 at 01:44:40AM -0700, Mark Murray wrote:
> markm       2003/05/05 01:44:40 PDT
> 
>   FreeBSD src repository
> 
>   Modified files:
>     .                    Makefile.inc1 
>   Log:
>   Negate the logic of MAKE_KERBEROS5, and replace it with NO_KERBEROS.
>   

There are two bogons left in Makefile.inc1 where it's not checked if
kerberos5 can be built (regarding dependency on OpenSSL and existence
of crypto and kerberos5 sources), see diff below.
It would be also fine if a comment to src/share/examples/etc/make.conf
could be added that NO_OPENSSL implies NO_KERBEROS.


Index: Makefile.inc1
===================================================================
RCS file: /usr/data/bsd/cvs/fbsd/src/Makefile.inc1,v
retrieving revision 1.356
diff -u -r1.356 Makefile.inc1
--- Makefile.inc1	5 May 2003 12:54:26 -0000	1.356
+++ Makefile.inc1	11 May 2003 19:55:16 -0000
@@ -693,7 +693,7 @@
 .endif
 
 .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
-    !defined(NOCRYPT) && !defined(NO_KERBEROS)
+    !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS)
 _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \
     kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl
 .endif
@@ -780,7 +780,8 @@
 
 _generic_libs=	gnu/lib
 
-.if !defined(NOCRYPT) && !defined(NO_KERBEROS)
+.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \
+    !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS)
 _prebuild_libs+=	kerberos5/lib/libasn1
 _prebuild_libs+=	kerberos5/lib/libgssapi
 _prebuild_libs+=	kerberos5/lib/libkrb5