diff options
| author | Volker Lendecke <vl@samba.org> | 2013-12-17 15:32:01 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-01-06 19:50:22 +0100 |
| commit | 168db8b9d29ebf7e59377204ea0886b7ff281f27 (patch) | |
| tree | 9a88e4bd7694fee229e018b93c79051c1b6c2b87 | |
| parent | 056008df62cb66090b3e30cb09c0edacfbdb5720 (diff) | |
| download | samba-168db8b9d29ebf7e59377204ea0886b7ff281f27.tar.gz samba-168db8b9d29ebf7e59377204ea0886b7ff281f27.tar.xz samba-168db8b9d29ebf7e59377204ea0886b7ff281f27.zip | |
waf: Fix the FreeBSD build with libinotify
Signed-off-by: Volker Lendecke <vl@samba.org>
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Mon Jan 6 19:50:22 CET 2014 on sn-devel-104
| -rw-r--r-- | lib/replace/wscript | 6 | ||||
| -rwxr-xr-x | source3/wscript_build | 1 | ||||
| -rw-r--r-- | source4/ntvfs/sysdep/wscript_build | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript index b6fb10b9b0..a316032efe 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -91,7 +91,11 @@ struct foo bar = { .y = 'X', .x = 1 }; conf.CHECK_HEADERS('windows.h winsock2.h ws2tcpip.h') conf.CHECK_HEADERS('errno.h') conf.CHECK_HEADERS('gcrypt.h getopt.h iconv.h') - conf.CHECK_HEADERS('sys/inotify.h memory.h nss.h sasl/sasl.h') + conf.CHECK_HEADERS('memory.h nss.h sasl/sasl.h') + + conf.CHECK_FUNCS_IN('inotify_init', 'inotify', checklibc=True, + headers='sys/inotify.h') + conf.CHECK_HEADERS('security/pam_appl.h zlib.h asm/unistd.h') conf.CHECK_HEADERS('aio.h sys/unistd.h rpc/rpc.h rpc/nettype.h alloca.h float.h') diff --git a/source3/wscript_build b/source3/wscript_build index d3eed3c164..6bc7b476e6 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -578,6 +578,7 @@ bld.SAMBA3_LIBRARY('smbd_base', vfs vfs_default vfs_posixacl + inotify popt_samba3 samba3core smbd_conn diff --git a/source4/ntvfs/sysdep/wscript_build b/source4/ntvfs/sysdep/wscript_build index d8d5b55017..bfb4e55e30 100644 --- a/source4/ntvfs/sysdep/wscript_build +++ b/source4/ntvfs/sysdep/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_MODULE('sys_notify_inotify', source='inotify.c', subsystem='sys_notify', init_function='sys_notify_inotify_init', - deps='events', + deps='events inotify', enabled = bld.CONFIG_SET('HAVE_LINUX_INOTIFY') ) |