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

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  a8552d4 s3: add explicit configure option whether or not to enable dmapi support
      from  14a3111 s3:util_seaccess: make sure that we don't grant SEC_STD_DELETE to the owner by default

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


- Log -----------------------------------------------------------------
commit a8552d4ea6ea3b3b59b0d1c39e8fdaf2f9e11a74
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Feb 23 15:23:27 2010 +0100

    s3: add explicit configure option whether or not to enable dmapi support
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (similar to commit ce7727c1cc2fe4caa9b2d6e33530c3483dd5f980)
    
    Fix bug #8033 - Backport dmapi configure checks.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 5201302..4528cbf 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2688,7 +2688,28 @@ AC_SUBST(SMB_FAM_LIBS)
 #################################################
 # Check for DMAPI interfaces in libdm/libjfsdm/libxsdm
 
-SMB_CHECK_DMAPI([], AC_MSG_NOTICE(DMAPI support not present) )
+
+with_dmapi_support=auto
+AC_MSG_CHECKING(whether to use DMAPI support)
+AC_ARG_WITH(dmapi,
+[AS_HELP_STRING([--with-dmapi], [Include DMAPI/XDSM support (default=auto)])],
+[ case "$withval" in
+  yes|no)
+    with_dmapi_support=$withval
+    ;;
+  esac ]
+)
+AC_MSG_RESULT([$with_dmapi_support])
+
+if test x"$with_dmapi_support" != xno ; then
+	SMB_CHECK_DMAPI([], [
+		AC_MSG_NOTICE(DMAPI support not present)
+		if test x"$with_dmapi_support" = xyes ; then
+			AC_MSG_ERROR(no DMAPI support found but requested!)
+		fi
+		]
+	)
+fi
 
 # 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


-- 
Samba Shared Repository