From df819dd8291f57fabe21c0bf3b31573075686544 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Baumbach?= Date: Mon, 7 Nov 2011 12:42:28 +0100 Subject: [PATCH] s3-build: Fix inotify detection (bug 8580) Enable inotify if sys or kernel inotify is available. Signed-off-by: Stefan Metzmacher (cherry picked from commit 846809853acd53a733fa6057436c6e51843d8fab) (cherry picked from commit 5efb2cecf80bf7911755e583de59f4a015b864e8) --- source3/configure.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source3/configure.in b/source3/configure.in index 11682b7a663..398a4f8a12e 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -2828,8 +2828,10 @@ samba_cv_HAVE_INOTIFY=yes, samba_cv_HAVE_INOTIFY=no, samba_cv_HAVE_INOTIFY=cross) -if test x"$ac_cv_func_inotify_init" = x"yes" -a x"$ac_cv_header_linux_inotify_h" = x"yes"; then - AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has inotify support]) +if test x"$ac_cv_func_inotify_init" = x"yes"; then + if test x"$ac_cv_header_sys_inotify_h" = x"yes" -o x"$ac_cv_header_linux_inotify_h" = x"yes"; then + AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel or sys has inotify support]) + fi fi ################################################# -- 2.11.4.GIT