aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorPaul Eggert2017-09-29 21:55:32 -0700
committerPaul Eggert2017-09-29 21:56:21 -0700
commit3ab2f9bbb96d0425a9396e08b2f462de3fd7818d (patch)
treee650d013464a12567ec4ea5a137b25cdf6c1179c /m4
parentcbc832448878f7bc7b226243abb8d8b1ae68a937 (diff)
downloademacs-3ab2f9bbb96d0425a9396e08b2f462de3fd7818d.tar.gz
emacs-3ab2f9bbb96d0425a9396e08b2f462de3fd7818d.zip
Merge from gnulib
This incorporates: 2017-09-28 string: code style 2017-09-25 sys_types: update URL 2017-09-23 install-sh: do not assume / = // 2017-09-21 mktime: port to OpenVMS * build-aux/install-sh, m4/mktime.m4, m4/string_h.m4: * m4/sys_types_h.m4: Copy from Gnulib. * lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'm4')
-rw-r--r--m4/mktime.m46
-rw-r--r--m4/string_h.m412
-rw-r--r--m4/sys_types_h.m44
3 files changed, 13 insertions, 9 deletions
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 85666844e2e..1461905fb93 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,4 +1,4 @@
1# serial 29 1# serial 30
2dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation, 2dnl Copyright (C) 2002-2003, 2005-2007, 2009-2017 Free Software Foundation,
3dnl Inc. 3dnl Inc.
4dnl This file is free software; the Free Software Foundation 4dnl This file is free software; the Free Software Foundation
@@ -55,6 +55,10 @@ AC_DEFUN([gl_FUNC_MKTIME_WORKS],
55# include <signal.h> 55# include <signal.h>
56#endif 56#endif
57 57
58#ifndef TIME_T_IS_SIGNED
59# define TIME_T_IS_SIGNED 0
60#endif
61
58/* Work around redefinition to rpl_putenv by other config tests. */ 62/* Work around redefinition to rpl_putenv by other config tests. */
59#undef putenv 63#undef putenv
60 64
diff --git a/m4/string_h.m4 b/m4/string_h.m4
index ac6311fba07..8c42cf1b851 100644
--- a/m4/string_h.m4
+++ b/m4/string_h.m4
@@ -5,7 +5,7 @@
5# gives unlimited permission to copy and/or distribute it, 5# gives unlimited permission to copy and/or distribute it,
6# with or without modifications, as long as this notice is preserved. 6# with or without modifications, as long as this notice is preserved.
7 7
8# serial 21 8# serial 22
9 9
10# Written by Paul Eggert. 10# Written by Paul Eggert.
11 11
@@ -107,16 +107,16 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS],
107 REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR]) 107 REPLACE_MEMCHR=0; AC_SUBST([REPLACE_MEMCHR])
108 REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM]) 108 REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM])
109 REPLACE_STPNCPY=0; AC_SUBST([REPLACE_STPNCPY]) 109 REPLACE_STPNCPY=0; AC_SUBST([REPLACE_STPNCPY])
110 REPLACE_STRCHRNUL=0; AC_SUBST([REPLACE_STRCHRNUL])
110 REPLACE_STRDUP=0; AC_SUBST([REPLACE_STRDUP]) 111 REPLACE_STRDUP=0; AC_SUBST([REPLACE_STRDUP])
112 REPLACE_STRNCAT=0; AC_SUBST([REPLACE_STRNCAT])
113 REPLACE_STRNDUP=0; AC_SUBST([REPLACE_STRNDUP])
114 REPLACE_STRNLEN=0; AC_SUBST([REPLACE_STRNLEN])
111 REPLACE_STRSTR=0; AC_SUBST([REPLACE_STRSTR]) 115 REPLACE_STRSTR=0; AC_SUBST([REPLACE_STRSTR])
112 REPLACE_STRCASESTR=0; AC_SUBST([REPLACE_STRCASESTR]) 116 REPLACE_STRCASESTR=0; AC_SUBST([REPLACE_STRCASESTR])
113 REPLACE_STRCHRNUL=0; AC_SUBST([REPLACE_STRCHRNUL]) 117 REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R])
114 REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) 118 REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR])
115 REPLACE_STRERROR_R=0; AC_SUBST([REPLACE_STRERROR_R]) 119 REPLACE_STRERROR_R=0; AC_SUBST([REPLACE_STRERROR_R])
116 REPLACE_STRNCAT=0; AC_SUBST([REPLACE_STRNCAT])
117 REPLACE_STRNDUP=0; AC_SUBST([REPLACE_STRNDUP])
118 REPLACE_STRNLEN=0; AC_SUBST([REPLACE_STRNLEN])
119 REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL]) 120 REPLACE_STRSIGNAL=0; AC_SUBST([REPLACE_STRSIGNAL])
120 REPLACE_STRTOK_R=0; AC_SUBST([REPLACE_STRTOK_R])
121 UNDEFINE_STRTOK_R=0; AC_SUBST([UNDEFINE_STRTOK_R]) 121 UNDEFINE_STRTOK_R=0; AC_SUBST([UNDEFINE_STRTOK_R])
122]) 122])
diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4
index 06268cfb2db..de56d04fc15 100644
--- a/m4/sys_types_h.m4
+++ b/m4/sys_types_h.m4
@@ -1,4 +1,4 @@
1# sys_types_h.m4 serial 8 1# sys_types_h.m4 serial 9
2dnl Copyright (C) 2011-2017 Free Software Foundation, Inc. 2dnl Copyright (C) 2011-2017 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation 3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it, 4dnl gives unlimited permission to copy and/or distribute it,
@@ -40,7 +40,7 @@ AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
40m4_version_prereq([2.70], [], [ 40m4_version_prereq([2.70], [], [
41 41
42# This is taken from the following Autoconf patch: 42# This is taken from the following Autoconf patch:
43# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=e17a30e987d7ee695fb4294a82d987ec3dc9b974 43# https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=e17a30e987d7ee695fb4294a82d987ec3dc9b974
44 44
45m4_undefine([AC_HEADER_MAJOR]) 45m4_undefine([AC_HEADER_MAJOR])
46AC_DEFUN([AC_HEADER_MAJOR], 46AC_DEFUN([AC_HEADER_MAJOR],