Merge branch 'feature/upstream' into develop

1 files changed, 17 insertions, 3 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 436cc98d..5dd7ee54 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -14,8 +14,8 @@
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
-[m4_warning([this file was generated for autoconf 2.71.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],,
+[m4_warning([this file was generated for autoconf 2.72.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
@@ -1186,6 +1186,7 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([gnulib-m4/00gnulib.m4])
+m4_include([gnulib-m4/__inline.m4])
 m4_include([gnulib-m4/absolute-header.m4])
 m4_include([gnulib-m4/alloca.m4])
 m4_include([gnulib-m4/arpa_inet_h.m4])
@@ -1193,6 +1194,7 @@ 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/c32rtomb.m4])
 m4_include([gnulib-m4/calloc.m4])
 m4_include([gnulib-m4/close.m4])
 m4_include([gnulib-m4/codeset.m4])
@@ -1203,6 +1205,7 @@ m4_include([gnulib-m4/eealloc.m4])
 m4_include([gnulib-m4/environ.m4])
 m4_include([gnulib-m4/errno_h.m4])
 m4_include([gnulib-m4/error.m4])
+m4_include([gnulib-m4/error_h.m4])
 m4_include([gnulib-m4/exponentd.m4])
 m4_include([gnulib-m4/exponentf.m4])
 m4_include([gnulib-m4/exponentl.m4])
@@ -1247,6 +1250,7 @@ m4_include([gnulib-m4/isnanf.m4])
 m4_include([gnulib-m4/isnanl.m4])
 m4_include([gnulib-m4/iswblank.m4])
 m4_include([gnulib-m4/iswdigit.m4])
+m4_include([gnulib-m4/iswpunct.m4])
 m4_include([gnulib-m4/iswxdigit.m4])
 m4_include([gnulib-m4/langinfo_h.m4])
 m4_include([gnulib-m4/largefile.m4])
@@ -1272,6 +1276,7 @@ m4_include([gnulib-m4/malloca.m4])
 m4_include([gnulib-m4/math_h.m4])
 m4_include([gnulib-m4/mbchar.m4])
 m4_include([gnulib-m4/mbiter.m4])
+m4_include([gnulib-m4/mbrtoc32.m4])
 m4_include([gnulib-m4/mbrtowc.m4])
 m4_include([gnulib-m4/mbsinit.m4])
 m4_include([gnulib-m4/mbstate_t.m4])
@@ -1284,6 +1289,7 @@ m4_include([gnulib-m4/msvc-inval.m4])
 m4_include([gnulib-m4/msvc-nothrow.m4])
 m4_include([gnulib-m4/multiarch.m4])
 m4_include([gnulib-m4/musl.m4])
+m4_include([gnulib-m4/nan-mips.m4])
 m4_include([gnulib-m4/nanosleep.m4])
 m4_include([gnulib-m4/netinet_in_h.m4])
 m4_include([gnulib-m4/nocrash.m4])
@@ -1304,6 +1310,8 @@ m4_include([gnulib-m4/pthread_rwlock_rdlock.m4])
 m4_include([gnulib-m4/pthread_sigmask.m4])
 m4_include([gnulib-m4/putenv.m4])
 m4_include([gnulib-m4/raise.m4])
+m4_include([gnulib-m4/random.m4])
+m4_include([gnulib-m4/random_r.m4])
 m4_include([gnulib-m4/realloc.m4])
 m4_include([gnulib-m4/reallocarray.m4])
 m4_include([gnulib-m4/relocatable-lib.m4])
@@ -1319,6 +1327,7 @@ m4_include([gnulib-m4/signalblocking.m4])
 m4_include([gnulib-m4/signbit.m4])
 m4_include([gnulib-m4/size_max.m4])
 m4_include([gnulib-m4/sleep.m4])
+m4_include([gnulib-m4/snan.m4])
 m4_include([gnulib-m4/socketlib.m4])
 m4_include([gnulib-m4/sockets.m4])
 m4_include([gnulib-m4/socklen.m4])
@@ -1347,7 +1356,13 @@ m4_include([gnulib-m4/sys_types_h.m4])
 m4_include([gnulib-m4/sys_uio_h.m4])
 m4_include([gnulib-m4/thread.m4])
 m4_include([gnulib-m4/threadlib.m4])
+m4_include([gnulib-m4/time.m4])
 m4_include([gnulib-m4/time_h.m4])
+m4_include([gnulib-m4/uchar_h.m4])
+m4_include([gnulib-m4/unicase_h.m4])
+m4_include([gnulib-m4/unictype_h.m4])
+m4_include([gnulib-m4/unimetadata_h.m4])
+m4_include([gnulib-m4/uninorm_h.m4])
 m4_include([gnulib-m4/unistd_h.m4])
 m4_include([gnulib-m4/usleep.m4])
 m4_include([gnulib-m4/vasnprintf.m4])
@@ -1363,7 +1378,6 @@ m4_include([gnulib-m4/wcwidth.m4])
 m4_include([gnulib-m4/wint_t.m4])
 m4_include([gnulib-m4/xalloc.m4])
 m4_include([gnulib-m4/xsize.m4])
-m4_include([gnulib-m4/year2038.m4])
 m4_include([gnulib-m4/yield.m4])
 m4_include([gnulib-m4/zzgnulib.m4])
 m4_include([m4/exported.m4])