[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  6de10ac build: check linux/fs.h for compression flags
      from  3cc0651 s3:smb2_server: avoid calling set_current_user_info() for each request

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


- Log -----------------------------------------------------------------
commit 6de10acec38eb0e5ac3f989101935ec53fac2fc0
Author: David Disseldorp <ddiss at samba.org>
Date:   Wed Nov 27 14:04:34 2013 +0100

    build: check linux/fs.h for compression flags
    
    Needed for old distributions (e.g. SLES8), which provide a linux/fs.h
    without the FS_IOC_GETFLAGS/FS_COMPR_FL defines needed for the btrfs VFS
    module.
    
    Reported-by: Andrew Bartlett <abartlet at samba.org>
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Wed Nov 27 18:44:14 CET 2013 on sn-devel-104

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

Summary of changes:
 source3/wscript |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 2edf5e8..b09c2db 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1727,7 +1727,8 @@ main() {
     if conf.CHECK_HEADERS('gpfs_gpl.h'):
         conf.DEFINE('HAVE_GPFS', '1')
 
-    if conf.CHECK_HEADERS('linux/ioctl.h sys/ioctl.h linux/fs.h'):
+    if (conf.CHECK_HEADERS('linux/ioctl.h sys/ioctl.h linux/fs.h') and
+	conf.CHECK_DECLS('FS_IOC_GETFLAGS FS_COMPR_FL', headers='linux/fs.h')):
 	    conf.DEFINE('HAVE_LINUX_IOCTL', '1')
 
     conf.env['CCFLAGS_CEPHFS'] = "-D_FILE_OFFSET_BITS=64"


-- 
Samba Shared Repository