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/lstat.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/lstat.m4')
-rw-r--r-- | m4/lstat.m4 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/m4/lstat.m4 b/m4/lstat.m4 index 0b6e5d70cba..6ba18cec574 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,4 +1,4 @@ -# serial 29 +# serial 30 # Copyright (C) 1997-2001, 2003-2017 Free Software Foundation, Inc. # @@ -10,14 +10,15 @@ dnl From Jim Meyering. AC_DEFUN([gl_FUNC_LSTAT], [ + AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) dnl If lstat does not exist, the replacement <sys/stat.h> does dnl "#define lstat stat", and lstat.c is a no-op. AC_CHECK_FUNCS_ONCE([lstat]) if test $ac_cv_func_lstat = yes; then AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) - case "$gl_cv_func_lstat_dereferences_slashed_symlink" in - *no) + case $host_os,$gl_cv_func_lstat_dereferences_slashed_symlink in + solaris* | *no) REPLACE_LSTAT=1 ;; esac |