From d439b3a109fe400a2b257f2593a495d9564df12d Mon Sep 17 00:00:00 2001
From: Timothy Stack <stack@flux.utah.edu>
Date: Mon, 25 Oct 2004 19:26:16 +0000
Subject: [PATCH] Integrate the auto nice daemon into the build.

---
 configure              | 3 ++-
 configure.in           | 3 ++-
 sensors/GNUmakefile.in | 9 ++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 8242e55e06..97df56bf57 100755
--- a/configure
+++ b/configure
@@ -1478,7 +1478,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	security/GNUmakefile security/lastlog_daemon \
         sensors/GNUmakefile sensors/slothd/GNUmakefile \
 	sensors/slothd/sdisrunning sensors/slothd/sddeploy \
-        sensors/canaryd/GNUmakefile \
+        sensors/canaryd/GNUmakefile sensors/and/GNUmakefile \
+	sensors/and/and-emulab.conf \
 	account/GNUmakefile account/tbacct account/webtbacct \
 	account/addpubkey account/webaddpubkey \
 	account/addsfskey account/webaddsfskey \
diff --git a/configure.in b/configure.in
index 6b0a0fcace..a80522d041 100755
--- a/configure.in
+++ b/configure.in
@@ -517,7 +517,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
 	security/GNUmakefile security/lastlog_daemon \
         sensors/GNUmakefile sensors/slothd/GNUmakefile \
 	sensors/slothd/sdisrunning sensors/slothd/sddeploy \
-        sensors/canaryd/GNUmakefile \
+        sensors/canaryd/GNUmakefile sensors/and/GNUmakefile \
+	sensors/and/and-emulab.conf \
 	account/GNUmakefile account/tbacct account/webtbacct \
 	account/addpubkey account/webaddpubkey \
 	account/addsfskey account/webaddsfskey \
diff --git a/sensors/GNUmakefile.in b/sensors/GNUmakefile.in
index ed68c57e14..4eb0be9162 100644
--- a/sensors/GNUmakefile.in
+++ b/sensors/GNUmakefile.in
@@ -8,7 +8,7 @@ SUBDIR		= sensors
 
 include $(OBJDIR)/Makeconf
 
-SUBDIRS	= slothd
+SUBDIRS	= slothd and
 
 SYSTEM            := $(shell uname -s)
 
@@ -58,6 +58,13 @@ $(TARGETS):
 .PHONY: $(SUBDIRS)
 $(SUBDIRS): %: %.all
 
+#
+# Rules to regen configure written files.
+#
+%: %.in
+	@echo "Regenerating $@"
+	cd $(OBJDIR) && CONFIG_FILES=$(SUBDIR)/$@ ./config.status
+
 ###############################################################################
 
 ## Any extra actions can be defined here, e.g.:
-- 
GitLab