Merge branch 'feature/upstream' into develop

1 files changed, 47 insertions, 5 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index acf342f9..436cc98d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
 
 # Copyright (C) 1996-2021 Free Software Foundation, Inc.
 
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.16.4], [],
+m4_if([$1], [1.16.5], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.4])dnl
+[AM_AUTOMAKE_VERSION([1.16.5])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -108,6 +108,43 @@ AC_DEFUN([AM_AUX_DIR_EXPAND],
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
+# AM_COND_IF                                            -*- Autoconf -*-
+
+# Copyright (C) 2008-2021 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_COND_IF
+# _AM_COND_ELSE
+# _AM_COND_ENDIF
+# --------------
+# These macros are only used for tracing.
+m4_define([_AM_COND_IF])
+m4_define([_AM_COND_ELSE])
+m4_define([_AM_COND_ENDIF])
+
+# AM_COND_IF(COND, [IF-TRUE], [IF-FALSE])
+# ---------------------------------------
+# If the shell condition COND is true, execute IF-TRUE, otherwise execute
+# IF-FALSE.  Allow automake to learn about conditional instantiating macros
+# (the AC_CONFIG_FOOS).
+AC_DEFUN([AM_COND_IF],
+[m4_ifndef([_AM_COND_VALUE_$1],
+	   [m4_fatal([$0: no such condition "$1"])])dnl
+_AM_COND_IF([$1])dnl
+if test -z "$$1_TRUE"; then :
+  m4_n([$2])[]dnl
+m4_ifval([$3],
+[_AM_COND_ELSE([$1])dnl
+else
+  $3
+])dnl
+_AM_COND_ENDIF([$1])dnl
+fi[]dnl
+])
+
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
 # Copyright (C) 1997-2021 Free Software Foundation, Inc.
@@ -428,6 +465,10 @@ m4_defn([AC_PROG_CC])
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_PREREQ([2.65])dnl
+m4_ifdef([_$0_ALREADY_INIT],
+  [m4_fatal([$0 expanded multiple times
+]m4_defn([_$0_ALREADY_INIT]))],
+  [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -1148,8 +1189,10 @@ m4_include([gnulib-m4/00gnulib.m4])
 m4_include([gnulib-m4/absolute-header.m4])
 m4_include([gnulib-m4/alloca.m4])
 m4_include([gnulib-m4/arpa_inet_h.m4])
+m4_include([gnulib-m4/assert_h.m4])
 m4_include([gnulib-m4/btowc.m4])
 m4_include([gnulib-m4/builtin-expect.m4])
+m4_include([gnulib-m4/c-bool.m4])
 m4_include([gnulib-m4/calloc.m4])
 m4_include([gnulib-m4/close.m4])
 m4_include([gnulib-m4/codeset.m4])
@@ -1254,6 +1297,7 @@ m4_include([gnulib-m4/pipe.m4])
 m4_include([gnulib-m4/printf-frexp.m4])
 m4_include([gnulib-m4/printf-frexpl.m4])
 m4_include([gnulib-m4/printf.m4])
+m4_include([gnulib-m4/pselect.m4])
 m4_include([gnulib-m4/pthread-thread.m4])
 m4_include([gnulib-m4/pthread_h.m4])
 m4_include([gnulib-m4/pthread_rwlock_rdlock.m4])
@@ -1270,7 +1314,6 @@ m4_include([gnulib-m4/semaphore.m4])
 m4_include([gnulib-m4/setenv.m4])
 m4_include([gnulib-m4/setlocale.m4])
 m4_include([gnulib-m4/setlocale_null.m4])
-m4_include([gnulib-m4/sigaction.m4])
 m4_include([gnulib-m4/signal_h.m4])
 m4_include([gnulib-m4/signalblocking.m4])
 m4_include([gnulib-m4/signbit.m4])
@@ -1284,7 +1327,6 @@ m4_include([gnulib-m4/ssize_t.m4])
 m4_include([gnulib-m4/stat-time.m4])
 m4_include([gnulib-m4/stat.m4])
 m4_include([gnulib-m4/stdalign.m4])
-m4_include([gnulib-m4/stdbool.m4])
 m4_include([gnulib-m4/stddef_h.m4])
 m4_include([gnulib-m4/stdint.m4])
 m4_include([gnulib-m4/stdint_h.m4])