Author: ab Date: 2007-02-20 15:55:12 +0000 (Tue, 20 Feb 2007) New Revision: 21467
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21467 Log: Add GPFS-provided DMAPI support based on their GPL library Modified: branches/SAMBA_3_0/source/aclocal.m4 branches/SAMBA_3_0/source/smbd/dmapi.c Changeset: Modified: branches/SAMBA_3_0/source/aclocal.m4 =================================================================== --- branches/SAMBA_3_0/source/aclocal.m4 2007-02-20 14:57:25 UTC (rev 21466) +++ branches/SAMBA_3_0/source/aclocal.m4 2007-02-20 15:55:12 UTC (rev 21467) @@ -592,9 +592,15 @@ [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 @@ #include <sys/jfsdmapi.h> #elif defined(HAVE_SYS_DMAPI_H) #include <sys/dmapi.h> +#elif defined(HAVE_DMAPI_H) +#include <dmapi.h> #endif ], [ Modified: branches/SAMBA_3_0/source/smbd/dmapi.c =================================================================== --- branches/SAMBA_3_0/source/smbd/dmapi.c 2007-02-20 14:57:25 UTC (rev 21466) +++ branches/SAMBA_3_0/source/smbd/dmapi.c 2007-02-20 15:55:12 UTC (rev 21467) @@ -40,6 +40,8 @@ #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"