[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  65d7144 s3-waf: add vfs_gpfs_hsm_notify to the build.
      from  43967ee tdb: fix a build warning.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 65d7144ef5a0498c82ec61d114aaca91b25dc088
Author: Günther Deschner <gd at samba.org>
Date:   Wed May 4 18:01:04 2011 +0200

    s3-waf: add vfs_gpfs_hsm_notify to the build.
    
    Volker, can you please check this is correct ?
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed May  4 19:03:45 CEST 2011 on sn-devel-104
    (cherry picked from commit 0d1b2d2033e9cc33accea29a4c3a8fafd3d75aa2)

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

Summary of changes:
 source3/modules/wscript_build |    8 ++++++++
 source3/wscript               |    6 ++++++
 2 files changed, 14 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 201610e..ff7163f 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -30,6 +30,7 @@ VFS_CACHEPRIME_SRC = 'vfs_cacheprime.c'
 VFS_PREALLOC_SRC = 'vfs_prealloc.c'
 VFS_COMMIT_SRC = 'vfs_commit.c'
 VFS_GPFS_SRC = 'vfs_gpfs.c gpfs.c'
+VFS_GPFS_HSM_NOTIFY_SRC = 'vfs_gpfs_hsm_notify.c'
 VFS_NOTIFY_FAM_SRC = 'vfs_notify_fam.c'
 VFS_READAHEAD_SRC = 'vfs_readahead.c'
 VFS_TSMSM_SRC = 'vfs_tsmsm.c'
@@ -280,6 +281,13 @@ bld.SAMBA3_MODULE('vfs_gpfs',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs'))
 
+bld.SAMBA3_MODULE('vfs_gpfs_hsm_notify',
+                 subsystem='vfs',
+                 source=VFS_GPFS_HSM_NOTIFY_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs_hsm_notify'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs_hsm_notify'))
+
 bld.SAMBA3_MODULE('vfs_notify_fam',
                  subsystem='vfs',
                  source=VFS_NOTIFY_FAM_SRC,
diff --git a/source3/wscript b/source3/wscript
index 3b15313..32c688c 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1714,6 +1714,9 @@ main() {
         conf.DEFINE('WITH_PROFILE', 1);
 
 
+    if conf.CHECK_HEADERS('gpfs_gpl.h'):
+        conf.DEFINE('HAVE_GPFS', '1')
+
     default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam
                                       auth_sam auth_unix auth_winbind auth_wbc auth_server
                                       auth_domain auth_builtin vfs_default
@@ -1754,6 +1757,9 @@ main() {
     if conf.CONFIG_SET('DARWINOS'):
 	default_shared_modules.extend(TO_LIST('charset_macosxfs'))
 
+    if conf.CONFIG_SET('HAVE_GPFS'):
+	default_shared_modules.extend(TO_LIST('vfs_gpfs vfs_gpfs_hsm_notify'))
+
     explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
     explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
 


-- 
Samba Shared Repository