Date: Sat, 4 Feb 2017 16:54:44 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r313230 - stable/11/usr.sbin/sendmail Message-ID: <201702041654.v14GsiWs079060@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Feb 4 16:54:44 2017 New Revision: 313230 URL: https://svnweb.freebsd.org/changeset/base/313230 Log: MFC r311471: Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of always building support into sendmail. Modified: stable/11/usr.sbin/sendmail/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/sendmail/Makefile ============================================================================== --- stable/11/usr.sbin/sendmail/Makefile Sat Feb 4 16:52:48 2017 (r313229) +++ stable/11/usr.sbin/sendmail/Makefile Sat Feb 4 16:54:44 2017 (r313230) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702041654.v14GsiWs079060>