From 659b3f91b4b9f080c1ccac4837cd635409fe241e Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 4 Feb 2017 16:00:51 +0000
Subject: [PATCH] MFC r311472:

Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of
always building support into amd(8).


git-svn-id: svn://svn.freebsd.org/base/stable/10@313212 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 usr.sbin/amd/amd/Makefile     | 10 ++++++++--
 usr.sbin/amd/include/config.h |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index f335ef0b6..273f71e1c 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -30,8 +30,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \
 	 -I${SRCTOP}/contrib/amd/include \
 	 -I${.OBJDIR}/../../../include/rpcsvc
 
-DPADD=	${LIBAMU} ${LIBWRAP}
-LDADD=	${LIBAMU} -lwrap
+DPADD=	${LIBAMU}
+LDADD=	${LIBAMU}
 
 SRCS+=		conf_parse.c conf_parse.h conf_tok.c
 SRCS+=		sun_map_parse.c sun_map_parse.h sun_map_tok.c
@@ -74,4 +74,10 @@ CFLAGS+= -DHAVE_MAP_HESIOD
 SRCS+=	info_nis.c
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DHAVE_LIBWRAP -DHAVE_TCPD_H
+DPADD+=		${LIBWRAP}
+LDADD+=		-lwrap
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h
index edae5fdca..2e46db1d3 100644
--- a/usr.sbin/amd/include/config.h
+++ b/usr.sbin/amd/include/config.h
@@ -530,7 +530,7 @@
 /* #undef HAVE_LIBRT */
 
 /* does libwrap exist? */
-#define HAVE_LIBWRAP 1
+/* #undef HAVE_LIBWRAP */
 
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
@@ -1207,7 +1207,7 @@
 #define HAVE_SYS_WAIT_H 1
 
 /* Define to 1 if you have the <tcpd.h> header file. */
-#define HAVE_TCPD_H 1
+/* #undef HAVE_TCPD_H */
 
 /* Define to 1 if you have the <time.h> header file. */
 #define HAVE_TIME_H 1
-- 
2.45.0