diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-05-07 14:34:03 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-05-07 14:34:03 -0700 |
| commit | ffdc270a762ee93261f133632a9f82ea6ace9424 (patch) | |
| tree | c1eacab0759fb3725a6fc99a089cc8f3f78644ac /m4/gnulib-comp.m4 | |
| parent | ad64371062c05222227d7d573075c81b1f046630 (diff) | |
| download | emacs-ffdc270a762ee93261f133632a9f82ea6ace9424.tar.gz | |
Use Gnulib ACL implementation, for benefit of Solaris etc.
* 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
Diffstat (limited to 'm4/gnulib-comp.m4')
| -rw-r--r-- | m4/gnulib-comp.m4 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index d304f10b76f..344b77642b9 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -56,6 +56,7 @@ AC_DEFUN([gl_EARLY], # Code from module dtotimespec: # Code from module dup2: # Code from module environ: + # Code from module errno: # Code from module euidaccess: # Code from module execinfo: # Code from module extensions: @@ -94,6 +95,7 @@ AC_DEFUN([gl_EARLY], # Code from module pselect: # Code from module pthread_sigmask: # Code from module putenv: + # Code from module qacl: # Code from module readlink: # Code from module readlinkat: # Code from module root-uid: @@ -179,6 +181,7 @@ AC_DEFUN([gl_INIT], gl_UNISTD_MODULE_INDICATOR([dup2]) gl_ENVIRON gl_UNISTD_MODULE_INDICATOR([environ]) + gl_HEADER_ERRNO_H gl_EXECINFO_H AC_REQUIRE([gl_EXTERN_INLINE]) gl_FUNC_FACCESSAT @@ -287,6 +290,7 @@ AC_DEFUN([gl_INIT], gl_PREREQ_PUTENV fi gl_STDLIB_MODULE_INDICATOR([putenv]) + gl_FUNC_ACL gl_FUNC_READLINK if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then AC_LIBOBJ([readlink]) @@ -733,6 +737,10 @@ AC_DEFUN([gl_FILE_LIST], [ build-aux/snippet/arg-nonnull.h build-aux/snippet/c++defs.h build-aux/snippet/warn-on-use.h + lib/acl-errno-valid.c + lib/acl-internal.h + lib/acl.h + lib/acl_entries.c lib/alloca.in.h lib/allocator.c lib/allocator.h @@ -751,6 +759,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/dtoastr.c lib/dtotimespec.c lib/dup2.c + lib/errno.in.h lib/euidaccess.c lib/execinfo.c lib/execinfo.in.h @@ -758,6 +767,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/fcntl.in.h lib/fdatasync.c lib/fdopendir.c + lib/file-has-acl.c lib/filemode.c lib/filemode.h lib/fpending.c @@ -792,6 +802,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/pselect.c lib/pthread_sigmask.c lib/putenv.c + lib/qcopy-acl.c + lib/qset-acl.c lib/readlink.c lib/readlinkat.c lib/root-uid.h @@ -843,6 +855,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/verify.h lib/xalloc-oversized.h m4/00gnulib.m4 + m4/acl.m4 m4/alloca.m4 m4/c-strtod.m4 m4/clock_time.m4 @@ -850,6 +863,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/dirent_h.m4 m4/dup2.m4 m4/environ.m4 + m4/errno_h.m4 m4/euidaccess.m4 m4/execinfo.m4 m4/extensions.m4 |