The branch, master has been updated
via 5bf6971 libreplace: Link libreplace against attr when required
from 33eb88e libreplace: Use true rather than True in xattr.c
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5bf6971c384f5480d008b69c54122edb59a8fa1f
Author: Andrew Bartlett <[email protected]>
Date: Sun Jun 3 09:08:55 2012 +1000
libreplace: Link libreplace against attr when required
The autoconf Samba build will return to over-linking with -lattr on
systems with both the XFS compat API and native xattrs.
Autobuild-User: Andrew Bartlett <[email protected]>
Autobuild-Date: Sun Jun 3 03:56:05 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/replace/libreplace.m4 | 9 ++++++++-
source3/configure.in | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index 16718d8..7e978ff 100644
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -148,6 +148,8 @@
AC_CHECK_FUNCS(clock_gettime,libreplace_cv_have_clock_gettime=yes,[
AC_CHECK_HEADERS(sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h
sys/uio.h)
AC_CHECK_HEADERS(sys/ea.h sys/proplist.h)
+LIBREPLACE_FILESYS_LIBS=""
+
############################################
# Check for EA implementations
case "$host_os" in
@@ -163,6 +165,11 @@ case "$host_os" in
AC_CHECK_FUNCS(fremoveea fremovexattr fsetea fsetxattr getea getxattr
listea)
AC_CHECK_FUNCS(listxattr removeea removexattr setea setxattr)
+ AC_CHECK_LIB_EXT(attr, LIBREPLACE_FILESYS_LIBS, flistea)
+ AC_CHECK_LIB_EXT(attr, LIBREPLACE_FILESYS_LIBS, flistxattr)
+ AC_CHECK_LIB_EXT(attr, LIBREPLACE_FILESYS_LIBS, attr_listf)
+ AC_CHECK_LIB_EXT(attr, LIBREPLACE_FILESYS_LIBS, extattr_list_fd)
+
;;
esac
@@ -172,7 +179,7 @@ esac
if test x"$ac_cv_func_getxattr" = x"yes" ; then
AC_CACHE_CHECK([whether xattr interface takes additional options],
smb_attr_cv_xattr_add_opt, [
old_LIBS=$LIBS
- LIBS="$LIBS $ACL_LIBS"
+ LIBS="$LIBS $LIBREPLACE_FILESYS_LIBS"
AC_TRY_COMPILE([
#include <sys/types.h>
#if HAVE_ATTR_XATTR_H
diff --git a/source3/configure.in b/source3/configure.in
index 37f37f6..153c887 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -586,7 +586,7 @@ LIBREPLACE_DIR=`echo ${libreplacedir} | sed -e
"s;${srcdir};;" -e "s;^/;;"`
LIBREPLACE_OBJS="${LIBREPLACEOBJ}"
AC_SUBST(LIBREPLACE_OBJS)
-LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS}"
+LIBREPLACE_LIBS="${LIBREPLACE_NETWORK_LIBS} ${LIBREPLACE_FILESYS_LIBS}"
AC_SUBST(LIBREPLACE_LIBS)
--
Samba Shared Repository
