summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-04-24 17:41:05 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-04-24 17:42:09 -0700
commit2bf957394cdcb93396966d3289f5e200886cb424 (patch)
tree99f1f3af3c339638cfd622ec7fd1949ff1c3e3e0 /lib
parent445713f55561df9a9755ce13eec0c0324b1754c2 (diff)
downloademacs-2bf957394cdcb93396966d3289f5e200886cb424.tar.gz
Improve port to platforms lacking euidaccess (Bug#35406)
* lib-src/emacsclient.c (set_local_socket): Use faccessat with AT_EACCESS instead of using euidaccess. * admin/merge-gnulib, lib/gnulib.mk.in, m4/gnulib-comp.m4: Revert previous change.
Diffstat (limited to 'lib')
-rw-r--r--lib/gnulib.mk.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 165405f2499..ade4ff8ebdb 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -88,7 +88,6 @@
# dtotimespec \
# dup2 \
# environ \
-# euidaccess \
# execinfo \
# explicit_bzero \
# faccessat \
@@ -1492,7 +1491,9 @@ endif
## begin gnulib module euidaccess
ifeq (,$(OMIT_GNULIB_MODULE_euidaccess))
+ifneq (,$(gl_GNULIB_ENABLED_euidaccess))
+endif
EXTRA_DIST += euidaccess.c
EXTRA_libgnu_a_SOURCES += euidaccess.c
@@ -2148,7 +2149,9 @@ endif
## begin gnulib module root-uid
ifeq (,$(OMIT_GNULIB_MODULE_root-uid))
+ifneq (,$(gl_GNULIB_ENABLED_6099e9737f757db36c47fa9d9f02e88c))
+endif
EXTRA_DIST += root-uid.h
endif