[src/trunk]: src/usr.bin/make We do not need filemon(9) to have a .meta file

[sjg <sjg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf5c0e0786c2
branches:  trunk
changeset: 757687:cf5c0e0786c2
user:      sjg <sjg%NetBSD.org@localhost>
date:      Mon Sep 13 20:34:21 2010 +0000

description:
We do not need filemon(9) to have a .meta file

diffstat:

 usr.bin/make/meta.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 4ae8c4f0aac3 -r cf5c0e0786c2 usr.bin/make/meta.c
--- a/usr.bin/make/meta.c       Mon Sep 13 16:32:00 2010 +0000
+++ b/usr.bin/make/meta.c       Mon Sep 13 20:34:21 2010 +0000
@@ -37,7 +37,9 @@
 #include <fcntl.h>
 #include <libgen.h>
 #include <errno.h>
+#if !defined(HAVE_CONFIG_H) || defined(HAVE_ERR_H)
 #include <err.h>
+#endif
 
 #include "make.h"
 #include "job.h"
@@ -70,6 +72,10 @@
 # define ROUNDUP(n, u)   (N2U((n), (u)) * (u))
 #endif
 
+#if !defined(HAVE_STRSEP)
+# define strsep(s, d) stresep((s), (d), 0)
+#endif
+
 /*
  * Filemon is a kernel module which snoops certain syscalls.
  *
@@ -567,11 +573,9 @@
     }
     getcwd(cwd, sizeof(cwd));
     Var_Set(".ERROR_CWD", cwd, VAR_GLOBAL, 0);
-#ifdef USE_FILEMON
     if (pbm) {
        Var_Set(".ERROR_META_FILE", pbm->meta_fname, VAR_GLOBAL, 0);
     }
-#endif
 }
 
 void