From b9e6c48678624ba5335d00906c558ea9e0086699 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Baumbach?= Date: Mon, 7 Nov 2011 14:24:40 +0100 Subject: [PATCH] s3-wafbuild: Fix inotify detection (bug 8580) Enable inotify if sys or kernel inotify is available. Signed-off-by: Stefan Metzmacher Autobuild-User: Stefan Metzmacher Autobuild-Date: Mon Nov 7 16:28:38 CET 2011 on sn-devel-104 --- source3/wscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source3/wscript b/source3/wscript index 26152f51690..c329cbf00bd 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(''' -- 2.34.1