The branch, v3-6-test has been updated via 8929b72 s3-wafbuild: Fix inotify detection (bug 8580) via 5efb2ce s3-build: Fix inotify detection (bug 8580) from 2971e74 s3:smb2_server: FLAG_CHAINED means we always use the last session_id and tid
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 8929b72433aea584f76519b0eabdab8b6423f5cf Author: Björn Baumbach <b...@sernet.de> Date: Mon Nov 7 14:24:40 2011 +0100 s3-wafbuild: Fix inotify detection (bug 8580) Enable inotify if sys or kernel inotify is available. Signed-off-by: Stefan Metzmacher <me...@samba.org> Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Mon Nov 7 16:28:38 CET 2011 on sn-devel-104 (cherry picked from commit b9e6c48678624ba5335d00906c558ea9e0086699) commit 5efb2cecf80bf7911755e583de59f4a015b864e8 Author: Björn Baumbach <b...@sernet.de> Date: Mon Nov 7 12:42:28 2011 +0100 s3-build: Fix inotify detection (bug 8580) Enable inotify if sys or kernel inotify is available. Signed-off-by: Stefan Metzmacher <me...@samba.org> (cherry picked from commit 846809853acd53a733fa6057436c6e51843d8fab) ----------------------------------------------------------------------- Summary of changes: source3/configure.in | 6 ++++-- source3/wscript | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: 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 ################################################# 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(''' -- Samba Shared Repository