diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2023-01-06 17:53:54 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2023-01-06 18:05:57 -0800 |
| commit | 9e98ff562b4b8f2dae92bd4c64d15934c7d5877f (patch) | |
| tree | f37ce6d03a710f541fbbe72b9533a05d1a63103f /m4/acl.m4 | |
| parent | 2f05f48918ecf6e59b330709b09a36f81f7b6c48 (diff) | |
| download | emacs-9e98ff562b4b8f2dae92bd4c64d15934c7d5877f.tar.gz | |
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'm4/acl.m4')
| -rw-r--r-- | m4/acl.m4 | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/m4/acl.m4 b/m4/acl.m4 index 98362858ce5..6c2db7d3203 100644 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -1,5 +1,5 @@ # acl.m4 - check for access control list (ACL) primitives -# serial 24 +# serial 25 # Copyright (C) 2002, 2004-2023 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -139,7 +139,10 @@ int type = ACL_TYPE_EXTENDED;]])], AC_MSG_WARN([AC_PACKAGE_NAME will be built without ACL support.]) fi fi - test -n "$gl_need_lib_has_acl" && LIB_HAS_ACL=$LIB_ACL + 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], [Define to nonzero if you want access control list support.]) @@ -197,15 +200,18 @@ AC_DEFUN([gl_FILE_HAS_ACL], [gl_cv_getxattr_with_posix_acls=yes])]) fi if test "$gl_cv_getxattr_with_posix_acls" = yes; then - LIB_HAS_ACL= + FILE_HAS_ACL_LIB= AC_DEFINE([GETXATTR_WITH_POSIX_ACLS], 1, [Define to 1 if getxattr works with XATTR_NAME_POSIX_ACL_ACCESS and XATTR_NAME_POSIX_ACL_DEFAULT.]) else dnl Set gl_need_lib_has_acl to a nonempty value, so that any - dnl later gl_FUNC_ACL call will set LIB_HAS_ACL=$LIB_ACL. + dnl later gl_FUNC_ACL call will set FILE_HAS_ACL_LIB=$LIB_ACL. gl_need_lib_has_acl=1 - LIB_HAS_ACL=$LIB_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]) ]) |