diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-25 22:28:31 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-11-25 22:48:09 -0800 |
| commit | 8be3aee2813f528b02bc913ca4d79e34e72b1754 (patch) | |
| tree | af1e8e35cedfe601076eade046a1a12303b93e84 /m4/faccessat.m4 | |
| parent | 265cee553f9d59a989d92e28865f6cc6fc02dcc9 (diff) | |
| download | emacs-8be3aee2813f528b02bc913ca4d79e34e72b1754.tar.gz | |
Merge from Gnulib
This incorporates:
2017-11-23 stat: work around Solaris bug with tv_nsec < 0
2017-11-12 maint: shorten https://lists.gnu.org/archive/html/... links
* build-aux/config.sub, doc/misc/texinfo.tex, lib/allocator.h:
* lib/fstatat.c, lib/intprops.h, lib/lstat.c, lib/signal.in.h:
* lib/stat-time.h, lib/stdio-impl.h, lib/stdio.in.h:
* lib/timespec.h, m4/alloca.m4, m4/extern-inline.m4:
* m4/faccessat.m4, m4/fstatat.m4, m4/gnulib-common.m4:
* m4/lstat.m4, m4/std-gnu11.m4, m4/sys_types_h.m4:
* m4/vararrays.m4:
Copy from Gnulib.
Diffstat (limited to 'm4/faccessat.m4')
| -rw-r--r-- | m4/faccessat.m4 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/m4/faccessat.m4 b/m4/faccessat.m4 index f4cb49d166c..c64545abd46 100644 --- a/m4/faccessat.m4 +++ b/m4/faccessat.m4 @@ -1,4 +1,4 @@ -# serial 7 +# serial 8 # See if we need to provide faccessat replacement. dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. @@ -11,6 +11,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FACCESSAT], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) dnl Persuade glibc <unistd.h> to declare faccessat(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) @@ -18,8 +19,11 @@ AC_DEFUN([gl_FUNC_FACCESSAT], AC_CHECK_FUNCS_ONCE([faccessat]) if test $ac_cv_func_faccessat = no; then HAVE_FACCESSAT=0 - elif test "$gl_cv_func_lstat_dereferences_slashed_symlink" != yes; then - REPLACE_FACCESSAT=1 + else + case "$gl_cv_func_lstat_dereferences_slashed_symlink" in + *yes) ;; + *) REPLACE_FACCESSAT=1 ;; + esac fi ]) |