summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2011-11-07 14:24:40 +0100
committerStefan Metzmacher <metze@samba.org>2011-11-07 16:28:37 +0100
commitb9e6c48678624ba5335d00906c558ea9e0086699 (patch)
tree013918797cecc99cd1a9702d372940e20d27e30f
parent846809853acd53a733fa6057436c6e51843d8fab (diff)
downloadsamba-b9e6c48678624ba5335d00906c558ea9e0086699.tar.gz
samba-b9e6c48678624ba5335d00906c558ea9e0086699.tar.bz2
samba-b9e6c48678624ba5335d00906c558ea9e0086699.zip
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
-rw-r--r--source3/wscript5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/wscript b/source3/wscript
index 26152f5169..c329cbf00b 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -117,8 +117,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('''