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 /lib/makefile.w32-in | |
| 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 'lib/makefile.w32-in')
| -rw-r--r-- | lib/makefile.w32-in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index cd62fbcd13d..5e2083aed1e 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in @@ -23,7 +23,8 @@ ALL = gnulib LOCAL_FLAGS = -I. -I../nt/inc -I../src LIBS = -GNULIBOBJS = $(BLD)/c-ctype.$(O) \ +GNULIBOBJS = $(BLD)/acl-errno-valid.$(O) \ + $(BLD)/c-ctype.$(O) \ $(BLD)/c-strcasecmp.$(O) \ $(BLD)/c-strncasecmp.$(O) \ $(BLD)/close-stream.$(O) \ @@ -109,6 +110,12 @@ SIG2STR_H = $(GNU_LIB)/sig2str.h \ STAT_TIME_H = $(GNU_LIB)/stat-time.h \ $(NT_INC)/sys/stat.h +$(BLD)/acl-errno-valid.$(O) : \ + $(GNU_LIB)/acl-errno-valid.c \ + $(CONFIG_H) \ + $(GNU_LIB)/acl.h \ + $(NT_INC)/stdbool.h + $(BLD)/c-ctype.$(O) : \ $(GNU_LIB)/c-ctype.c \ $(CONFIG_H) \ |