[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  168db8b waf: Fix the FreeBSD build with libinotify
      from  056008d s4:selftest: run wbinfo tests at the end...

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 168db8b9d29ebf7e59377204ea0886b7ff281f27
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 17 15:32:01 2013 +0100

    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>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Mon Jan  6 19:50:22 CET 2014 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 lib/replace/wscript                |    6 +++++-
 source3/wscript_build              |    1 +
 source4/ntvfs/sysdep/wscript_build |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

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')
                  )
 


-- 
Samba Shared Repository