svn commit: r313209 - stable/10/usr.sbin/rpcbind

[Ngie Cooper]

Author: ngie
Date: Sat Feb  4 15:55:31 2017
New Revision: 313209
URL: https://svnweb.freebsd.org/changeset/base/313209

Log:
  MFC r311470:
  
  Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of
  always building support into rpcbind.

Modified:
  stable/10/usr.sbin/rpcbind/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/rpcbind/Makefile
==============================================================================
--- stable/10/usr.sbin/rpcbind/Makefile	Sat Feb  4 15:53:34 2017	(r313208)
+++ stable/10/usr.sbin/rpcbind/Makefile	Sat Feb  4 15:55:31 2017	(r313209)
@@ -8,19 +8,25 @@ MAN=	rpcbind.8
 SRCS=	check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
 	rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c
 
-CFLAGS+= -DPORTMAP -DLIBWRAP
+CFLAGS+= -DPORTMAP
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DLIBWRAP
+DPADD+=		${LIBWRAP}
+LDADD+=		-lwrap
+.endif
+
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 
-WARNS?=	1
+DPADD+=		${LIBUTIL}
+LDADD+=		-lutil
 
-DPADD=	${LIBWRAP} ${LIBUTIL}
-LDADD=	-lwrap -lutil
+WARNS?=	1
 
 .include <bsd.prog.mk>