summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2007-02-20 15:55:12 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:06 -0500
commit415612949005edffa3ca05133ea5f1358f578161 (patch)
tree5f78a6dca67a07a71f37bd07f82b9deb495ec2e0 /source3
parent1052cadbae7bf71a0575b06e8ac7ff52c7fb95ee (diff)
downloadsamba-415612949005edffa3ca05133ea5f1358f578161.tar.gz
samba-415612949005edffa3ca05133ea5f1358f578161.tar.bz2
samba-415612949005edffa3ca05133ea5f1358f578161.zip
r21467: Add GPFS-provided DMAPI support based on their GPL library
(This used to be commit 5876bedda51fce0c932ca0cdab074629b31a9c94)
Diffstat (limited to 'source3')
-rw-r--r--source3/aclocal.m410
-rw-r--r--source3/smbd/dmapi.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/source3/aclocal.m4 b/source3/aclocal.m4
index 00c57bacee..d36749a5f5 100644
--- a/source3/aclocal.m4
+++ b/source3/aclocal.m4
@@ -592,9 +592,15 @@ AC_DEFUN([SMB_CHECK_DMAPI],
[samba_dmapi_libs="-lxdsm"], [])
fi
+ if test x"$samba_dmapi_libs" = x"" ; then
+ AC_CHECK_LIB(dmapi, dm_get_eventlist,
+ [samba_dmapi_libs="-ldmapi"], [])
+ fi
+
+
# Only bother to test ehaders if we have a candidate DMAPI library
if test x"$samba_dmapi_libs" != x"" ; then
- AC_CHECK_HEADERS(sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h)
+ AC_CHECK_HEADERS(sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h)
fi
if test x"$samba_dmapi_libs" != x"" ; then
@@ -612,6 +618,8 @@ AC_DEFUN([SMB_CHECK_DMAPI],
#include <sys/jfsdmapi.h>
#elif defined(HAVE_SYS_DMAPI_H)
#include <sys/dmapi.h>
+#elif defined(HAVE_DMAPI_H)
+#include <dmapi.h>
#endif
],
[
diff --git a/source3/smbd/dmapi.c b/source3/smbd/dmapi.c
index b42b7d51f0..b8c23c2dce 100644
--- a/source3/smbd/dmapi.c
+++ b/source3/smbd/dmapi.c
@@ -40,6 +40,8 @@ BOOL dmapi_have_session(void) { return False; }
#include <sys/jfsdmapi.h>
#elif defined(HAVE_SYS_DMAPI_H)
#include <sys/dmapi.h>
+#elif defined(HAVE_DMAPI_H)
+#include <dmapi.h>
#endif
#define DMAPI_SESSION_NAME "samba"