aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorPaul Eggert2018-02-20 13:42:19 -0800
committerPaul Eggert2018-02-20 13:45:27 -0800
commit630da78a3cc2a5df2d61e1edf0c209b806b336e2 (patch)
tree733a99c301158e849bc3f612f6eb896e55ad47a8 /m4
parent3d38ab8f1fbfaeb1f3eddbc79ef6ded1d9a87841 (diff)
downloademacs-630da78a3cc2a5df2d61e1edf0c209b806b336e2.tar.gz
emacs-630da78a3cc2a5df2d61e1edf0c209b806b336e2.zip
Update from gnulib
This includes: 2018-02-18 warnings: Add support for Objective C 2018-02-03 stdlib: Fix compilation error on OpenIndiana * lib/gnulib.mk.in: Regenerate. * lib/stdlib.in.h, m4/getloadavg.m4, m4/stdlib_h.m4, m4/warnings.m4: Copy from gnulib.
Diffstat (limited to 'm4')
-rw-r--r--m4/getloadavg.m45
-rw-r--r--m4/stdlib_h.m45
-rw-r--r--m4/warnings.m411
3 files changed, 18 insertions, 3 deletions
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
index acc266531ed..7b6a09a5c5b 100644
--- a/m4/getloadavg.m4
+++ b/m4/getloadavg.m4
@@ -7,7 +7,7 @@
7# gives unlimited permission to copy and/or distribute it, 7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved. 8# with or without modifications, as long as this notice is preserved.
9 9
10#serial 6 10#serial 7
11 11
12# Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. 12# Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent.
13# New applications should use gl_GETLOADAVG instead. 13# New applications should use gl_GETLOADAVG instead.
@@ -92,6 +92,9 @@ else
92fi 92fi
93AC_CHECK_DECL([getloadavg], [], [HAVE_DECL_GETLOADAVG=0], 93AC_CHECK_DECL([getloadavg], [], [HAVE_DECL_GETLOADAVG=0],
94 [[#if HAVE_SYS_LOADAVG_H 94 [[#if HAVE_SYS_LOADAVG_H
95 /* OpenIndiana has a bug: <sys/time.h> must be included before
96 <sys/loadavg.h>. */
97 # include <sys/time.h>
95 # include <sys/loadavg.h> 98 # include <sys/loadavg.h>
96 #endif 99 #endif
97 #include <stdlib.h>]]) 100 #include <stdlib.h>]])
diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index eff6f9e685b..49dc5d59cbe 100644
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
1# stdlib_h.m4 serial 44 1# stdlib_h.m4 serial 45
2dnl Copyright (C) 2007-2018 Free Software Foundation, Inc. 2dnl Copyright (C) 2007-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,
@@ -14,6 +14,9 @@ AC_DEFUN([gl_STDLIB_H],
14 dnl guaranteed by C89. 14 dnl guaranteed by C89.
15 gl_WARN_ON_USE_PREPARE([[#include <stdlib.h> 15 gl_WARN_ON_USE_PREPARE([[#include <stdlib.h>
16#if HAVE_SYS_LOADAVG_H 16#if HAVE_SYS_LOADAVG_H
17/* OpenIndiana has a bug: <sys/time.h> must be included before
18 <sys/loadavg.h>. */
19# include <sys/time.h>
17# include <sys/loadavg.h> 20# include <sys/loadavg.h>
18#endif 21#endif
19#if HAVE_RANDOM_H 22#if HAVE_RANDOM_H
diff --git a/m4/warnings.m4 b/m4/warnings.m4
index eb1c795c598..07edda1cca6 100644
--- a/m4/warnings.m4
+++ b/m4/warnings.m4
@@ -1,4 +1,4 @@
1# warnings.m4 serial 13 1# warnings.m4 serial 14
2dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. 2dnl Copyright (C) 2008-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,
@@ -76,6 +76,15 @@ m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)],
76 AC_LANG_POP([C++]) 76 AC_LANG_POP([C++])
77]) 77])
78 78
79# Specialization for _AC_LANG = Objective C. This macro can be AC_REQUIREd.
80# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b.
81m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(Objective C)],
82[
83 AC_LANG_PUSH([Objective C])
84 gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL
85 AC_LANG_POP([Objective C])
86])
87
79AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL], 88AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL],
80[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option], 89[gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option],
81 [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'], 90 [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'],