From owner-svn-src-head@freebsd.org  Fri Jan  6 04:16:04 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 47890CA1097;
 Fri,  6 Jan 2017 04:16:04 +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 172101508;
 Fri,  6 Jan 2017 04:16:04 +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 v064G3S8066004;
 Fri, 6 Jan 2017 04:16:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v064G3hT066003;
 Fri, 6 Jan 2017 04:16:03 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201701060416.v064G3hT066003@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: Fri, 6 Jan 2017 04:16:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r311471 - head/usr.sbin/sendmail
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jan 2017 04:16:04 -0000

Author: ngie
Date: Fri Jan  6 04:16:03 2017
New Revision: 311471
URL: https://svnweb.freebsd.org/changeset/base/311471

Log:
  Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of
  always building support into sendmail.
  
  MFC after:	2 weeks

Modified:
  head/usr.sbin/sendmail/Makefile

Modified: head/usr.sbin/sendmail/Makefile
==============================================================================
--- head/usr.sbin/sendmail/Makefile	Fri Jan  6 04:13:08 2017	(r311470)
+++ head/usr.sbin/sendmail/Makefile	Fri Jan  6 04:16:03 2017	(r311471)
@@ -38,7 +38,7 @@ NIS=	-DNIS
 MAPS=	-DMAP_REGEX -DDNSMAP
 
 CFLAGS+= -I${SMDIR} -I${SENDMAIL_DIR}/include -I.
-CFLAGS+= ${DBMDEF} ${NIS} -DTCPWRAPPERS ${MAPS}
+CFLAGS+= ${DBMDEF} ${NIS} ${MAPS}
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DNETINET6
@@ -46,7 +46,7 @@ CFLAGS+= -DNETINET6
 
 WARNS?=	0
 
-LIBADD=	util wrap sm smutil
+LIBADD=	util sm smutil
 
 SRCS+=	sm_os.h
 CLEANFILES+=sm_os.h
@@ -57,6 +57,11 @@ CFLAGS+=	-DSTARTTLS -D_FFR_TLS_1
 LIBADD+=	ssl crypto
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DTCPWRAPPERS
+LIBADD+=	wrap
+.endif
+
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
 DPADD+=${SENDMAIL_DPADD}