Author: vlendec Date: 2006-03-24 18:40:28 +0000 (Fri, 24 Mar 2006) New Revision: 14695
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14695 Log: Patch from Bj?\195?\182rn Jacke: - add DMAPI/XDSM support for AIX - find JFS DMAPI libs on Linux when only they are available Volker Modified: branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/smbd/dmapi.c trunk/source/configure.in trunk/source/smbd/dmapi.c Changeset: Modified: branches/SAMBA_3_0/source/configure.in =================================================================== --- branches/SAMBA_3_0/source/configure.in 2006-03-24 17:41:44 UTC (rev 14694) +++ branches/SAMBA_3_0/source/configure.in 2006-03-24 18:40:28 UTC (rev 14695) @@ -829,7 +829,7 @@ AC_CHECK_HEADERS(sys/sysmacros.h security/_pam_macros.h dlfcn.h) AC_CHECK_HEADERS(sys/syslog.h syslog.h execinfo.h) AC_CHECK_HEADERS(langinfo.h locale.h) -AC_CHECK_HEADERS(sys/dmi.h xfs/dmapi.h) +AC_CHECK_HEADERS(sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h) AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[ #if HAVE_RPC_RPC_H @@ -2339,16 +2339,32 @@ fi ################################################# -# Check for DMAPI interfaces in libdm. +# Check for DMAPI interfaces in libdm/libjfsdm/libxsdm AC_CHECK_LIB(dm, dm_get_eventlist, [samba_cv_HAVE_LIBDM=yes; samba_dmapi_libs="-ldm"], [samba_cv_HAVE_LIBDM=no]) if test x"$samba_cv_HAVE_LIBDM" = x"yes" ; then - AC_DEFINE(HAVE_LIBDM, 1, [Whether libdm is available]) + AC_DEFINE(HAVE_LIBDM, 1, [Whether dmapi libdm is available]) fi +AC_CHECK_LIB(jfsdm, dm_get_eventlist, + [samba_cv_HAVE_LIBJFSDM=yes; samba_dmapi_libs="-ljfsdm"], + [samba_cv_HAVE_LIBJFSDM=no]) + +if test x"$samba_cv_HAVE_LIBJFSDM" = x"yes" ; then + AC_DEFINE(HAVE_LIBJFSDM, 1, [Whether dmapi libjfsdm is available]) +fi + +AC_CHECK_LIB(xdsm, dm_get_eventlist, + [samba_cv_HAVE_LIBXDSM=yes; samba_dmapi_libs="-lxdsm"], + [samba_cv_HAVE_LIBXDSM=no]) + +if test x"$samba_cv_HAVE_LIBXDSM" = x"yes" ; then + AC_DEFINE(HAVE_LIBXDSM, 1, [Whether dmapi libxdsm is available]) +fi + AC_CACHE_CHECK([for kernel share modes],samba_cv_HAVE_KERNEL_SHARE_MODES,[ AC_TRY_RUN([ #include <sys/types.h> Modified: branches/SAMBA_3_0/source/smbd/dmapi.c =================================================================== --- branches/SAMBA_3_0/source/smbd/dmapi.c 2006-03-24 17:41:44 UTC (rev 14694) +++ branches/SAMBA_3_0/source/smbd/dmapi.c 2006-03-24 18:40:28 UTC (rev 14695) @@ -24,8 +24,8 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_DMAPI -#if defined(HAVE_LIBDM) -#if (defined(HAVE_XFS_DMAPI_H) || defined(HAVE_SYS_DMI_H)) +#if defined(HAVE_LIBDM) || defined(HAVE_LIBJFSDM) || defined(HAVE_LIBXDSM) +#if defined(HAVE_XFS_DMAPI_H) || defined(HAVE_SYS_DMI_H) || defined(HAVE_SYS_JFSDMAPI_H) || defined(HAVE_SYS_DMAPI_H) #define USE_DMAPI 1 #endif #endif @@ -40,10 +40,12 @@ #ifdef HAVE_XFS_DMAPI_H #include <xfs/dmapi.h> -#endif - -#ifdef HAVE_SYS_DMI_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> #endif #define DMAPI_SESSION_NAME "samba" Modified: trunk/source/configure.in =================================================================== --- trunk/source/configure.in 2006-03-24 17:41:44 UTC (rev 14694) +++ trunk/source/configure.in 2006-03-24 18:40:28 UTC (rev 14695) @@ -829,7 +829,7 @@ AC_CHECK_HEADERS(sys/sysmacros.h security/_pam_macros.h dlfcn.h) AC_CHECK_HEADERS(sys/syslog.h syslog.h execinfo.h) AC_CHECK_HEADERS(langinfo.h locale.h) -AC_CHECK_HEADERS(sys/dmi.h xfs/dmapi.h) +AC_CHECK_HEADERS(sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h) AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[ #if HAVE_RPC_RPC_H @@ -2339,16 +2339,32 @@ fi ################################################# -# Check for DMAPI interfaces in libdm. +# Check for DMAPI interfaces in libdm/libjfsdm/libxsdm AC_CHECK_LIB(dm, dm_get_eventlist, [samba_cv_HAVE_LIBDM=yes; samba_dmapi_libs="-ldm"], [samba_cv_HAVE_LIBDM=no]) if test x"$samba_cv_HAVE_LIBDM" = x"yes" ; then - AC_DEFINE(HAVE_LIBDM, 1, [Whether libdm is available]) + AC_DEFINE(HAVE_LIBDM, 1, [Whether dmapi libdm is available]) fi +AC_CHECK_LIB(jfsdm, dm_get_eventlist, + [samba_cv_HAVE_LIBJFSDM=yes; samba_dmapi_libs="-ljfsdm"], + [samba_cv_HAVE_LIBJFSDM=no]) + +if test x"$samba_cv_HAVE_LIBJFSDM" = x"yes" ; then + AC_DEFINE(HAVE_LIBJFSDM, 1, [Whether dmapi libjfsdm is available]) +fi + +AC_CHECK_LIB(xdsm, dm_get_eventlist, + [samba_cv_HAVE_LIBXDSM=yes; samba_dmapi_libs="-lxdsm"], + [samba_cv_HAVE_LIBXDSM=no]) + +if test x"$samba_cv_HAVE_LIBXDSM" = x"yes" ; then + AC_DEFINE(HAVE_LIBXDSM, 1, [Whether dmapi libxdsm is available]) +fi + AC_CACHE_CHECK([for kernel share modes],samba_cv_HAVE_KERNEL_SHARE_MODES,[ AC_TRY_RUN([ #include <sys/types.h> Modified: trunk/source/smbd/dmapi.c =================================================================== --- trunk/source/smbd/dmapi.c 2006-03-24 17:41:44 UTC (rev 14694) +++ trunk/source/smbd/dmapi.c 2006-03-24 18:40:28 UTC (rev 14695) @@ -24,8 +24,8 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_DMAPI -#if defined(HAVE_LIBDM) -#if (defined(HAVE_XFS_DMAPI_H) || defined(HAVE_SYS_DMI_H)) +#if defined(HAVE_LIBDM) || defined(HAVE_LIBJFSDM) || defined(HAVE_LIBXDSM) +#if defined(HAVE_XFS_DMAPI_H) || defined(HAVE_SYS_DMI_H) || defined(HAVE_SYS_JFSDMAPI_H) || defined(HAVE_SYS_DMAPI_H) #define USE_DMAPI 1 #endif #endif @@ -40,10 +40,12 @@ #ifdef HAVE_XFS_DMAPI_H #include <xfs/dmapi.h> -#endif - -#ifdef HAVE_SYS_DMI_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> #endif #define DMAPI_SESSION_NAME "samba"
