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

@@ -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>

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