summaryrefslogtreecommitdiff
path: root/m4/gettime.m4
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2023-01-13 19:32:47 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2023-01-13 20:03:54 -0800
commit99120491730c5839a5ba15ded187d481af1e71a7 (patch)
tree8473e9b735fdc25d01fa5dc65ae2884250b23d89 /m4/gettime.m4
parentdce42f556177e4e0f15daccb3c2f27a47f2beebb (diff)
downloademacs-99120491730c5839a5ba15ded187d481af1e71a7.tar.gz
Update from Gnulib by running admin/merge-gnulib
This adds a new file m4/xattr.m4 from Gnulib, for NFS v4 attribute copying. Also, do these changes by hand: * configure.ac: Mention $LIB_XATTR" in ACL summary. * src/Makefile.in (QCOPY_ACL_LIB): New macro. (LIBES): Use it.
Diffstat (limited to 'm4/gettime.m4')
-rw-r--r--m4/gettime.m431
1 files changed, 19 insertions, 12 deletions
diff --git a/m4/gettime.m4 b/m4/gettime.m4
index 06f32fe26c2..7e353fcd00e 100644
--- a/m4/gettime.m4
+++ b/m4/gettime.m4
@@ -1,4 +1,4 @@
-# gettime.m4 serial 12
+# gettime.m4 serial 13
dnl Copyright (C) 2002, 2004-2006, 2009-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -26,17 +26,24 @@ AC_DEFUN([gl_CHECK_FUNC_TIMESPEC_GET],
dnl We can't use AC_CHECK_FUNC here, because timespec_get() is defined as a
dnl static inline function in <time.h> on MSVC 14.
- AC_CACHE_CHECK([for timespec_get], [gl_cv_func_timespec_get],
- [AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <time.h>
- struct timespec ts;
- ]],
- [[return timespec_get (&ts, 0);]])
- ],
- [gl_cv_func_timespec_get=yes],
- [gl_cv_func_timespec_get=no])
- ])
+ dnl But at the same time, we need to notice a missing declaration, like
+ dnl gl_CHECK_FUNCS_ANDROID does.
+ AC_CHECK_DECL([timespec_get], , , [[#include <time.h>]])
+ if test $ac_cv_have_decl_timespec_get = yes; then
+ AC_CACHE_CHECK([for timespec_get], [gl_cv_func_timespec_get],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <time.h>
+ struct timespec ts;
+ ]],
+ [[return timespec_get (&ts, 0);]])
+ ],
+ [gl_cv_func_timespec_get=yes],
+ [gl_cv_func_timespec_get=no])
+ ])
+ else
+ gl_cv_func_timespec_get=no
+ fi
])
AC_DEFUN([gl_GETTIME_RES],