From owner-svn-src-projects@FreeBSD.ORG  Mon May  5 18:16:16 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7E3C4280;
 Mon,  5 May 2014 18:16:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6C3F4D21;
 Mon,  5 May 2014 18:16:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s45IGG4A027091;
 Mon, 5 May 2014 18:16:16 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s45IGG1Z027090;
 Mon, 5 May 2014 18:16:16 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201405051816.s45IGG1Z027090@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Mon, 5 May 2014 18:16:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r265378 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 May 2014 18:16:16 -0000

Author: sjg
Date: Mon May  5 18:16:15 2014
New Revision: 265378
URL: http://svnweb.freebsd.org/changeset/base/265378

Log:
  WITHOUT always wins
  
  Reviewed by:	imp

Modified:
  projects/bmake/share/mk/bsd.mkopt.mk

Modified: projects/bmake/share/mk/bsd.mkopt.mk
==============================================================================
--- projects/bmake/share/mk/bsd.mkopt.mk	Mon May  5 18:15:18 2014	(r265377)
+++ projects/bmake/share/mk/bsd.mkopt.mk	Mon May  5 18:16:15 2014	(r265378)
@@ -30,7 +30,7 @@ MK_${var}:=	yes
 #
 .for var in ${__DEFAULT_NO_OPTIONS}
 .if !defined(MK_${var})
-.if defined(WITH_${var})	# If both WITH and WITHOUT defined, WITH wins
+.if defined(WITH_${var}) && !defined(WITHOUT_${var}) # WITHOUT wins
 MK_${var}:=	yes
 .else
 MK_${var}:=	no