s3:dmapi: prefer dmapi libs from gpfs over system libs

Patch from William Jojo sent to samba-technical:

This is based on some pain felt when building 32-bit and 64-bit Clustered Samba
on AIX with GPFS support.

Part of the problem lies in AIX only providing 32-bit shared object in
libxdsm.a(shr.o). So without libdmapi.a from gpfs.base, you get no DMAPI
support under 64-bit.

diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index 3b120e25643ebbe8a44e7040b07d6423ca978252..29033b79667977b0b07a1ad97b24f48bf18e75f3 100644 (file)
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -694,13 +694,13 @@ AC_DEFUN([SMB_CHECK_DMAPI],
     fi
 
     if test x"$samba_dmapi_libs" = x"" ; then
     fi
 
     if test x"$samba_dmapi_libs" = x"" ; then

-       AC_CHECK_LIB(xdsm, dm_get_eventlist,
-               [samba_dmapi_libs="-lxdsm"], [])
+        AC_CHECK_LIB(dmapi, dm_get_eventlist,
+                [samba_dmapi_libs="-ldmapi"], [])

     fi
 
     if test x"$samba_dmapi_libs" = x"" ; then
     fi
 
     if test x"$samba_dmapi_libs" = x"" ; then

-        AC_CHECK_LIB(dmapi, dm_get_eventlist,
-                [samba_dmapi_libs="-ldmapi"], [])
+       AC_CHECK_LIB(xdsm, dm_get_eventlist,
+               [samba_dmapi_libs="-lxdsm"], [])

     fi
 
 
     fi