master 7ff5c0d704: Port xattr handling to Fedora 9

[Paul Eggert]

branch: master
commit 7ff5c0d7045dd105c604c3f09130693db1200ff9
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>

    Port xattr handling to Fedora 9
    
    Problem reported by Po Lu (Bug#60843).
    * m4/xattr.m4: Sync from Gnulib.
---
 m4/xattr.m4 | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/m4/xattr.m4 b/m4/xattr.m4
index 6141515652..0e179cc0d1 100644
--- a/m4/xattr.m4
+++ b/m4/xattr.m4
@@ -1,5 +1,5 @@
 # xattr.m4 - check for Extended Attributes (Linux)
-# serial 5
+# serial 6
 
 # Copyright (C) 2003-2023 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -17,23 +17,33 @@ AC_DEFUN([gl_FUNC_XATTR],
   AC_SUBST([LIB_XATTR])
 
   if test "$use_xattr" = yes; then
-    AC_CHECK_HEADERS([attr/error_context.h attr/libattr.h])
-    use_xattr=no
-    if test "$ac_cv_header_attr_libattr_h" = yes \
-        && test "$ac_cv_header_attr_error_context_h" = yes; then
-      xattr_saved_LIBS=$LIBS
-      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])
-      LIBS=$xattr_saved_LIBS
-      if test "$ac_cv_func_attr_copy_file" = yes; then
-        use_xattr=yes
-      fi
-    fi
-    if test $use_xattr = no; then
+    AC_CACHE_CHECK([for xattr library with ATTR_ACTION_PERMISSIONS],
+      [gl_cv_xattr_lib],
+      [gl_cv_xattr_lib=no
+       AC_LANG_CONFTEST(
+         [AC_LANG_PROGRAM(
+            [[#include <attr/error_context.h>
+              #include <attr/libattr.h>
+              static int
+              is_attr_permissions (const char *name, struct error_context *ctx)
+              {
+                return attr_copy_action (name, ctx) == ATTR_ACTION_PERMISSIONS;
+              }
+            ]],
+            [[return attr_copy_fd ("/", 0, "/", 0, is_attr_permissions, 0);
+            ]])])
+       AC_LINK_IFELSE([],
+         [gl_cv_xattr_lib='none required'],
+         [xattr_saved_LIBS=$LIBS
+          LIBS="-lattr $LIBS"
+          AC_LINK_IFELSE([], [gl_cv_xattr_lib=-lattr])
+          LIBS=$xattr_saved_LIBS])])
+    if test "$gl_cv_xattr_lib" = no; then
       AC_MSG_WARN([libattr development library was not found or not usable.])
       AC_MSG_WARN([AC_PACKAGE_NAME will be built without xattr support.])
+      use_xattr=no
+    elif test "$gl_cv_xattr_lib" != 'none required'; then
+      LIB_XATTR=$gl_cv_xattr_lib
     fi
   fi
   if test "$use_xattr" = yes; then