aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorPaul Eggert2017-09-10 08:39:55 -0700
committerPaul Eggert2017-09-10 08:40:43 -0700
commitb079ee72ac25590cd8b7b185b32ea5d2d43a9909 (patch)
treebbd4f1a2a0524ce1e380019d7d2b59a5c18f0844 /m4
parentc990f8d93dcc78aa98e58b89bddb666efcea2710 (diff)
downloademacs-b079ee72ac25590cd8b7b185b32ea5d2d43a9909.tar.gz
emacs-b079ee72ac25590cd8b7b185b32ea5d2d43a9909.zip
Merge from gnulib
This incorporates: 2017-09-08 stddef: Avoid conflict with system-defined max_align_t 2017-08-24 warnings: fix compilation with old autoconf 2017-08-23 glob: merge from glibc with Zanella glob changes 2017-08-17 random: Fix test compilation failure on Cygwin 1.5.25 * doc/misc/texinfo.tex, lib/flexmember.h, lib/stddef.in.h: * lib/stdlib.in.h, m4/manywarnings.m4, m4/stdlib_h.m4: * m4/warnings.m4: Copy from Gnulib. * lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'm4')
-rw-r--r--m4/manywarnings.m48
-rw-r--r--m4/stdlib_h.m44
-rw-r--r--m4/warnings.m48
3 files changed, 13 insertions, 7 deletions
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
index a3d255a9402..eb89325519c 100644
--- a/m4/manywarnings.m4
+++ b/m4/manywarnings.m4
@@ -1,4 +1,4 @@
1# manywarnings.m4 serial 11 1# manywarnings.m4 serial 12
2dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. 2dnl Copyright (C) 2008-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,
@@ -39,7 +39,8 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
39[_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) 39[_AC_LANG_DISPATCH([$0], _AC_LANG, $@)])
40 40
41# Specialization for _AC_LANG = C. 41# Specialization for _AC_LANG = C.
42AC_DEFUN([gl_MANYWARN_ALL_GCC(C)], 42# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b.
43m4_defun([gl_MANYWARN_ALL_GCC(C)],
43[ 44[
44 AC_LANG_PUSH([C]) 45 AC_LANG_PUSH([C])
45 46
@@ -316,7 +317,8 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)],
316]) 317])
317 318
318# Specialization for _AC_LANG = C++. 319# Specialization for _AC_LANG = C++.
319AC_DEFUN([gl_MANYWARN_ALL_GCC(C++)], 320# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b.
321m4_defun([gl_MANYWARN_ALL_GCC(C++)],
320[ 322[
321 gl_MANYWARN_ALL_GCC_CXX_IMPL([$1]) 323 gl_MANYWARN_ALL_GCC_CXX_IMPL([$1])
322]) 324])
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index ec4a058154b..35373463682 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
1# stdlib_h.m4 serial 43 1# stdlib_h.m4 serial 44
2dnl Copyright (C) 2007-2017 Free Software Foundation, Inc. 2dnl Copyright (C) 2007-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,
@@ -78,6 +78,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
78 HAVE_DECL_GETLOADAVG=1; AC_SUBST([HAVE_DECL_GETLOADAVG]) 78 HAVE_DECL_GETLOADAVG=1; AC_SUBST([HAVE_DECL_GETLOADAVG])
79 HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT]) 79 HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT])
80 HAVE_GRANTPT=1; AC_SUBST([HAVE_GRANTPT]) 80 HAVE_GRANTPT=1; AC_SUBST([HAVE_GRANTPT])
81 HAVE_DECL_INITSTATE=1; AC_SUBST([HAVE_DECL_INITSTATE])
81 HAVE_MKDTEMP=1; AC_SUBST([HAVE_MKDTEMP]) 82 HAVE_MKDTEMP=1; AC_SUBST([HAVE_MKDTEMP])
82 HAVE_MKOSTEMP=1; AC_SUBST([HAVE_MKOSTEMP]) 83 HAVE_MKOSTEMP=1; AC_SUBST([HAVE_MKOSTEMP])
83 HAVE_MKOSTEMPS=1; AC_SUBST([HAVE_MKOSTEMPS]) 84 HAVE_MKOSTEMPS=1; AC_SUBST([HAVE_MKOSTEMPS])
@@ -96,6 +97,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
96 HAVE_SECURE_GETENV=1; AC_SUBST([HAVE_SECURE_GETENV]) 97 HAVE_SECURE_GETENV=1; AC_SUBST([HAVE_SECURE_GETENV])
97 HAVE_SETENV=1; AC_SUBST([HAVE_SETENV]) 98 HAVE_SETENV=1; AC_SUBST([HAVE_SETENV])
98 HAVE_DECL_SETENV=1; AC_SUBST([HAVE_DECL_SETENV]) 99 HAVE_DECL_SETENV=1; AC_SUBST([HAVE_DECL_SETENV])
100 HAVE_DECL_SETSTATE=1; AC_SUBST([HAVE_DECL_SETSTATE])
99 HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD]) 101 HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD])
100 HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL]) 102 HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL])
101 HAVE_STRTOULL=1; AC_SUBST([HAVE_STRTOULL]) 103 HAVE_STRTOULL=1; AC_SUBST([HAVE_STRTOULL])
diff --git a/m4/warnings.m4 b/m4/warnings.m4
index aa2735b77ff..870472b624b 100644
--- a/m4/warnings.m4
+++ b/m4/warnings.m4
@@ -1,4 +1,4 @@
1# warnings.m4 serial 12 1# warnings.m4 serial 13
2dnl Copyright (C) 2008-2017 Free Software Foundation, Inc. 2dnl Copyright (C) 2008-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,
@@ -59,7 +59,8 @@ AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS],
59[_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) 59[_AC_LANG_DISPATCH([$0], _AC_LANG, $@)])
60 60
61# Specialization for _AC_LANG = C. This macro can be AC_REQUIREd. 61# Specialization for _AC_LANG = C. This macro can be AC_REQUIREd.
62AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C)], 62# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b.
63m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C)],
63[ 64[
64 AC_LANG_PUSH([C]) 65 AC_LANG_PUSH([C])
65 gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL 66 gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL
@@ -67,7 +68,8 @@ AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C)],
67]) 68])
68 69
69# Specialization for _AC_LANG = C++. This macro can be AC_REQUIREd. 70# Specialization for _AC_LANG = C++. This macro can be AC_REQUIREd.
70AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)], 71# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b.
72m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)],
71[ 73[
72 AC_LANG_PUSH([C++]) 74 AC_LANG_PUSH([C++])
73 gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL 75 gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL