From c02129e1cc85ab5c0ba3846b2d0edacc244be2dd Mon Sep 17 00:00:00 2001
From: Enji Cooper <ngie@FreeBSD.org>
Date: Fri, 6 Jan 2017 04:22:25 +0000
Subject: [PATCH] Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead
 of always building support into amd(8).

MFC after:	2 weeks
---
 usr.sbin/amd/amd/Makefile     | 7 ++++++-
 usr.sbin/amd/include/config.h | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index aebd3f17cd0..b684dc93d39 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -30,7 +30,7 @@ CFLAGS+= -I${SRCTOP}/contrib/amd/amd \
 	 -I${SRCTOP}/contrib/amd/include \
 	 -I${.OBJDIR}/../../../include/rpcsvc
 
-LIBADD=	amu wrap
+LIBADD=	amu
 
 SRCS+=		conf_parse.c conf_parse.h conf_tok.c
 SRCS+=		sun_map_parse.c sun_map_parse.h sun_map_tok.c
@@ -73,4 +73,9 @@ CFLAGS+= -DHAVE_MAP_HESIOD
 SRCS+=	info_nis.c
 .endif
 
+.if ${MK_TCP_WRAPPERS} != "no"
+CFLAGS+=	-DHAVE_LIBWRAP -DHAVE_TCPD_H
+LIBADD+=	wrap
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h
index 58b822edc92..3d22033e18e 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