[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Oct 11 13:23:02 MDT 2011
The branch, master has been updated
via 49eba95 s3-waf: make sure we build example vfs modules with --enable-developer.
via d6cb58e s3-waf: fix configure check for HAVE_LINUX_READAHEAD.
via 3522f9d s3-waf: fix configure check for HAVE_LINUX_FALLOCATE64.
via 245c8c1 s3-waf: fix configure check for HAVE_LINUX_FALLOCATE.
via 028cf00 s3-waf: fix configure check for HAVE_POSIX_FADVISE.
from 2ecfa0c Fix the VFS for fsctl.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 49eba95b2bd95d7ea3c1a0266fa9071761510765
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 11 19:20:05 2011 +0200
s3-waf: make sure we build example vfs modules with --enable-developer.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Tue Oct 11 21:22:55 CEST 2011 on sn-devel-104
commit d6cb58e18d7f8f133859b000ab90ea2a3b79e48d
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 11 15:20:42 2011 +0200
s3-waf: fix configure check for HAVE_LINUX_READAHEAD.
Guenther
commit 3522f9dc4b45cc01f19d09a5cee3fbbb4f04411f
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 11 15:18:08 2011 +0200
s3-waf: fix configure check for HAVE_LINUX_FALLOCATE64.
Guenther
commit 245c8c1c0200a19557fb8e978726e635f7de2c81
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 11 15:17:28 2011 +0200
s3-waf: fix configure check for HAVE_LINUX_FALLOCATE.
Guenther
commit 028cf00293ad124e32b737072045beb506f5bd18
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 11 15:03:01 2011 +0200
s3-waf: fix configure check for HAVE_POSIX_FADVISE.
Guenther
-----------------------------------------------------------------------
Summary of changes:
examples/VFS/wscript_build | 25 +++++++++++++++++++++++++
source3/wscript | 39 +++++++++------------------------------
source3/wscript_build | 1 +
3 files changed, 35 insertions(+), 30 deletions(-)
create mode 100644 examples/VFS/wscript_build
Changeset truncated at 500 lines:
diff --git a/examples/VFS/wscript_build b/examples/VFS/wscript_build
new file mode 100644
index 0000000..92fea70
--- /dev/null
+++ b/examples/VFS/wscript_build
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+
+bld.SAMBA3_MODULE('vfs_skel_opaque',
+ subsystem='vfs',
+ source='skel_opaque.c',
+ deps='samba-util',
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_skel_opaque'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_skel_opaque'))
+
+bld.SAMBA3_MODULE('vfs_skel_transparent',
+ subsystem='vfs',
+ source='skel_transparent.c',
+ deps='samba-util',
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_skel_transparent'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_skel_transparent'))
+
+bld.SAMBA3_MODULE('vfs_shadow_copy_test',
+ subsystem='vfs',
+ source='shadow_copy_test.c',
+ deps='samba-util',
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy_test'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy_test'))
diff --git a/source3/wscript b/source3/wscript
index 87cc2d4..47ef847 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -337,40 +337,21 @@ return acl_get_perm_np(permset_d, perm);
if conf.CONFIG_SET('HAVE_FALLOCATE'):
conf.CHECK_CODE('''
- #if defined(HAVE_UNISTD_H)
- #include <unistd.h>
- #endif
- #include <sys/types.h>
- #define _GNU_SOURCE
- #include <fcntl.h>
- #if defined(HAVE_LINUX_FALLOC_H)
- #include <linux/falloc.h>
- #endif
int ret = fallocate(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
'HAVE_LINUX_FALLOCATE',
- msg="Checking whether the Linux 'fallocate' function is available")
+ msg="Checking whether the Linux 'fallocate' function is available",
+ headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
if conf.CONFIG_SET('HAVE_FALLOCATE64'):
conf.CHECK_CODE('''
- #if defined(HAVE_UNISTD_H)
- #include <unistd.h>
- #endif
- #include <sys/types.h>
- #define _GNU_SOURCE
- #include <fcntl.h>
- #if defined(HAVE_LINUX_FALLOC_H)
- #include <linux/falloc.h>
- #endif
int ret = fallocate64(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
'HAVE_LINUX_FALLOCATE64',
- msg="Checking whether the Linux 'fallocate64' function is available")
+ msg="Checking whether the Linux 'fallocate64' function is available",
+ headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
conf.CHECK_CODE('''
- #if defined(HAVE_UNISTD_H)
- #include <unistd.h>
- #endif
- #include <fcntl.h>
ssize_t err = readahead(0,0,0x80000);''',
'HAVE_LINUX_READAHEAD',
- msg="Checking whether Linux readahead is available")
+ msg="Checking whether Linux readahead is available",
+ headers='unistd.h fcntl.h')
conf.CHECK_DECLS('readahead', headers='fcntl.h', always=True)
conf.CHECK_CODE('''
@@ -1078,14 +1059,11 @@ exit(1);
define='HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC')
conf.CHECK_CODE('''
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#include <fcntl.h>],
ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED);
''',
'HAVE_POSIX_FADVISE',
- msg='Checking whether posix_fadvise is available')
+ msg='Checking whether posix_fadvise is available',
+ headers='unistd.h fcntl.h')
for v in ['_SC_NGROUPS_MAX', '_SC_NPROC_ONLN', '_SC_NPROCESSORS_ONLN', '_SC_PAGESIZE' ]:
conf.CHECK_CODE('''
@@ -1660,6 +1638,7 @@ main() {
if Options.options.developer:
default_static_modules.extend(TO_LIST('pdb_ads auth_netlogond charset_weird'))
default_shared_modules.extend(TO_LIST('perfcount_test'))
+ default_shared_modules.extend(TO_LIST('vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test'))
default_static_modules.extend(TO_LIST('pdb_samba4 auth_samba4 vfs_dfs_samba4'))
diff --git a/source3/wscript_build b/source3/wscript_build
index ee49b0e..a72a12d 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1398,6 +1398,7 @@ bld.RECURSE('pam_smbpass')
bld.RECURSE('passdb')
bld.RECURSE('rpc_server')
bld.RECURSE('winbindd')
+bld.RECURSE('../examples/VFS')
bld.ENFORCE_GROUP_ORDERING()
--
Samba Shared Repository
More information about the samba-cvs
mailing list