From: Bruno Haible <bruno@clisp.org>
Date: Sat, 10 May 2025 12:07:36 +0000 (+0200)
Subject: qcopy-acl: Update link dependencies after yesterday's change.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f193fa29b90ba51d4486b5afadef065c2635a343;p=thirdparty%2Fgnulib.git

qcopy-acl: Update link dependencies after yesterday's change.

* m4/acl.m4 (gl_QCOPY_ACL): Require gl_FILE_HAS_ACL.
(QCOPY_ACL_LIB): Conditionally add $FILE_HAS_ACL_LIB.
* modules/acl-tests (Makefile.am): Revert last change.
---

diff --git a/ChangeLog b/ChangeLog
index b3598ecb37..4a4d378fd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2025-05-10  Bruno Haible  <bruno@clisp.org>
+
+	qcopy-acl: Update link dependencies after yesterday's change.
+	* m4/acl.m4 (gl_QCOPY_ACL): Require gl_FILE_HAS_ACL.
+	(QCOPY_ACL_LIB): Conditionally add $FILE_HAS_ACL_LIB.
+	* modules/acl-tests (Makefile.am): Revert last change.
+
 2025-05-10  Bruno Haible  <bruno@clisp.org>
 
 	file-has-acl: Simplify logic for FILE_HAS_ACL_LIB.
diff --git a/m4/acl.m4 b/m4/acl.m4
index 50066da214..2dd33497ef 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,5 +1,5 @@
 # acl.m4
-# serial 36
+# serial 37
 dnl Copyright (C) 2002, 2004-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -230,10 +230,11 @@ AC_DEFUN([gl_FILE_HAS_ACL],
 AC_DEFUN([gl_QCOPY_ACL],
 [
   AC_REQUIRE([gl_FUNC_ACL])
+  AC_REQUIRE([gl_FILE_HAS_ACL])
   AC_CHECK_HEADERS_ONCE([linux/xattr.h])
   gl_FUNC_XATTR
   if test "$use_xattr" = yes; then
-    QCOPY_ACL_LIB="$LIB_XATTR"
+    QCOPY_ACL_LIB="$LIB_XATTR $FILE_HAS_ACL_LIB"
   else
     QCOPY_ACL_LIB="$LIB_ACL"
   fi
diff --git a/modules/acl-tests b/modules/acl-tests
index c77ca16361..5add9405bc 100644
--- a/modules/acl-tests
+++ b/modules/acl-tests
@@ -26,5 +26,5 @@ TESTS += \
 TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
 check_PROGRAMS += test-set-mode-acl test-copy-acl test-sameacls
 test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) $(LIBUNISTRING) @LIBINTL@ $(MBRTOWC_LIB) $(LIBC32CONV)
-test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) $(QCOPY_ACL_LIB) $(FILE_HAS_ACL_LIB) $(LIBUNISTRING) @LIBINTL@ $(MBRTOWC_LIB) $(LIBC32CONV)
+test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) $(QCOPY_ACL_LIB) $(LIBUNISTRING) @LIBINTL@ $(MBRTOWC_LIB) $(LIBC32CONV)
 test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(MBRTOWC_LIB)