From owner-svn-src-stable-10@freebsd.org  Sat Sep 30 20:46:35 2017
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D8E52E2F040;
 Sat, 30 Sep 2017 20:46:35 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A6E87801D9;
 Sat, 30 Sep 2017 20:46:35 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8UKkYoB041843;
 Sat, 30 Sep 2017 20:46:34 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8UKkY3t041842;
 Sat, 30 Sep 2017 20:46:34 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201709302046.v8UKkY3t041842@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sat, 30 Sep 2017 20:46:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r324140 - stable/10/share/mk
X-SVN-Group: stable-10
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: stable/10/share/mk
X-SVN-Commit-Revision: 324140
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Sep 2017 20:46:36 -0000

Author: ngie
Date: Sat Sep 30 20:46:34 2017
New Revision: 324140
URL: https://svnweb.freebsd.org/changeset/base/324140

Log:
  MFC r321952:
  
  Allowing MK_NLS_CATALOGS to be enabled if MK_NLS == no doesn't make a whole lot
  of sense. Anchor MK_NLS_CATALOGS being enabled off of MK_NLS.

Modified:
  stable/10/share/mk/bsd.own.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk	Sat Sep 30 20:44:25 2017	(r324139)
+++ stable/10/share/mk/bsd.own.mk	Sat Sep 30 20:46:34 2017	(r324140)
@@ -569,6 +569,10 @@ MK_ATM:=	no
 MK_BLUETOOTH:=	no
 .endif
 
+.if ${MK_NLS} == "no"
+MK_NLS_CATALOGS:= no
+.endif
+
 .if ${MK_OPENSSL} == "no"
 MK_OPENSSH:=	no
 MK_KERBEROS:=	no