mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-29 07:58:28 +00:00
ffdc270a76
* configure.ac: Remove -with-acl option, since Gnulib does that for us now. (LIBACL_LIBS): Remove; no longer needed. * lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros, for the benefit of the new ACL implementation. * lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O). ($(BLD)/acl-errno-valid.$(O)): New rule. * lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h: * lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c: * lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4: New files, taken from gnulib. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * admin/merge-gnulib (GNULIB_MODULES): Add qacl. (GNULIB_TOOL_FLAGS): Do not avoid errno. * etc/NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl, not --without-acl, since we're now using Gnulib's implementation. * nt/config.nt (HAVE_ACL_SET_FILE): Rename from HAVE_POSIX_ACL. * nt/inc/ms-w32.h (EOPNOTSUPP): New macro. * src/Makefile.in (LIB_ACL): New macro. (LIBACL_LIBS): Remove. (LIBES): Use LIB_ACL, not LIBACL_LIBS. * src/fileio.c: Include <acl.h>. Use HAVE_ACL_SET_FILE rather than HAVE_POSIX_ACL. (ACL_NOT_WELL_SUPPORTED): Remove. All uses replaced by !acl_errno_valid. (Fcopy_file) [!WINDOWSNT]: Use qcopy_acl instead of rolling it ourselves. Fixes: debbugs:14295
165 lines
5.7 KiB
Plaintext
165 lines
5.7 KiB
Plaintext
# acl.m4 - check for access control list (ACL) primitives
|
|
# serial 15
|
|
|
|
# Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc.
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
# Written by Paul Eggert and Jim Meyering.
|
|
|
|
AC_DEFUN([gl_FUNC_ACL],
|
|
[
|
|
AC_ARG_ENABLE([acl],
|
|
AS_HELP_STRING([--disable-acl], [do not support ACLs]),
|
|
, [enable_acl=auto])
|
|
|
|
LIB_ACL=
|
|
use_acl=0
|
|
if test "x$enable_acl" != "xno"; then
|
|
dnl On all platforms, the ACL related API is declared in <sys/acl.h>.
|
|
AC_CHECK_HEADERS([sys/acl.h])
|
|
if test $ac_cv_header_sys_acl_h = yes; then
|
|
ac_save_LIBS=$LIBS
|
|
|
|
dnl Test for POSIX-draft-like API (Linux, FreeBSD, Mac OS X, IRIX, Tru64).
|
|
dnl -lacl is needed on Linux, -lpacl is needed on OSF/1.
|
|
if test $use_acl = 0; then
|
|
AC_SEARCH_LIBS([acl_get_file], [acl pacl],
|
|
[if test "$ac_cv_search_acl_get_file" != "none required"; then
|
|
LIB_ACL=$ac_cv_search_acl_get_file
|
|
fi
|
|
AC_CHECK_FUNCS(
|
|
[acl_get_file acl_get_fd acl_set_file acl_set_fd \
|
|
acl_free acl_from_mode acl_from_text \
|
|
acl_delete_def_file acl_extended_file \
|
|
acl_delete_fd_np acl_delete_file_np \
|
|
acl_copy_ext_native acl_create_entry_np \
|
|
acl_to_short_text acl_free_text])
|
|
# If the acl_get_file bug is detected, don't enable the ACL support.
|
|
gl_ACL_GET_FILE([use_acl=1], [])
|
|
if test $use_acl = 1; then
|
|
dnl On Linux, additional API is declared in <acl/libacl.h>.
|
|
AC_CHECK_HEADERS([acl/libacl.h])
|
|
AC_REPLACE_FUNCS([acl_entries])
|
|
AC_CACHE_CHECK([for ACL_FIRST_ENTRY],
|
|
[gl_cv_acl_ACL_FIRST_ENTRY],
|
|
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
|
|
[[#include <sys/types.h>
|
|
#include <sys/acl.h>
|
|
int type = ACL_FIRST_ENTRY;]])],
|
|
[gl_cv_acl_ACL_FIRST_ENTRY=yes],
|
|
[gl_cv_acl_ACL_FIRST_ENTRY=no])])
|
|
if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then
|
|
AC_DEFINE([HAVE_ACL_FIRST_ENTRY], [1],
|
|
[Define to 1 if the constant ACL_FIRST_ENTRY exists.])
|
|
fi
|
|
dnl On Mac OS X, other types of ACLs are supported.
|
|
AC_CACHE_CHECK([for ACL_TYPE_EXTENDED],
|
|
[gl_cv_acl_ACL_TYPE_EXTENDED],
|
|
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
|
|
[[#include <sys/types.h>
|
|
#include <sys/acl.h>
|
|
int type = ACL_TYPE_EXTENDED;]])],
|
|
[gl_cv_acl_ACL_TYPE_EXTENDED=yes],
|
|
[gl_cv_acl_ACL_TYPE_EXTENDED=no])])
|
|
if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then
|
|
AC_DEFINE([HAVE_ACL_TYPE_EXTENDED], [1],
|
|
[Define to 1 if the ACL type ACL_TYPE_EXTENDED exists.])
|
|
fi
|
|
else
|
|
LIB_ACL=
|
|
fi
|
|
])
|
|
fi
|
|
|
|
dnl Test for Solaris API (Solaris, Cygwin).
|
|
if test $use_acl = 0; then
|
|
AC_CHECK_FUNCS([facl])
|
|
if test $ac_cv_func_facl = yes; then
|
|
AC_SEARCH_LIBS([acl_trivial], [sec],
|
|
[if test "$ac_cv_search_acl_trivial" != "none required"; then
|
|
LIB_ACL=$ac_cv_search_acl_trivial
|
|
fi
|
|
])
|
|
AC_CHECK_FUNCS([acl_trivial])
|
|
use_acl=1
|
|
fi
|
|
fi
|
|
|
|
dnl Test for HP-UX API.
|
|
if test $use_acl = 0; then
|
|
AC_CHECK_FUNCS([getacl])
|
|
if test $ac_cv_func_getacl = yes; then
|
|
use_acl=1
|
|
fi
|
|
dnl Test for HP-UX 11.11 API.
|
|
AC_CHECK_HEADERS([aclv.h], [], [], [#include <sys/types.h>])
|
|
fi
|
|
|
|
dnl Test for AIX API (AIX 5.3 or newer).
|
|
if test $use_acl = 0; then
|
|
AC_CHECK_FUNCS([aclx_get])
|
|
if test $ac_cv_func_aclx_get = yes; then
|
|
use_acl=1
|
|
fi
|
|
fi
|
|
|
|
dnl Test for older AIX API.
|
|
if test $use_acl = 0 || test "$ac_cv_func_aclx_get" = yes; then
|
|
AC_CHECK_FUNCS([statacl])
|
|
if test $ac_cv_func_statacl = yes; then
|
|
use_acl=1
|
|
fi
|
|
fi
|
|
|
|
dnl Test for NonStop Kernel API.
|
|
if test $use_acl = 0; then
|
|
AC_CHECK_FUNCS([aclsort])
|
|
if test $ac_cv_func_aclsort = yes; then
|
|
use_acl=1
|
|
fi
|
|
fi
|
|
|
|
LIBS=$ac_save_LIBS
|
|
fi
|
|
if test "x$enable_acl$use_acl" = "xyes0"; then
|
|
AC_MSG_ERROR([ACLs enabled but support not detected])
|
|
elif test "x$enable_acl$use_acl" = "xauto0"; then
|
|
AC_MSG_WARN([libacl development library was not found or not usable.])
|
|
AC_MSG_WARN([AC_PACKAGE_NAME will be built without ACL support.])
|
|
fi
|
|
fi
|
|
AC_SUBST([LIB_ACL])
|
|
AC_DEFINE_UNQUOTED([USE_ACL], [$use_acl],
|
|
[Define to nonzero if you want access control list support.])
|
|
USE_ACL=$use_acl
|
|
AC_SUBST([USE_ACL])
|
|
])
|
|
|
|
# gl_ACL_GET_FILE(IF-WORKS, IF-NOT)
|
|
# -------------------------------------
|
|
# If 'acl_get_file' works (does not have a particular bug),
|
|
# run IF-WORKS, otherwise, IF-NOT.
|
|
# This tests for a Darwin 8.7.0 bug, whereby acl_get_file returns NULL,
|
|
# but sets errno = ENOENT for an existing file or directory.
|
|
AC_DEFUN([gl_ACL_GET_FILE],
|
|
[
|
|
AC_CACHE_CHECK([for working acl_get_file], [gl_cv_func_working_acl_get_file],
|
|
[AC_RUN_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <sys/types.h>
|
|
#include <sys/acl.h>
|
|
#include <errno.h>
|
|
]],
|
|
[[if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT)
|
|
return 1;
|
|
return 0;
|
|
]])],
|
|
[gl_cv_func_working_acl_get_file=yes],
|
|
[gl_cv_func_working_acl_get_file=no],
|
|
[gl_cv_func_working_acl_get_file=cross-compiling])])
|
|
|
|
AS_IF([test $gl_cv_func_working_acl_get_file = yes], [$1], [$2])
|
|
])
|