diff options
| author | Paul Eggert | 2016-08-03 15:10:58 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-08-03 15:12:06 -0700 |
| commit | 7f9721d3990155bae83e4e4840f0ff4913868d50 (patch) | |
| tree | 6c7283459b89571444694523e3431834b1952f92 /m4 | |
| parent | 967e2ef61dab8d2046f3285eefa71f3dcb9d9b60 (diff) | |
| download | emacs-7f9721d3990155bae83e4e4840f0ff4913868d50.tar.gz emacs-7f9721d3990155bae83e4e4840f0ff4913868d50.zip | |
Update from gnulib
This incorporates:
2016-07-03 mktime: call tzset as per POSIX
* doc/misc/texinfo.tex, lib/mktime.c, m4/mktime.m4:
Copy from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/mktime.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 5a0f2d88ab0..23cad732ff4 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # serial 26 | 1 | # serial 27 |
| 2 | dnl Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation, | 2 | dnl Copyright (C) 2002-2003, 2005-2007, 2009-2016 Free Software Foundation, |
| 3 | dnl Inc. | 3 | dnl Inc. |
| 4 | dnl This file is free software; the Free Software Foundation | 4 | dnl This file is free software; the Free Software Foundation |
| @@ -30,6 +30,7 @@ AC_DEFUN([gl_FUNC_MKTIME], | |||
| 30 | dnl in Autoconf and because it invokes AC_LIBOBJ. | 30 | dnl in Autoconf and because it invokes AC_LIBOBJ. |
| 31 | AC_CHECK_HEADERS_ONCE([unistd.h]) | 31 | AC_CHECK_HEADERS_ONCE([unistd.h]) |
| 32 | AC_CHECK_DECLS_ONCE([alarm]) | 32 | AC_CHECK_DECLS_ONCE([alarm]) |
| 33 | AC_CHECK_FUNCS_ONCE([tzset]) | ||
| 33 | AC_REQUIRE([gl_MULTIARCH]) | 34 | AC_REQUIRE([gl_MULTIARCH]) |
| 34 | if test $APPLE_UNIVERSAL_BUILD = 1; then | 35 | if test $APPLE_UNIVERSAL_BUILD = 1; then |
| 35 | # A universal build on Apple Mac OS X platforms. | 36 | # A universal build on Apple Mac OS X platforms. |