Date: Fri, 6 Jan 2017 04:22:25 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r311472 - in head/usr.sbin/amd: amd include Message-ID: <201701060422.v064MPt8069961@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Fri Jan 6 04:22:25 2017 New Revision: 311472 URL: https://svnweb.freebsd.org/changeset/base/311472 Log: Conditionalize wrap(3) use based on MK_TCP_WRAPPERS instead of always building support into amd(8). MFC after: 2 weeks Modified: head/usr.sbin/amd/amd/Makefile head/usr.sbin/amd/include/config.h Modified: head/usr.sbin/amd/amd/Makefile ============================================================================== --- head/usr.sbin/amd/amd/Makefile Fri Jan 6 04:16:03 2017 (r311471) +++ head/usr.sbin/amd/amd/Makefile Fri Jan 6 04:22:25 2017 (r311472) @@ -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> Modified: head/usr.sbin/amd/include/config.h ============================================================================== --- head/usr.sbin/amd/include/config.h Fri Jan 6 04:16:03 2017 (r311471) +++ head/usr.sbin/amd/include/config.h Fri Jan 6 04:22:25 2017 (r311472) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701060422.v064MPt8069961>