summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-19 20:26:25 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:55 +1000
commit344621cb0ff37167cb616bd6df0471318951f584 (patch)
tree49e0ca293e46ecb0a0f846e720010bfb259f2c4f /source4/ntvfs
parent5aacacea678b104b9ead9e4ea642c583791282b7 (diff)
downloadsamba-344621cb0ff37167cb616bd6df0471318951f584.tar.gz
samba-344621cb0ff37167cb616bd6df0471318951f584.tar.bz2
samba-344621cb0ff37167cb616bd6df0471318951f584.zip
build: conditionally enable inotify
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/sysdep/wscript_build13
-rw-r--r--source4/ntvfs/sysdep/wscript_configure5
2 files changed, 10 insertions, 8 deletions
diff --git a/source4/ntvfs/sysdep/wscript_build b/source4/ntvfs/sysdep/wscript_build
index c0f5d3eb0c..8330d47d9b 100644
--- a/source4/ntvfs/sysdep/wscript_build
+++ b/source4/ntvfs/sysdep/wscript_build
@@ -1,12 +1,9 @@
-# AUTOGENERATED by mktowscript.pl from ../../source4/ntvfs/sysdep/config.mk
-# Please remove this notice if hand editing
-
-
bld.SAMBA_MODULE('sys_notify_inotify',
- source='inotify.c',
- subsystem='sys_notify',
- init_function='sys_notify_inotify_init',
- deps='LIBEVENTS'
+ source='inotify.c',
+ subsystem='sys_notify',
+ init_function='sys_notify_inotify_init',
+ deps='LIBEVENTS',
+ enabled = bld.CONFIG_SET('HAVE_LINUX_INOTIFY')
)
diff --git a/source4/ntvfs/sysdep/wscript_configure b/source4/ntvfs/sysdep/wscript_configure
index 6cfa4abe91..f1d572e527 100644
--- a/source4/ntvfs/sysdep/wscript_configure
+++ b/source4/ntvfs/sysdep/wscript_configure
@@ -7,3 +7,8 @@ conf.CHECK_DECLS('F_SETLEASE', headers='linux/fcntl.h', reverse=True)
conf.CHECK_DECLS('SA_SIGINFO', headers='signal.h', reverse=True)
conf.CHECK_DECLS('__NR_inotify_init', reverse=True, headers='asm/unistd.h')
+
+if (conf.CONFIG_SET('HAVE___NR_INOTIFY_INIT') and
+ (conf.CONFIG_SET('HAVE_LINUX_INOTIFY_H') or
+ conf.CONFIG_SET('HAVE_SYS_INOTIFY_H'))):
+ conf.DEFINE('HAVE_LINUX_INOTIFY', 1)