From 1962a2ef934009d7825d60a3a2c666f656ee77a5 Mon Sep 17 00:00:00 2001 From: ngie Date: Sat, 4 Feb 2017 16:45:44 +0000 Subject: [PATCH] MFC r311471: Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of always building support into sendmail. git-svn-id: svn://svn.freebsd.org/base/stable/10@313225 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- usr.sbin/sendmail/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 5a850bfc2..c4e9ad9f4 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -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} -- 2.45.0