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

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  de89fcc... s3:build: Fix automatic building of vfs_tsmsm if gpfs and dmapi are present.
      from  6e8c643... s3: Fix a NULL pointer dereference

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


- Log -----------------------------------------------------------------
commit de89fcc1f60d7f287f87507d2187d4ca8966791c
Author: Michael Adam <obnox at samba.org>
Date:   Mon Mar 8 22:32:41 2010 +0100

    s3:build: Fix automatic building of vfs_tsmsm if gpfs and dmapi are present.
    
    Michael
    (cherry picked from commit 9113e14b291c10c824d2d8ea5cb28ffc0adcb63b)
    
    Fix bug #7231 (vfs_tsmsm not built automatically).
    (cherry picked from commit 8087ceb42d72f2a07f70e8ab5462775a08303546)

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

Summary of changes:
 source3/configure.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index be18c24..237d22f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2445,7 +2445,7 @@ SMB_CHECK_DMAPI([], AC_MSG_NOTICE(DMAPI support not present) )
 
 # Add TSM SM VFS module only if there are both GPFS and DMAPI support
 # Theoretically it should work with AIX JFS2 too but this needs testing
-if test x"$samba_cv_HAVE_GPFS" = x"yes" && test x"$samba_dmapi_libs" != x"" ; then
+if test x"$ac_cv_header_gpfs_gpl_h" = x"yes" && test x"$samba_dmapi_libs" != x"" ; then
     default_shared_modules="$default_shared_modules vfs_tsmsm"
 fi
 


-- 
Samba Shared Repository