summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Baumbach <bb@sernet.de>2011-11-07 12:42:28 +0100
committerKarolin Seeger <kseeger@samba.org>2011-11-09 19:50:51 +0100
commit5efb2cecf80bf7911755e583de59f4a015b864e8 (patch)
tree6dd9a9711ca12f4deabff611569481174da7175c
parent2971e74fd522998d30b2923a2a308d8e28c04aa9 (diff)
downloadsamba-5efb2cecf80bf7911755e583de59f4a015b864e8.tar.gz
samba-5efb2cecf80bf7911755e583de59f4a015b864e8.tar.xz
samba-5efb2cecf80bf7911755e583de59f4a015b864e8.zip
s3-build: Fix inotify detection (bug 8580)
Enable inotify if sys or kernel inotify is available. Signed-off-by: Stefan Metzmacher <metze@samba.org> (cherry picked from commit 846809853acd53a733fa6057436c6e51843d8fab)
-rw-r--r--source3/configure.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 11682b7a663..398a4f8a12e 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
#################################################