From c551997131a8f1f8f648d39c2d7d5e8db026a139 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 6 Jan 2023 17:25:02 -0800
Subject: [PATCH] =?UTF-8?q?file-has-acl:=20don=E2=80=99t=20bother=20settin?=
 =?UTF-8?q?g=20LIB=5FHAS=5FACL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* m4/acl.m4 (gl_FUNC_ACL, gl_FILE_HAS_ACL): Don’t set LIB_HAS_ACL.
I think only Coreutils and Tar used it, and I’ve updated them.
---
 ChangeLog | 4 ++++
 NEWS      | 2 ++
 m4/acl.m4 | 6 +-----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b85b8ec5bb..f531198fbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2023-01-06  Paul Eggert  <eggert@cs.ucla.edu>
 
+	file-has-acl: don’t bother setting LIB_HAS_ACL
+	* m4/acl.m4 (gl_FUNC_ACL, gl_FILE_HAS_ACL): Don’t set LIB_HAS_ACL.
+	I think only Coreutils and Tar used it, and I’ve updated them.
+
 	bootstrap: suppress stray message from --pull
 	* build-aux/bootstrap: Regenerate.
 	* top/bootstrap-funclib.sh (autopull): Suggest running autogen.sh
diff --git a/NEWS b/NEWS
index 16eac4c7df..65dcce7590 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,8 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2023-01-06  file-has-acl    Link with $(FILE_HAS_ACL_LIB), not $(LIB_HAS_ACL).
+
 2022-12-25  largefile       configure no longer enables year-2038 support,
                             unless you configure with --enable-year2038
                             or use the year2038 module.  This temporary
diff --git a/m4/acl.m4 b/m4/acl.m4
index 6c2db7d320..e612f1ae34 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,5 +1,5 @@
 # acl.m4 - check for access control list (ACL) primitives
-# serial 25
+# serial 26
 
 # Copyright (C) 2002, 2004-2023 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -141,7 +141,6 @@ int type = ACL_TYPE_EXTENDED;]])],
   fi
   if test -n "$gl_need_lib_has_acl"; then
     FILE_HAS_ACL_LIB=$LIB_ACL
-    LIB_HAS_ACL="$FILE_HAS_ACL_LIB"
   fi
   AC_SUBST([LIB_ACL])
   AC_DEFINE_UNQUOTED([USE_ACL], [$use_acl],
@@ -211,7 +210,4 @@ AC_DEFUN([gl_FILE_HAS_ACL],
     FILE_HAS_ACL_LIB=$LIB_ACL
   fi
   AC_SUBST([FILE_HAS_ACL_LIB])
-  dnl For backward compatibility (e.g. coreutils still uses LIB_HAS_ACL).
-  LIB_HAS_ACL="$FILE_HAS_ACL_LIB"
-  AC_SUBST([LIB_HAS_ACL])
 ])
-- 
2.37.2