aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorPaul Eggert2018-08-27 18:59:46 -0700
committerPaul Eggert2018-08-27 19:00:14 -0700
commitf1acdff5e04df90821732333c1bb9d8f586f08d2 (patch)
tree71b9a449169d96a7eaeb1bf07d0f14327cf9bfa0 /m4
parent717b0341aafb9ae9b93395dba1192b12c4459f0c (diff)
downloademacs-f1acdff5e04df90821732333c1bb9d8f586f08d2.tar.gz
emacs-f1acdff5e04df90821732333c1bb9d8f586f08d2.zip
Update from Gnulib
* build-aux/config.sub, lib/intprops.h, lib/regex_internal.c: * lib/regex_internal.h, lib/unistd.in.h, m4/limits-h.m4: * m4/stdint.m4, m4/unistd_h.m4: Copy from Gnulib. * lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'm4')
-rw-r--r--m4/limits-h.m48
-rw-r--r--m4/stdint.m45
-rw-r--r--m4/unistd_h.m47
3 files changed, 15 insertions, 5 deletions
diff --git a/m4/limits-h.m4 b/m4/limits-h.m4
index 511dcef5e04..83886634396 100644
--- a/m4/limits-h.m4
+++ b/m4/limits-h.m4
@@ -29,3 +29,11 @@ AC_DEFUN_ONCE([gl_LIMITS_H],
29 AC_SUBST([LIMITS_H]) 29 AC_SUBST([LIMITS_H])
30 AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) 30 AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
31]) 31])
32
33dnl Unconditionally enables the replacement of <limits.h>.
34AC_DEFUN([gl_REPLACE_LIMITS_H],
35[
36 AC_REQUIRE([gl_LIMITS_H])
37 LIMITS_H='limits.h'
38 AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
39])
diff --git a/m4/stdint.m4 b/m4/stdint.m4
index b86184c2ea6..38dbbedffec 100644
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,4 +1,4 @@
1# stdint.m4 serial 51 1# stdint.m4 serial 52
2dnl Copyright (C) 2001-2018 Free Software Foundation, Inc. 2dnl Copyright (C) 2001-2018 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,
@@ -364,8 +364,7 @@ int32_t i32 = INT32_C (0x7fffffff);
364 esac 364 esac
365 365
366 dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. 366 dnl The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH.
367 LIMITS_H=limits.h 367 gl_REPLACE_LIMITS_H
368 AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"])
369 368
370 AC_SUBST([HAVE_C99_STDINT_H]) 369 AC_SUBST([HAVE_C99_STDINT_H])
371 AC_SUBST([HAVE_SYS_BITYPES_H]) 370 AC_SUBST([HAVE_SYS_BITYPES_H])
diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4
index 159c48aeef1..3ba64da8a0b 100644
--- a/m4/unistd_h.m4
+++ b/m4/unistd_h.m4
@@ -1,4 +1,4 @@
1# unistd_h.m4 serial 73 1# unistd_h.m4 serial 74
2dnl Copyright (C) 2006-2018 Free Software Foundation, Inc. 2dnl Copyright (C) 2006-2018 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,
@@ -43,7 +43,7 @@ AC_DEFUN([gl_UNISTD_H],
43#endif 43#endif
44 ]], [chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat 44 ]], [chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat
45 fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups 45 fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups
46 gethostname getlogin getlogin_r getpagesize 46 gethostname getlogin getlogin_r getpagesize getpass
47 getusershell setusershell endusershell 47 getusershell setusershell endusershell
48 group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite 48 group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite
49 readlink readlinkat rmdir sethostname sleep symlink symlinkat 49 readlink readlinkat rmdir sethostname sleep symlink symlinkat
@@ -83,6 +83,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
83 GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN]) 83 GNULIB_GETLOGIN=0; AC_SUBST([GNULIB_GETLOGIN])
84 GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R]) 84 GNULIB_GETLOGIN_R=0; AC_SUBST([GNULIB_GETLOGIN_R])
85 GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE]) 85 GNULIB_GETPAGESIZE=0; AC_SUBST([GNULIB_GETPAGESIZE])
86 GNULIB_GETPASS=0; AC_SUBST([GNULIB_GETPASS])
86 GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL]) 87 GNULIB_GETUSERSHELL=0; AC_SUBST([GNULIB_GETUSERSHELL])
87 GNULIB_GROUP_MEMBER=0; AC_SUBST([GNULIB_GROUP_MEMBER]) 88 GNULIB_GROUP_MEMBER=0; AC_SUBST([GNULIB_GROUP_MEMBER])
88 GNULIB_ISATTY=0; AC_SUBST([GNULIB_ISATTY]) 89 GNULIB_ISATTY=0; AC_SUBST([GNULIB_ISATTY])
@@ -126,6 +127,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
126 HAVE_GETHOSTNAME=1; AC_SUBST([HAVE_GETHOSTNAME]) 127 HAVE_GETHOSTNAME=1; AC_SUBST([HAVE_GETHOSTNAME])
127 HAVE_GETLOGIN=1; AC_SUBST([HAVE_GETLOGIN]) 128 HAVE_GETLOGIN=1; AC_SUBST([HAVE_GETLOGIN])
128 HAVE_GETPAGESIZE=1; AC_SUBST([HAVE_GETPAGESIZE]) 129 HAVE_GETPAGESIZE=1; AC_SUBST([HAVE_GETPAGESIZE])
130 HAVE_GETPASS=1; AC_SUBST([HAVE_GETPASS])
129 HAVE_GROUP_MEMBER=1; AC_SUBST([HAVE_GROUP_MEMBER]) 131 HAVE_GROUP_MEMBER=1; AC_SUBST([HAVE_GROUP_MEMBER])
130 HAVE_LCHOWN=1; AC_SUBST([HAVE_LCHOWN]) 132 HAVE_LCHOWN=1; AC_SUBST([HAVE_LCHOWN])
131 HAVE_LINK=1; AC_SUBST([HAVE_LINK]) 133 HAVE_LINK=1; AC_SUBST([HAVE_LINK])
@@ -168,6 +170,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
168 REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R]) 170 REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R])
169 REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS]) 171 REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS])
170 REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) 172 REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE])
173 REPLACE_GETPASS=0; AC_SUBST([REPLACE_GETPASS])
171 REPLACE_ISATTY=0; AC_SUBST([REPLACE_ISATTY]) 174 REPLACE_ISATTY=0; AC_SUBST([REPLACE_ISATTY])
172 REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN]) 175 REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN])
173 REPLACE_LINK=0; AC_SUBST([REPLACE_LINK]) 176 REPLACE_LINK=0; AC_SUBST([REPLACE_LINK])