smbd: Compile notify_inotify only if available
authorVolker Lendecke <vl@samba.org>
Tue, 18 Nov 2014 11:28:20 +0000 (11:28 +0000)
committerJeremy Allison <jra@samba.org>
Tue, 9 Dec 2014 03:12:09 +0000 (04:12 +0100)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/smbd/notify_inotify.c
source3/wscript_build

index fedf9b522ffd357eed4b1e8ff37d4e232e18a6bd..944f27a1553e60fcb145ae06b86c99c562842453 100644 (file)
@@ -26,8 +26,6 @@
 #include "smbd/smbd.h"
 #include "lib/sys_rw_data.h"
 
-#ifdef HAVE_INOTIFY
-
 #include <sys/inotify.h>
 
 /* glibc < 2.5 headers don't have these defines */
@@ -426,5 +424,3 @@ int inotify_watch(TALLOC_CTX *mem_ctx,
 
        return 0;
 }
-
-#endif
index 51d72e78b640981ebc60a5a450ae57c089bef6f4..5128b96bfd5345a90b37ab8fffe9f2bae2a9a0ce 100755 (executable)
@@ -506,6 +506,11 @@ bld.SAMBA3_SUBSYSTEM('sysquotas',
                      allow_warnings=True,
                      deps='samba3-util samba-util')
 
+NOTIFY_SOURCES=''
+
+if bld.CONFIG_SET("HAVE_INOTIFY"):
+    NOTIFY_SOURCES += ' smbd/notify_inotify.c'
+
 bld.SAMBA3_LIBRARY('smbd_base',
                    source='''
                    smbd/server_reload.c
@@ -595,9 +600,8 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    smbd/oplock_irix.c
                    smbd/oplock_linux.c
                    smbd/notify.c
-                   smbd/notify_inotify.c
                    smbd/notify_internal.c
-                   smbd/build_options.c''',
+                   smbd/build_options.c''' + NOTIFY_SOURCES,
                    deps='''
                    talloc
                    tevent