Respect the YES_HESIOD build variable

3 files changed, 32 insertions, 1 deletions

diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index 612f9f7..d4d21f7 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -21,6 +21,10 @@ CFLAGS+= -DHAVE_CONFIG_H
 CFLAGS+= -DHAVE_LOCALCONFIG_H
 .endif
 
+.if defined(YES_HESIOD)
+CFLAGS+= -DYES_HESIOD
+.endif
+
 CFLAGS+= -DHOST_CPU=\"${MACHINE_ARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\"
 
 .if exists(${.OBJDIR}/../libamu)
diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
index 5922688..3509d66 100644
--- a/usr.sbin/amd/amd/Makefile
+++ b/usr.sbin/amd/amd/Makefile
@@ -15,7 +15,7 @@ SRCS+=	am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c
 SRCS+=	amfs_host.c amfs_inherit.c amfs_link.c amfs_linkx.c amfs_nfsl.c
 SRCS+=	amfs_nfsx.c amfs_program.c amfs_root.c amfs_toplvl.c
 SRCS+=	amfs_union.c amq_subr.c amq_svc.c autil.c clock.c conf.c
-SRCS+=	get_args.c info_file.c info_hesiod.c info_ndbm.c info_passwd.c
+SRCS+=	get_args.c info_file.c info_ndbm.c info_passwd.c
 SRCS+=	info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c 
 SRCS+=	nfs_subr.c ops_cdfs.c ops_mfs.c ops_nfs.c ops_nfs3.c 
 SRCS+=	ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c ops_umapfs.c 
@@ -39,6 +39,10 @@ CLEANFILES+=	mount_xdr.c
 mount_xdr.c: ${MOUNT_X}
 	${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET}
 
+.if defined(YES_HESIOD)
+SRCS+=	info_hesiod.c
+.endif
+
 .if !defined(NO_NIS)
 SRCS+=	info_nis.c
 .endif
diff --git a/usr.sbin/amd/include/config.h b/usr.sbin/amd/include/config.h
index 0ee7356..fce7f07 100644
--- a/usr.sbin/amd/include/config.h
+++ b/usr.sbin/amd/include/config.h
@@ -388,6 +388,7 @@
 /* Define to 1 if you have the `hasmntopt' function. */
 /* #undef HAVE_HASMNTOPT */
 
+#ifdef YES_HESIOD
 /* Define to 1 if you have the <hesiod.h> header file. */
 #define HAVE_HESIOD_H 1
 
@@ -403,6 +404,24 @@
 /* Define to 1 if you have the `hes_init' function. */
 #define HAVE_HES_INIT 1
 
+#else /* YES_HESIOD */
+/* Define to 1 if you have the <hesiod.h> header file. */
+#undef HAVE_HESIOD_H 
+
+/* Define to 1 if you have the `hesiod_init' function. */
+#undef HAVE_HESIOD_INIT 
+
+/* Define to 1 if you have the `hesiod_reload' function. */
+/* #undef HAVE_HESIOD_RELOAD */
+
+/* Define to 1 if you have the `hesiod_to_bind' function. */
+#undef HAVE_HESIOD_TO_BIND 
+
+/* Define to 1 if you have the `hes_init' function. */
+#undef HAVE_HES_INIT 
+
+#endif
+
 /* Define to 1 if you have the <hsfs/hsfs.h> header file. */
 /* #undef HAVE_HSFS_HSFS_H */
 
@@ -496,8 +515,12 @@
 /* Define if have file maps (everyone should have it!) */
 #define HAVE_MAP_FILE 1
 
+#ifdef YES_HESIOD
 /* Define if have HESIOD maps */
 #define HAVE_MAP_HESIOD 1
+#else
+#undef HAVE_MAP_HESIOD
+#endif
 
 /* Define if have LDAP maps */
 /* #undef HAVE_MAP_LDAP */