summaryrefslogtreecommitdiff
path: root/source3/wscript
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2012-04-09 21:16:12 +0300
committerJeremy Allison <jra@samba.org>2012-04-13 21:15:00 +0200
commit55cbf7ba340d91c473f57fe8e5deb8d082131b0a (patch)
tree7a2908a55bea62b7e78192ba212b759b3a7d6c57 /source3/wscript
parent1a8405c320f115d584a9094bf5878b8cf6d58893 (diff)
downloadsamba-55cbf7ba340d91c473f57fe8e5deb8d082131b0a.tar.gz
samba-55cbf7ba340d91c473f57fe8e5deb8d082131b0a.tar.bz2
samba-55cbf7ba340d91c473f57fe8e5deb8d082131b0a.zip
rely on sys/inotify.h for inotify
sys/inotify.h was added to glibc 2.4 in 2006. Signed-off-by: Jeremy Allison <jra@samba.org> Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Fri Apr 13 21:15:00 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/wscript')
-rwxr-xr-xsource3/wscript12
1 files changed, 4 insertions, 8 deletions
diff --git a/source3/wscript b/source3/wscript
index e0a4ea742d..ef415d08fd 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -115,11 +115,9 @@ long ret = splice(0,0,1,0,400,0);
conf.CHECK_DECLS('splice', reverse=True, headers='fcntl.h')
# Check for inotify support
- conf.CHECK_HEADERS('linux/inotify.h asm/unistd.h sys/inotify.h')
- conf.CHECK_FUNCS('inotify_init')
- 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)
+ conf.CHECK_HEADERS('sys/inotify.h')
+ if "HAVE_SYS_INOTIFY_H" in conf.env:
+ conf.DEFINE('HAVE_INOTIFY', 1)
# Check for kernel change notify support
conf.CHECK_CODE('''
@@ -255,7 +253,7 @@ getcwd _getcwd __getcwd getdents __getdents getdirentries
getgrent getgrnam getgrouplist getgrset getmntent getpagesize
getproplist get_proplist_entry getpwanam getpwent_r getrlimit gettext
glob grantpt hstrerror initgroups innetgr
-inotify_init listea listxattr
+listea listxattr
llseek _llseek __llseek _lseek __lseek
_lstat __lstat lutimes
__lxstat memalign mknod mlock mlockall munlock munlockall
@@ -1044,8 +1042,6 @@ ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED);
'SYSCONF%s' % v,
msg='Checking whether sysconf(%s) is available' % v)
- conf.CHECK_DECLS('__NR_inotify_init', reverse=True, headers='asm/unistd.h')
-
conf.CHECK_CODE('''
#include <sys/syscall.h>
#include <unistd.h>