diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/ntvfs/sysdep/config.m4 | 6 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/inotify.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/source4/ntvfs/sysdep/config.m4 b/source4/ntvfs/sysdep/config.m4 index 6de75a4294..f54f65d08d 100644 --- a/source4/ntvfs/sysdep/config.m4 +++ b/source4/ntvfs/sysdep/config.m4 @@ -1,9 +1,13 @@ -AC_CHECK_HEADERS(linux/inotify.h asm/unistd.h) +AC_CHECK_HEADERS(linux/inotify.h asm/unistd.h sys/inotify.h) AC_CHECK_FUNC(inotify_init) AC_HAVE_DECL(__NR_inotify_init, [#include <asm/unistd.h>]) SMB_ENABLE(sys_notify_inotify, NO) +if test x"$ac_cv_func_inotify_init" = x"yes" -a x"$ac_cv_header_sys_inotify_h" = x"yes"; then + SMB_ENABLE(sys_notify_inotify, YES) +fi + if test x"$ac_cv_func_inotify_init" = x"yes" -a x"$ac_cv_header_linux_inotify_h" = x"yes"; then SMB_ENABLE(sys_notify_inotify, YES) fi diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c index e4e7c44686..68653d60bd 100644 --- a/source4/ntvfs/sysdep/inotify.c +++ b/source4/ntvfs/sysdep/inotify.c @@ -29,6 +29,10 @@ #include "libcli/raw/smb.h" #include "param/param.h" +#if HAVE_SYS_INOTIFY_H +#include <sys/inotify.h> +#else +/* for older glibc varients - we can remove this eventually */ #include <linux/inotify.h> #include <asm/unistd.h> @@ -51,6 +55,7 @@ static int inotify_rm_watch(int fd, int wd) return syscall(__NR_inotify_rm_watch, fd, wd); } #endif +#endif /* older glibc headers don't have these defines either */ |