s3-build: Fix inotify detection (bug 8580)

Enable inotify if sys or kernel inotify is available.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 846809853acd53a733fa6057436c6e51843d8fab)

diff --git a/source3/configure.in b/source3/configure.in
index 11682b7a663c0caf8ac855e4e05e966c67ba56ad..398a4f8a12ea32fc96169f0b86113bcbe2c7d619 100644 (file)
--- 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
 
 #################################################