aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorPaul Eggert2017-11-25 22:28:31 -0800
committerPaul Eggert2017-11-25 22:48:09 -0800
commit8be3aee2813f528b02bc913ca4d79e34e72b1754 (patch)
treeaf1e8e35cedfe601076eade046a1a12303b93e84 /m4
parent265cee553f9d59a989d92e28865f6cc6fc02dcc9 (diff)
downloademacs-8be3aee2813f528b02bc913ca4d79e34e72b1754.tar.gz
emacs-8be3aee2813f528b02bc913ca4d79e34e72b1754.zip
Merge from Gnulib
This incorporates: 2017-11-23 stat: work around Solaris bug with tv_nsec < 0 2017-11-12 maint: shorten https://lists.gnu.org/archive/html/... links * build-aux/config.sub, doc/misc/texinfo.tex, lib/allocator.h: * lib/fstatat.c, lib/intprops.h, lib/lstat.c, lib/signal.in.h: * lib/stat-time.h, lib/stdio-impl.h, lib/stdio.in.h: * lib/timespec.h, m4/alloca.m4, m4/extern-inline.m4: * m4/faccessat.m4, m4/fstatat.m4, m4/gnulib-common.m4: * m4/lstat.m4, m4/std-gnu11.m4, m4/sys_types_h.m4: * m4/vararrays.m4: Copy from Gnulib.
Diffstat (limited to 'm4')
-rw-r--r--m4/alloca.m42
-rw-r--r--m4/extern-inline.m46
-rw-r--r--m4/faccessat.m410
-rw-r--r--m4/fstatat.m421
-rw-r--r--m4/gnulib-common.m46
-rw-r--r--m4/lstat.m47
-rw-r--r--m4/std-gnu11.m44
-rw-r--r--m4/sys_types_h.m42
-rw-r--r--m4/vararrays.m42
9 files changed, 35 insertions, 25 deletions
diff --git a/m4/alloca.m4 b/m4/alloca.m4
index d1224316498..867954a2e37 100644
--- a/m4/alloca.m4
+++ b/m4/alloca.m4
@@ -44,7 +44,7 @@ AC_DEFUN([gl_FUNC_ALLOCA],
44AC_DEFUN([gl_PREREQ_ALLOCA], [:]) 44AC_DEFUN([gl_PREREQ_ALLOCA], [:])
45 45
46# This works around a bug in autoconf <= 2.68. 46# This works around a bug in autoconf <= 2.68.
47# See <https://lists.gnu.org/archive/html/bug-gnulib/2011-06/msg00277.html>. 47# See <https://lists.gnu.org/r/bug-gnulib/2011-06/msg00277.html>.
48 48
49m4_version_prereq([2.69], [] ,[ 49m4_version_prereq([2.69], [] ,[
50 50
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index c08af18af68..207aa6a0895 100644
--- a/m4/extern-inline.m4
+++ b/m4/extern-inline.m4
@@ -11,7 +11,7 @@ AC_DEFUN([gl_EXTERN_INLINE],
11[/* Please see the Gnulib manual for how to use these macros. 11[/* Please see the Gnulib manual for how to use these macros.
12 12
13 Suppress extern inline with HP-UX cc, as it appears to be broken; see 13 Suppress extern inline with HP-UX cc, as it appears to be broken; see
14 <https://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>. 14 <https://lists.gnu.org/r/bug-texinfo/2013-02/msg00030.html>.
15 15
16 Suppress extern inline with Sun C in standards-conformance mode, as it 16 Suppress extern inline with Sun C in standards-conformance mode, as it
17 mishandles inline functions that call each other. E.g., for 'inline void f 17 mishandles inline functions that call each other. E.g., for 'inline void f
@@ -28,13 +28,13 @@ AC_DEFUN([gl_EXTERN_INLINE],
28 from calling static functions. This bug is known to occur on: 28 from calling static functions. This bug is known to occur on:
29 29
30 OS X 10.8 and earlier; see: 30 OS X 10.8 and earlier; see:
31 https://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html 31 https://lists.gnu.org/r/bug-gnulib/2012-12/msg00023.html
32 32
33 DragonFly; see 33 DragonFly; see
34 http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log 34 http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
35 35
36 FreeBSD; see: 36 FreeBSD; see:
37 https://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html 37 https://lists.gnu.org/r/bug-gnulib/2014-07/msg00104.html
38 38
39 OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and 39 OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
40 for clang but remains for g++; see <https://trac.macports.org/ticket/41033>. 40 for clang but remains for g++; see <https://trac.macports.org/ticket/41033>.
diff --git a/m4/faccessat.m4 b/m4/faccessat.m4
index f4cb49d166c..c64545abd46 100644
--- a/m4/faccessat.m4
+++ b/m4/faccessat.m4
@@ -1,4 +1,4 @@
1# serial 7 1# serial 8
2# See if we need to provide faccessat replacement. 2# See if we need to provide faccessat replacement.
3 3
4dnl Copyright (C) 2009-2017 Free Software Foundation, Inc. 4dnl Copyright (C) 2009-2017 Free Software Foundation, Inc.
@@ -11,6 +11,7 @@ dnl with or without modifications, as long as this notice is preserved.
11AC_DEFUN([gl_FUNC_FACCESSAT], 11AC_DEFUN([gl_FUNC_FACCESSAT],
12[ 12[
13 AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) 13 AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
14 AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
14 15
15 dnl Persuade glibc <unistd.h> to declare faccessat(). 16 dnl Persuade glibc <unistd.h> to declare faccessat().
16 AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) 17 AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
@@ -18,8 +19,11 @@ AC_DEFUN([gl_FUNC_FACCESSAT],
18 AC_CHECK_FUNCS_ONCE([faccessat]) 19 AC_CHECK_FUNCS_ONCE([faccessat])
19 if test $ac_cv_func_faccessat = no; then 20 if test $ac_cv_func_faccessat = no; then
20 HAVE_FACCESSAT=0 21 HAVE_FACCESSAT=0
21 elif test "$gl_cv_func_lstat_dereferences_slashed_symlink" != yes; then 22 else
22 REPLACE_FACCESSAT=1 23 case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
24 *yes) ;;
25 *) REPLACE_FACCESSAT=1 ;;
26 esac
23 fi 27 fi
24]) 28])
25 29
diff --git a/m4/fstatat.m4 b/m4/fstatat.m4
index b29ec9258e9..767eb83db4b 100644
--- a/m4/fstatat.m4
+++ b/m4/fstatat.m4
@@ -1,4 +1,4 @@
1# fstatat.m4 serial 3 1# fstatat.m4 serial 4
2dnl Copyright (C) 2004-2017 Free Software Foundation, Inc. 2dnl Copyright (C) 2004-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,
@@ -13,14 +13,14 @@ AC_DEFUN([gl_FUNC_FSTATAT],
13 AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) 13 AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
14 AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) 14 AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
15 AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) 15 AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
16 AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles 16 AC_REQUIRE([AC_CANONICAL_HOST])
17 AC_CHECK_FUNCS_ONCE([fstatat]) 17 AC_CHECK_FUNCS_ONCE([fstatat])
18 18
19 if test $ac_cv_func_fstatat = no; then 19 if test $ac_cv_func_fstatat = no; then
20 HAVE_FSTATAT=0 20 HAVE_FSTATAT=0
21 else 21 else
22 dnl Test for an AIX 7.1 bug; see 22 dnl Test for an AIX 7.1 bug; see
23 dnl <https://lists.gnu.org/archive/html/bug-tar/2011-09/msg00015.html>. 23 dnl <https://lists.gnu.org/r/bug-tar/2011-09/msg00015.html>.
24 AC_CACHE_CHECK([whether fstatat (..., 0) works], 24 AC_CACHE_CHECK([whether fstatat (..., 0) works],
25 [gl_cv_func_fstatat_zero_flag], 25 [gl_cv_func_fstatat_zero_flag],
26 [AC_RUN_IFELSE( 26 [AC_RUN_IFELSE(
@@ -46,15 +46,20 @@ AC_DEFUN([gl_FUNC_FSTATAT],
46 46
47 case $gl_cv_func_fstatat_zero_flag+$gl_cv_func_lstat_dereferences_slashed_symlink in 47 case $gl_cv_func_fstatat_zero_flag+$gl_cv_func_lstat_dereferences_slashed_symlink in
48 *yes+*yes) ;; 48 *yes+*yes) ;;
49 *) REPLACE_FSTATAT=1 49 *) REPLACE_FSTATAT=1 ;;
50 case $gl_cv_func_fstatat_zero_flag in 50 esac
51 *yes) 51
52 case $host_os in
53 solaris*)
54 REPLACE_FSTATAT=1 ;;
55 esac
56
57 case $REPLACE_FSTATAT,$gl_cv_func_fstatat_zero_flag in
58 1,*yes)
52 AC_DEFINE([HAVE_WORKING_FSTATAT_ZERO_FLAG], [1], 59 AC_DEFINE([HAVE_WORKING_FSTATAT_ZERO_FLAG], [1],
53 [Define to 1 if fstatat (..., 0) works. 60 [Define to 1 if fstatat (..., 0) works.
54 For example, it does not work in AIX 7.1.]) 61 For example, it does not work in AIX 7.1.])
55 ;; 62 ;;
56 esac
57 ;;
58 esac 63 esac
59 fi 64 fi
60]) 65])
diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4
index 36da841287d..bea5a650e76 100644
--- a/m4/gnulib-common.m4
+++ b/m4/gnulib-common.m4
@@ -228,13 +228,13 @@ m4_ifndef([AS_VAR_IF],
228# This is like AC_PROG_CC_C99, except that 228# This is like AC_PROG_CC_C99, except that
229# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60, 229# - AC_PROG_CC_C99 did not exist in Autoconf versions < 2.60,
230# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC 230# - AC_PROG_CC_C99 does not mix well with AC_PROG_CC_STDC
231# <https://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00367.html>, 231# <https://lists.gnu.org/r/bug-gnulib/2011-09/msg00367.html>,
232# but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99 232# but many more packages use AC_PROG_CC_STDC than AC_PROG_CC_C99
233# <https://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00441.html>. 233# <https://lists.gnu.org/r/bug-gnulib/2011-09/msg00441.html>.
234# Remaining problems: 234# Remaining problems:
235# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options 235# - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options
236# to CC twice 236# to CC twice
237# <https://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00431.html>. 237# <https://lists.gnu.org/r/bug-gnulib/2011-09/msg00431.html>.
238# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard. 238# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard.
239AC_DEFUN([gl_PROG_CC_C99], 239AC_DEFUN([gl_PROG_CC_C99],
240[ 240[
diff --git a/m4/lstat.m4 b/m4/lstat.m4
index 0b6e5d70cba..6ba18cec574 100644
--- a/m4/lstat.m4
+++ b/m4/lstat.m4
@@ -1,4 +1,4 @@
1# serial 29 1# serial 30
2 2
3# Copyright (C) 1997-2001, 2003-2017 Free Software Foundation, Inc. 3# Copyright (C) 1997-2001, 2003-2017 Free Software Foundation, Inc.
4# 4#
@@ -10,14 +10,15 @@ dnl From Jim Meyering.
10 10
11AC_DEFUN([gl_FUNC_LSTAT], 11AC_DEFUN([gl_FUNC_LSTAT],
12[ 12[
13 AC_REQUIRE([AC_CANONICAL_HOST])
13 AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) 14 AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
14 dnl If lstat does not exist, the replacement <sys/stat.h> does 15 dnl If lstat does not exist, the replacement <sys/stat.h> does
15 dnl "#define lstat stat", and lstat.c is a no-op. 16 dnl "#define lstat stat", and lstat.c is a no-op.
16 AC_CHECK_FUNCS_ONCE([lstat]) 17 AC_CHECK_FUNCS_ONCE([lstat])
17 if test $ac_cv_func_lstat = yes; then 18 if test $ac_cv_func_lstat = yes; then
18 AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) 19 AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
19 case "$gl_cv_func_lstat_dereferences_slashed_symlink" in 20 case $host_os,$gl_cv_func_lstat_dereferences_slashed_symlink in
20 *no) 21 solaris* | *no)
21 REPLACE_LSTAT=1 22 REPLACE_LSTAT=1
22 ;; 23 ;;
23 esac 24 esac
diff --git a/m4/std-gnu11.m4 b/m4/std-gnu11.m4
index 3c2f26f4666..c0466beb404 100644
--- a/m4/std-gnu11.m4
+++ b/m4/std-gnu11.m4
@@ -369,7 +369,7 @@ dnl just the module. Instead, define the (private) symbol
369dnl _STDC_C99, which suppresses a bogus failure in <stdbool.h>. 369dnl _STDC_C99, which suppresses a bogus failure in <stdbool.h>.
370dnl The resulting compiler passes the test case here, and that's 370dnl The resulting compiler passes the test case here, and that's
371dnl good enough. For more, please see the thread starting at: 371dnl good enough. For more, please see the thread starting at:
372dnl https://lists.gnu.org/archive/html/autoconf/2010-12/msg00059.html 372dnl https://lists.gnu.org/r/autoconf/2010-12/msg00059.html
373dnl Tru64 -c99 373dnl Tru64 -c99
374dnl with extended modes being tried first. 374dnl with extended modes being tried first.
375[[-std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99]], [$1], [$2])[]dnl 375[[-std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc1x -qlanglvl=extc99]], [$1], [$2])[]dnl
@@ -458,7 +458,7 @@ dnl preferably extc11.
458# -------------- 458# --------------
459# Do not use AU_ALIAS here and in AC_PROG_CC_C99 and AC_PROG_CC_STDC, 459# Do not use AU_ALIAS here and in AC_PROG_CC_C99 and AC_PROG_CC_STDC,
460# as that'd be incompatible with how Automake redefines AC_PROG_CC. See 460# as that'd be incompatible with how Automake redefines AC_PROG_CC. See
461# <https://lists.gnu.org/archive/html/autoconf/2012-10/msg00048.html>. 461# <https://lists.gnu.org/r/autoconf/2012-10/msg00048.html>.
462AU_DEFUN([AC_PROG_CC_C89], 462AU_DEFUN([AC_PROG_CC_C89],
463 [AC_REQUIRE([AC_PROG_CC])], 463 [AC_REQUIRE([AC_PROG_CC])],
464 [$0 is obsolete; use AC_PROG_CC] 464 [$0 is obsolete; use AC_PROG_CC]
diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4
index de56d04fc15..75097713d98 100644
--- a/m4/sys_types_h.m4
+++ b/m4/sys_types_h.m4
@@ -35,7 +35,7 @@ AC_DEFUN([gl_SYS_TYPES_H_DEFAULTS],
35]) 35])
36 36
37# This works around a buggy version in autoconf <= 2.69. 37# This works around a buggy version in autoconf <= 2.69.
38# See <https://lists.gnu.org/archive/html/autoconf/2016-08/msg00014.html> 38# See <https://lists.gnu.org/r/autoconf/2016-08/msg00014.html>
39 39
40m4_version_prereq([2.70], [], [ 40m4_version_prereq([2.70], [], [
41 41
diff --git a/m4/vararrays.m4 b/m4/vararrays.m4
index 38a3ed23542..2f678e381eb 100644
--- a/m4/vararrays.m4
+++ b/m4/vararrays.m4
@@ -27,7 +27,7 @@ AC_DEFUN([AC_C_VARARRAYS],
27 [[/* Test for VLA support. This test is partly inspired 27 [[/* Test for VLA support. This test is partly inspired
28 from examples in the C standard. Use at least two VLA 28 from examples in the C standard. Use at least two VLA
29 functions to detect the GCC 3.4.3 bug described in: 29 functions to detect the GCC 3.4.3 bug described in:
30 https://lists.gnu.org/archive/html/bug-gnulib/2014-08/msg00014.html 30 https://lists.gnu.org/r/bug-gnulib/2014-08/msg00014.html
31 */ 31 */
32 #ifdef __STDC_NO_VLA__ 32 #ifdef __STDC_NO_VLA__
33 syntax error; 33 syntax error;