s3-wafbuild: Fix inotify detection (bug 8580)

Enable inotify if sys or kernel inotify is available.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Nov  7 16:28:38 CET 2011 on sn-devel-104
(cherry picked from commit b9e6c48678624ba5335d00906c558ea9e0086699)
(cherry picked from commit 8929b72433aea584f76519b0eabdab8b6423f5cf)

diff --git a/source3/wscript b/source3/wscript
index f8b0f7b8d541e1a707bbf5d3aa5cf513406e9971..0d32561d9a06b8fd3e3a73902422e5feac12a147 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -159,8 +159,9 @@ long ret = splice(0,0,1,0,400,0);
     # Check for inotify support
     conf.CHECK_HEADERS('linux/inotify.h asm/unistd.h sys/inotify.h')
     conf.CHECK_FUNCS('inotify_init')
-    if "HAVE_LINUX_INOTIFY_H" in conf.env and "HAVE_INOTIFY_INIT" in conf.env:
-        conf.DEFINE('HAVE_INOTIFY', 1)
+    if "HAVE_INOTIFY_INIT" in conf.env:
+        if "HAVE_LINUX_INOTIFY_H" in conf.env or "HAVE_SYS_INOTIFY_H" in conf.env:
+            conf.DEFINE('HAVE_INOTIFY', 1)
 
     # Check for kernel change notify support
     conf.CHECK_CODE('''