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}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
