[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-8-g862ae38

[Björn Jacke]

The branch, master has been updated
       via  862ae382b80ef158317193ffbbbc9580a50e011c (commit)
      from  e6cb82a7dad2122d39d115eb8431a948dd142301 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 862ae382b80ef158317193ffbbbc9580a50e011c
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Jun 19 11:51:22 2009 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 source3/m4/aclocal.m4 |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index 3b120e2..29033b7 100644
--- 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
-	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
-        AC_CHECK_LIB(dmapi, dm_get_eventlist,
-                [samba_dmapi_libs="-ldmapi"], [])
+	AC_CHECK_LIB(xdsm, dm_get_eventlist,
+		[samba_dmapi_libs="-lxdsm"], [])
     fi
 
 


-- 
Samba Shared Repository