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

diff --git a/lib/replace/wscript b/lib/replace/wscript
index b6fb10b9b08001cbead8153c03a86697e7f94751..a316032efeac47801dc6a453bac1d62708fbe03e 100644 (file)
--- 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 d3eed3c164714961b87d694e1e0a940b3d87cc02..6bc7b476e67b9e9dc9aa9e1ec15a06b2d4b06ad7 100755 (executable)
--- 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 d8d5b55017b577d5c5f67659e3507c02d702eff1..bfb4e55e30c4cdd691581eef5b26c76e7897e515 100644 (file)
--- 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')
                  )