From: Bruno Haible Date: Mon, 30 Sep 2024 12:16:28 +0000 (+0200) Subject: file-has-acl: Fix compilation error (regression yesterday). X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c4e6d695b9f970eb312fa6664a7876dd693e7f06;p=gnulib.git file-has-acl: Fix compilation error (regression yesterday). * m4/acl.m4 (gl_FILE_HAS_ACL): Require, not invoke, gl_CHECK_HEADER_SELINUX_SELINUX_H. --- diff --git a/ChangeLog b/ChangeLog index 3368abacb4..d670b9fe59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-09-30 Bruno Haible + + file-has-acl: Fix compilation error (regression yesterday). + * m4/acl.m4 (gl_FILE_HAS_ACL): Require, not invoke, + gl_CHECK_HEADER_SELINUX_SELINUX_H. + 2024-09-29 Paul Eggert file-has-acl: new function file_has_aclinfo diff --git a/m4/acl.m4 b/m4/acl.m4 index 4328bd20a1..69135f9884 100644 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -1,5 +1,5 @@ # acl.m4 -# serial 32 +# serial 33 dnl Copyright (C) 2002, 2004-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -214,8 +214,8 @@ AC_DEFUN([gl_FILE_HAS_ACL], AS_CASE([$enable_acl,$with_selinux,$ac_cv_header_linux_xattr_h,$ac_cv_func_listxattr], [no,* | *,no,*], [], [*,*,yes,yes], - [gl_CHECK_HEADER_SELINUX_SELINUX_H - AS_IF([test "$USE_SELINUX_SELINUX_H" -ne 0 ], + [AC_REQUIRE([gl_CHECK_HEADER_SELINUX_SELINUX_H]) + AS_IF([test $USE_SELINUX_SELINUX_H = 1], [FILE_HAS_ACL_LIB="$FILE_HAS_ACL_LIB $LIB_SELINUX" gl_file_has_acl_uses_selinux=yes])])