From a6dace7ab9fea497ed3fc6865c42434dca2acb7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= Date: Mon, 7 Nov 2011 12:42:28 +0100 Subject: [PATCH 1/2] 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) --- source3/configure.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source3/configure.in b/source3/configure.in index 11682b7..398a4f8 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 ################################################# -- 1.7.4.1 From 41a40b493f30220b659f14616952ae15b03ce5e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= Date: Mon, 7 Nov 2011 14:24:40 +0100 Subject: [PATCH 2/2] 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 (cherry picked from commit b9e6c48678624ba5335d00906c558ea9e0086699) --- source3/wscript | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source3/wscript b/source3/wscript index f8b0f7b..0d32561 100644 --- 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(''' -- 1.7.4.1