vfs_snapper: check for <linux/ioctl.h>

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Sun Nov  9 16:02:24 CET 2014 on sn-devel-104

diff --git a/source3/modules/vfs_snapper.c b/source3/modules/vfs_snapper.c
index f0f0b5c5578263babafa529067afb53c6e6d95bd..12a3b9a16eb2fed00e49efc40ab18472df8881a1 100644 (file)
--- a/source3/modules/vfs_snapper.c
+++ b/source3/modules/vfs_snapper.c
@@ -25,7 +25,9 @@
  */
 
 #include <dbus/dbus.h>
+#ifdef HAVE_LINUX_IOCTL_H
 #include <linux/ioctl.h>
+#endif
 #include <sys/ioctl.h>
 #include <dirent.h>
 #include <libgen.h>

diff --git a/source3/wscript b/source3/wscript
index ba1125e38c4dcd3af2c53045c28311045e20d996..f61c049e6d85141ed43b31ed61eb4c2188943dbe 100644 (file)
--- a/source3/wscript
+++ b/source3/wscript
@@ -77,7 +77,7 @@ def configure(conf):
         conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
 
     conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
-    conf.CHECK_HEADERS('linux/falloc.h')
+    conf.CHECK_HEADERS('linux/falloc.h linux/ioctl.h')
 
     conf.CHECK_FUNCS('getcwd fchown chmod fchmod mknod')
     conf.CHECK_FUNCS('strtol strchr strupr chflags')