diff options
| author | ngie <ngie@FreeBSD.org> | 2017-02-04 16:00:51 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-02-04 16:00:51 +0000 |
| commit | 1735b4770c219f1e38821b79ebc51b8f9721d733 (patch) | |
| tree | 154c4b376d88c2e0fdff9fbdcd000ac25cd24b66 /usr.sbin | |
| parent | 53aad645dc6d43426aff220d8ef5abf5ca6319ee (diff) | |
| download | FreeBSD-src-1735b4770c219f1e38821b79ebc51b8f9721d733.zip FreeBSD-src-1735b4770c219f1e38821b79ebc51b8f9721d733.tar.gz | |
MFC r311472:
Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of
always building support into amd(8).
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/amd/amd/Makefile | 10 | ||||
| -rw-r--r-- | 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 f335ef0..273f71e 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 edae5fd..2e46db1 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 |
