svn commit: r313225 - stable/10/usr.sbin/sendmail

[Ngie Cooper]

Author: ngie
Date: Sat Feb  4 16:45:44 2017
New Revision: 313225
URL: https://svnweb.freebsd.org/changeset/base/313225

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

Modified:
  stable/10/usr.sbin/sendmail/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/sendmail/Makefile
==============================================================================
--- stable/10/usr.sbin/sendmail/Makefile	Sat Feb  4 16:43:35 2017	(r313224)
+++ stable/10/usr.sbin/sendmail/Makefile	Sat Feb  4 16:45:44 2017	(r313225)
@@ -37,7 +37,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 -DIPV6_FULL=0
@@ -45,8 +45,8 @@ CFLAGS+= -DNETINET6 -DIPV6_FULL=0
 
 WARNS?=	0
 
-DPADD=	${LIBUTIL} ${LIBWRAP}
-LDADD=	-lutil -lwrap
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
 
 LIBSMDIR=	${.OBJDIR}/../../lib/libsm
 LIBSM=		${LIBSMDIR}/libsm.a
@@ -67,6 +67,12 @@ DPADD+=		${LIBSSL} ${LIBCRYPTO}
 LDADD+=		-lssl -lcrypto
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DTCPWRAPPERS
+DPADD+=		${LIBWRAP}
+LDADD+=		-lwrap
+.endif
+
 # User customizations to the sendmail build environment
 CFLAGS+=${SENDMAIL_CFLAGS}
 DPADD+=${SENDMAIL_DPADD}