Check if libattr implements attr_copy_action()

* m4/xattr.m4 (gl_FUNC_XATTR): Check if attr_copy_action() is defined.
* src/util.c: If attr_copy_action() doesn't exist, fall back to the default
copy_attr_file() behavior of copying most extended attributes except ACLs.

2 files changed, 7 insertions, 1 deletions

diff --git a/m4/xattr.m4 b/m4/xattr.m4
index 7691177..48b08c3 100644
--- a/m4/xattr.m4
+++ b/m4/xattr.m4
@@ -28,7 +28,7 @@ AC_DEFUN([gl_FUNC_XATTR],
       AC_SEARCH_LIBS([attr_copy_file], [attr],
                      [test "$ac_cv_search_attr_copy_file" = "none required" ||
                         LIB_XATTR=$ac_cv_search_attr_copy_file])
-      AC_CHECK_FUNCS([attr_copy_file])
+      AC_CHECK_FUNCS([attr_copy_file attr_copy_action])
       LIBS=$xattr_saved_LIBS
       if test $ac_cv_func_attr_copy_file = yes; then
         use_xattr=yes
diff --git a/src/util.c b/src/util.c
index 7fb6b05..305e695 100644
--- a/src/util.c
+++ b/src/util.c
@@ -196,6 +196,8 @@ copy_attr_free (struct error_context *ctx, char const *str)
 {
 }
 
+#ifdef HAVE_ATTR_COPY_ACTION
+
 static int
 copy_attr_check (const char *name, struct error_context *ctx)
 {
@@ -203,6 +205,10 @@ copy_attr_check (const char *name, struct error_context *ctx)
 	return action == 0 || action == ATTR_ACTION_PERMISSIONS;
 }
 
+#else
+#define copy_attr_check NULL
+#endif
+
 static int
 copy_attr (char const *src_path, char const *dst_path)
 {