From 2486c641e754d3fc6eebd5b0cb329d9d0f114ee2 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Fri, 6 Jan 2017 04:16:03 +0000 Subject: [PATCH] Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of always building support into sendmail. MFC after: 2 weeks --- usr.sbin/sendmail/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index d7246cbef84b..3307bfe5a946 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -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}