Module Name: src
Committed By: roy
Date: Wed Apr 24 10:28:17 UTC 2019
Modified Files:
src/external/bsd/am-utils: Makefile.inc
src/external/bsd/am-utils/include: config.h
Log Message:
Fix building am-utils with MKYP=no
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/am-utils/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/am-utils/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/am-utils/Makefile.inc
diff -u src/external/bsd/am-utils/Makefile.inc:1.7 src/external/bsd/am-utils/Makefile.inc:1.8
--- src/external/bsd/am-utils/Makefile.inc:1.7 Mon Feb 2 16:18:27 2015
+++ src/external/bsd/am-utils/Makefile.inc Wed Apr 24 10:28:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2015/02/02 16:18:27 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2019/04/24 10:28:17 roy Exp $
.ifndef AMU_MAKEFILE_INC
AMU_MAKEFILE_INC=
@@ -30,7 +30,7 @@ CPPFLAGS+=-DLDAP_DEPRECATED=1 # OpenLDAP
.endif
.if (${USE_YP} != "no")
-CPPFLAGS+=-DHAVE_MAP_NIS=1
+CPPFLAGS+=-DHAVE_MAP_NIS=1 -DYP
.endif
.if !defined(LIB) || empty(LIB)
Index: src/external/bsd/am-utils/include/config.h
diff -u src/external/bsd/am-utils/include/config.h:1.7 src/external/bsd/am-utils/include/config.h:1.8
--- src/external/bsd/am-utils/include/config.h:1.7 Sat Jan 23 01:57:56 2016
+++ src/external/bsd/am-utils/include/config.h Wed Apr 24 10:28:17 2019
@@ -869,11 +869,13 @@
/* Define to 1 if you have the <rpcsvc/nis.h> header file. */
/* #undef HAVE_RPCSVC_NIS_H */
+#ifdef YP
/* Define to 1 if you have the <rpcsvc/ypclnt.h> header file. */
#define HAVE_RPCSVC_YPCLNT_H 1
/* Define to 1 if you have the <rpcsvc/yp_prot.h> header file. */
#define HAVE_RPCSVC_YP_PROT_H 1
+#endif
/* Define to 1 if you have the <rpc/auth_des.h> header file. */
/* #undef HAVE_RPC_AUTH_DES_H */
