Don't explicitly build tcp wrappers support into bsnmpd; make it conditional

on MK_TCP_WRAPPERS != "no"

This likely fixes an issue seen where some of the USE_TCPWRAPPERS code didn't
work as advertised

MFC after:	1 week
This commit is contained in:
ngie 2016-12-28 16:34:49 +00:00
parent 32c9e46f96
commit 70e3404e70

View File

@ -125,9 +125,8 @@ DEFSDIR= ${SHAREDIR}/snmp/defs
CFLAGS+= -DSNMPTREE_TYPES
CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT
CFLAGS+= -DUSE_TCPWRAPPERS
CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY
LIBADD= begemot bsnmp wrap
LIBADD= begemot bsnmp
LDFLAGS= -Wl,-export-dynamic
@ -135,6 +134,11 @@ LDFLAGS= -Wl,-export-dynamic
CFLAGS+= -DHAVE_LIBCRYPTO
.endif
.if ${MK_TCP_WRAPPERS} != "no"
CFLAGS+= -DUSE_TCPWRAPPERS
LIBADD+= wrap
.endif
oid.h: tree.def Makefile
gensnmptree -e ${XSYM} < ${.ALLSRC:M*.def} > ${.TARGET}