From 9917c138d9a270deb5820915384fbde751190c2a Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Fri, 30 Aug 2013 23:13:26 +0200 Subject: AUTOTOOLS: More robust detection of inotify. We checked only header file "sys/inotify" for detection whether inotify works. Some platforms do not have built in inotify, but contain library, which provides inotify-compatible interface. This patch adds more robust detection of inotify in configuration time and appends linker flags to Makefile if inotify is provided by library. --- src/monitor/monitor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/monitor') diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index 495f31e34..d8bbfbcbe 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -1642,7 +1642,7 @@ errno_t monitor_config_file_fallback(TALLOC_CTX *mem_ctx, monitor_reconf_fn fn, bool ignore_missing); -#ifdef HAVE_SYS_INOTIFY_H +#ifdef HAVE_INOTIFY static void process_config_file(struct tevent_context *ev, struct tevent_timer *te, struct timeval t, void *ptr); @@ -1867,7 +1867,7 @@ static void rewatch_config_file(struct tevent_context *ev, talloc_free(rw_ctx); file_ctx->needs_update = 0; } -#endif +#endif /* HAVE_INOTIFY */ static void poll_config_file(struct tevent_context *ev, struct tevent_timer *te, @@ -1917,7 +1917,7 @@ static void poll_config_file(struct tevent_context *ev, static int try_inotify(struct config_file_ctx *file_ctx, const char *filename, monitor_reconf_fn fn) { -#ifdef HAVE_SYS_INOTIFY_H +#ifdef HAVE_INOTIFY int err, fd_args, ret; struct tevent_fd *tfd; struct config_file_callback *cb; @@ -1986,7 +1986,7 @@ static int try_inotify(struct config_file_ctx *file_ctx, const char *filename, return EOK; #else return EINVAL; -#endif +#endif /* HAVE_INOTIFY */ } static int monitor_config_file(TALLOC_CTX *mem_ctx, -- cgit