[SCM] Samba Shared Repository - branch master updated

Andrew Bartlett abartlet at samba.org
Fri Jun 1 23:24:02 MDT 2012


The branch, master has been updated
       via  80913ae libreplace: Fix autoconf build on platforms needing xattrs
       via  a9311eb build: Check correctly for sendfile (missing .h in header)
      from  81a754f lib/replace: Relicence xattr.c to LGPLv3

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


- Log -----------------------------------------------------------------
commit 80913ae2a88e0e9f5730f565ed73c8cb77be123a
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 2 13:08:32 2012 +1000

    libreplace: Fix autoconf build on platforms needing xattrs
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Sat Jun  2 07:23:32 CEST 2012 on sn-devel-104

commit a9311ebfe7a28f5f5ac79a9779ab6bd0faeebe49
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sat Jun 2 13:02:21 2012 +1000

    build: Check correctly for sendfile (missing .h in header)
    
    This will hopefully fix the build on SLES8, which does not support 64-bit sendfile.
    
    Andrew Bartlett

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

Summary of changes:
 lib/replace/libreplace.m4 |    2 +-
 source3/wscript           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index 641d25b..16718d8 100644
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -49,7 +49,7 @@ fi
 LIBREPLACEOBJ="$libreplacedir/replace.o"
 AC_SUBST(LIBREPLACEOBJ)
 
-LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o"
+LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/snprintf.o  $libreplacedir/xattr.o"
 
 AC_TYPE_UID_T
 AC_TYPE_MODE_T
diff --git a/source3/wscript b/source3/wscript
index e9d971a..b08fc77 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -941,7 +941,7 @@ main() {
                             ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
                             ''',
                             '_HAVE_SENDFILE',
-                            headers='sys/sendfile',
+                            headers='sys/sendfile.h',
                             msg='Checking for linux sendfile support')
 
             # Try and cope with broken Linux sendfile....


-- 
Samba Shared Repository


More information about the samba-cvs mailing list