summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ambach <ambi@samba.org>2012-11-07 18:40:07 +0100
committerChristian Ambach <ambi@samba.org>2012-11-09 20:57:31 +0100
commit01f188a3f0725f42ce4f17621985abe4ab5a54c2 (patch)
tree7fb0323d61d83a50cc02e75e8e8c707c9f720580
parent3712de7b9c494f6e01782e837f369e8beb5a054e (diff)
downloadsamba-01f188a3f0725f42ce4f17621985abe4ab5a54c2.tar.gz
samba-01f188a3f0725f42ce4f17621985abe4ab5a54c2.tar.bz2
samba-01f188a3f0725f42ce4f17621985abe4ab5a54c2.zip
build: add DMAPI configure option and checks
the waf build was missing the --with-dmapi option and configure checks that are necessary to build the source3 parts that need DMAPI (e.g. vfs_tsmsm) Bug: https://bugzilla.samba.org/show_bug.cgi?id=9178 Signed-off-by: Christian Ambach <ambi@samba.org> Autobuild-User(master): Christian Ambach <ambi@samba.org> Autobuild-Date(master): Fri Nov 9 20:57:31 CET 2012 on sn-devel-104
-rw-r--r--source3/wscript64
-rwxr-xr-xsource3/wscript_build2
2 files changed, 65 insertions, 1 deletions
diff --git a/source3/wscript b/source3/wscript
index 96ab4deb2c..92dcd18f47 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -41,6 +41,7 @@ def set_options(opt):
opt.SAMBA3_ADD_OPTION('syslog')
opt.SAMBA3_ADD_OPTION('automount')
opt.SAMBA3_ADD_OPTION('aio-support')
+ opt.SAMBA3_ADD_OPTION('dmapi', default=False, help="build with DMAPI support")
opt.SAMBA3_ADD_OPTION('profiling-data', default=False)
opt.SAMBA3_ADD_OPTION('cluster-support', default=None)
@@ -162,6 +163,69 @@ main() {
}''', 'HAVE_KERNEL_SHARE_MODES', addmain=False, execute=True,
msg="Checking for krenel share modes")
+ # check for DMAPI libs
+ Logs.info("Checking for DMAPI library existence")
+ conf.env['dmapi_lib'] = ''
+ samba_dmapi_lib = ''
+ if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dm'):
+ samba_dmapi_lib = 'dm'
+ else:
+ if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'jfsdm'):
+ samba_dmapi_lib = 'jfsdm'
+ else:
+ if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dmapi'):
+ samba_dmapi_lib = 'dmapi'
+ else:
+ if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'xdsm'):
+ samba_dmapi_lib = 'xdsm'
+ # only bother to test headers and compilation when a candidate
+ # library has been found
+ if Options.options.with_dmapi == True and samba_dmapi_lib == '':
+ conf.fatal('DMAPI support requested, but no suitable DMAPI library found')
+ else:
+ conf.CHECK_HEADERS('sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h')
+ conf.CHECK_CODE('''
+#include <time.h> /* needed by Tru64 */
+#include <sys/types.h> /* needed by AIX */
+#ifdef HAVE_XFS_DMAPI_H
+#include <xfs/dmapi.h>
+#elif defined(HAVE_SYS_DMI_H)
+#include <sys/dmi.h>
+#elif defined(HAVE_SYS_JFSDMAPI_H)
+#include <sys/jfsdmapi.h>
+#elif defined(HAVE_SYS_DMAPI_H)
+#include <sys/dmapi.h>
+#elif defined(HAVE_DMAPI_H)
+#include <dmapi.h>
+#endif
+
+/* This link test is designed to fail on IRI 6.4, but should
+ * succeed on Linux, IRIX 6.5 and AIX.
+ */
+int main(int argc, char **argv)
+{
+ char * version;
+ dm_eventset_t events;
+ /* This doesn't take an argument on IRIX 6.4. */
+ dm_init_service(&version);
+ /* IRIX 6.4 expects events to be a pointer. */
+ DMEV_ISSET(DM_EVENT_READ, events);
+
+ return 0;
+}
+''',
+ 'USE_DMAPI',
+ addmain=False,
+ execute=False,
+ lib=samba_dmapi_lib,
+ msg='Checking whether DMAPI lib '+samba_dmapi_lib+' can be used')
+
+ if conf.CONFIG_SET('USE_DMAPI'):
+ conf.env['dmapi_lib'] = samba_dmapi_lib
+ else:
+ if Options.options.with_dmapi == True:
+ conf.fatal('DMAPI support requested but not found');
+
# Check for various members of the stat structure
conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blocks', define='HAVE_STAT_ST_BLOCKS',
headers='sys/stat.h')
diff --git a/source3/wscript_build b/source3/wscript_build
index 0634b8dc7e..351d22df7d 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -980,7 +980,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
ccan-hash
NDR_SMB_ACL
netapi
- ''',
+ ''' + bld.env['dmapi_lib'],
private_library=True,
vars=locals())