diff options
| author | Alexander Bokovoy <ab@samba.org> | 2007-02-20 15:55:44 +0000 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2007-02-20 15:55:44 +0000 |
| commit | 2b0d5a43f2d79440f44ff0e0cce6b6473bf1c8cd (patch) | |
| tree | b44fd49d61e943166c568125ce6715c5a6f49867 | |
| parent | 3935ad7fa2cdfba60956f3aaa3a10d50674f5ded (diff) | |
| download | samba-2b0d5a43f2d79440f44ff0e0cce6b6473bf1c8cd.tar.gz samba-2b0d5a43f2d79440f44ff0e0cce6b6473bf1c8cd.tar.xz samba-2b0d5a43f2d79440f44ff0e0cce6b6473bf1c8cd.zip | |
r21468: Add GPFS-provided DMAPI support based on their GPL library
| -rw-r--r-- | source/aclocal.m4 | 10 | ||||
| -rw-r--r-- | source/smbd/dmapi.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/source/aclocal.m4 b/source/aclocal.m4 index 00c57baceef..d36749a5f50 100644 --- a/source/aclocal.m4 +++ b/source/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/source/smbd/dmapi.c b/source/smbd/dmapi.c index b42b7d51f01..b8c23c2dce6 100644 --- a/source/smbd/dmapi.c +++ b/source/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" |