diff options
| author | ngie <ngie@FreeBSD.org> | 2017-02-04 16:00:19 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-02-04 16:00:19 +0000 |
| commit | 8dca95e6aace7beb049ff3d71dfc6bebc2e56e34 (patch) | |
| tree | 9755dd786f642b5fb4abaeec690ed6b2e641cdb1 | |
| parent | c76d753565f839fe82837cda8e809b0312251fbe (diff) | |
| download | FreeBSD-src-8dca95e6aace7beb049ff3d71dfc6bebc2e56e34.zip FreeBSD-src-8dca95e6aace7beb049ff3d71dfc6bebc2e56e34.tar.gz | |
MFC r311472:
Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of
always building support into amd(8).
| -rw-r--r-- | usr.sbin/amd/amd/Makefile | 7 | ||||
| -rw-r--r-- | 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 6bd74d1..4dade99 100644 --- a/usr.sbin/amd/amd/Makefile +++ b/usr.sbin/amd/amd/Makefile @@ -30,7 +30,7 @@ CFLAGS+= -I${.CURDIR}/../../../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 58b822e..3d22033 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 |
