WIP inotify configure test

diff --git a/backends/innduct.c b/backends/innduct.c
index 5997b579f603ea8fae325bbc91d1e630a46e189b..0240e4ee81dc3920d965a924bfabb559645bfcb4 100644 (file)
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -1991,10 +1991,10 @@ static ssize_t tailing_try_read(struct oop_readable *rable, void *buffer,
 
 /*---------- filemon implemented with inotify ----------*/
 
 
 /*---------- filemon implemented with inotify ----------*/
 

-#if defined(HAVE_INOTIFY) && !defined(HAVE_FILEMON)
+#if defined(HAVE_SYS_INOTIFY_H) && !defined(HAVE_FILEMON)

 #define HAVE_FILEMON
 
 #define HAVE_FILEMON
 

-#include <linux/inotify.h>
+#include <sys/inotify.h>

 
 static int filemon_inotify_fd;
 static int filemon_inotify_wdmax;
 
 static int filemon_inotify_fd;
 static int filemon_inotify_wdmax;


@@ -2057,7 +2057,7 @@ static void *filemon_inotify_readable(oop_source *lp, int fd,
 static int filemon_method_init(void) {
   filemon_inotify_fd= inotify_init();
   if (filemon_inotify_fd<0) {
 static int filemon_method_init(void) {
   filemon_inotify_fd= inotify_init();
   if (filemon_inotify_fd<0) {

-    syswarn("could not initialise inotify: inotify_init failed");
+    syswarn("filemon/inotify: inotify_init failed");

     return 0;
   }
   set nonblock;
     return 0;
   }
   set nonblock;


@@ -2075,7 +2075,10 @@ static int filemon_method_init(void) {
 
 struct Filemon_Perfile { int dummy; };
 
 
 struct Filemon_Perfile { int dummy; };
 

-static int filemon_method_init(void) { return 0; }
+static int filemon_method_init(void) {
+  warn("filemon/dummy: no filemon method compiled in");
+  return 0;
+}

 static void filemon_method_startfile(InputFile *ipf, Filemon_Perfile *pf) { }
 static void filemon_method_stopfile(InputFile *ipf, Filemon_Perfile *pf) { }
 
 static void filemon_method_startfile(InputFile *ipf, Filemon_Perfile *pf) { }
 static void filemon_method_stopfile(InputFile *ipf, Filemon_Perfile *pf) { }
 


@@ -3262,7 +3265,7 @@ int main(int argc, char **argv) {
   control_init();
 
   if (!filemon_method_init()) {
   control_init();
 
   if (!filemon_method_init()) {

-    warn("no file monitoring available, polling");
+    warn("filemon: no file monitoring available, polling");

     every(5,0,filepoll);
   }
 
     every(5,0,filepoll);
   }
 

diff --git a/configure.in b/configure.in
index 530191319ed56ffd0659e3c8b8794dfb26976d94..05dee656d843d148ce937a9f842d9d472d5c1a24 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -996,7 +996,7 @@ dnl Generic checks for header files.
 AC_CHECK_HEADERS(crypt.h inttypes.h limits.h ndbm.h pam/pam_appl.h stdbool.h \
                  stddef.h stdint.h string.h sys/bitypes.h sys/filio.h \
                  sys/loadavg.h sys/param.h sys/select.h sys/sysinfo.h \
 AC_CHECK_HEADERS(crypt.h inttypes.h limits.h ndbm.h pam/pam_appl.h stdbool.h \
                  stddef.h stdint.h string.h sys/bitypes.h sys/filio.h \
                  sys/loadavg.h sys/param.h sys/select.h sys/sysinfo.h \

-                 sys/time.h unistd.h)
+                 sys/time.h unistd.h sys/inotify.h)

 
 dnl Some Linux systems have db1/ndbm.h instead of ndbm.h.  Others have
 dnl gdbm-ndbm.h.
 
 dnl Some Linux systems have db1/ndbm.h instead of ndbm.h.  Others have
 dnl gdbm-ndbm.h.