[PATCH] waf: Fix the FreeBSD build with libinotify

[Volker Lendecke]

Hi!

Please review&push!

Thanks,

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From 11e78d48a89fe10ff5c5e7f16e8099c763bed7e1 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Tue, 17 Dec 2013 15:32:01 +0100
Subject: [PATCH] waf: Fix the FreeBSD build with libinotify

Signed-off-by: Volker Lendecke <vl at samba.org>
Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
---
 lib/replace/wscript                | 6 +++++-
 source3/wscript_build              | 1 +
 source4/ntvfs/sysdep/wscript_build | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/replace/wscript b/lib/replace/wscript
index b6fb10b..a316032 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 d3eed3c..6bc7b47 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 d8d5b55..bfb4e55 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')
                  )
 
-- 
1.8.4.3