summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2010-02-23 15:23:27 +0100
committerBjörn Jacke <bj@sernet.de>2010-02-23 15:25:41 +0100
commitce7727c1cc2fe4caa9b2d6e33530c3483dd5f980 (patch)
treef0ef7938d9574c39fa10fcdc3f05c1f9052b3974
parent975a7a3d1b075bcaca820b2431c04734a139062f (diff)
downloadsamba-ce7727c1cc2fe4caa9b2d6e33530c3483dd5f980.tar.gz
samba-ce7727c1cc2fe4caa9b2d6e33530c3483dd5f980.tar.bz2
samba-ce7727c1cc2fe4caa9b2d6e33530c3483dd5f980.zip
s3: add explicit configure option whether or not to enable dmapi support
-rw-r--r--source3/configure.in25
1 files changed, 23 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 0de367ade1..45d2563ff3 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2674,7 +2674,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
@@ -3187,7 +3208,7 @@ with_ldap_support=auto
AC_MSG_CHECKING([for LDAP support])
AC_ARG_WITH(ldap,
-[AS_HELP_STRING([--with-ldap], [LDAP support (default=yes)])],
+[AS_HELP_STRING([--with-ldap], [LDAP support (default=auto)])],
[ case "$withval" in
yes|no)
with_ldap_support=$withval