From owner-cvs-src@FreeBSD.ORG  Mon May 12 00:13:23 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id BD66F37B401; Mon, 12 May 2003 00:13:23 -0700 (PDT)
Received: from storm.FreeBSD.org.uk (storm.FreeBSD.org.uk [194.242.157.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id C107943FCB; Mon, 12 May 2003 00:13:22 -0700 (PDT)
	(envelope-from mark@grondar.org)
Received: from storm.FreeBSD.org.uk (Ugrondar@localhost [127.0.0.1])
	by storm.FreeBSD.org.uk (8.12.7/8.12.7) with ESMTP id h4C7DGSQ040655;
	Mon, 12 May 2003 08:13:16 +0100 (BST)
	(envelope-from mark@grondar.org)
Received: (from Ugrondar@localhost)h4C7DGqJ040654;
	Mon, 12 May 2003 08:13:16 +0100 (BST)
X-Authentication-Warning: storm.FreeBSD.org.uk: Ugrondar set sender to
	mark@grondar.org using -f
Received: from grondar.org (localhost [127.0.0.1])h4C7DwAs010155;
	Mon, 12 May 2003 08:13:58 +0100 (BST)
	(envelope-from mark@grondar.org)
From: Mark Murray <mark@grondar.org>
Message-Id: <200305120713.h4C7DwAs010155@grimreaper.grondar.org>
To: Marius Strobl <marius@alchemy.franken.de>
In-Reply-To: Your message of "Sun, 11 May 2003 22:29:17 +0200."
             <20030511222917.A711@newtrinity.zeist.de> 
Date: Mon, 12 May 2003 08:13:58 +0100
Sender: mark@grondar.org
cc: cvs-src@freebsd.org
cc: src-committers@freebsd.org
cc: Mark Murray <markm@freebsd.org>
cc: cvs-all@freebsd.org
Subject: Re: cvs commit: src Makefile.inc1 
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 May 2003 07:13:24 -0000

Marius Strobl writes:
> 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.

Thank you!

> It would be also fine if a comment to src/share/examples/etc/make.conf
> could be added that NO_OPENSSL implies NO_KERBEROS.

Yes. This would indeed be good. Thanks!

M

> 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
--
Mark Murray
iumop ap!sdn w,I idlaH