system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 04:43:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of

Browse source 
always building support into amd(8).

MFC after:	2 weeks
This commit is contained in:
Enji Cooper 2017-01-06 04:22:25 +00:00
parent 2486c641e7
commit c02129e1cc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=311472
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
usr.sbin/amd/amd/Makefile
View file

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

4
usr.sbin/amd/include/config.h
View file

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