Merge branch 'upstream' into dfsg-orig

[tar] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 27de1723f321ed9f84679a39fac2b6b0deae517a..93aa9ab8a704c7323a29a7b72fe369e92a8c15ef 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1032,6 +1032,7 @@ m4_include([m4/00gnulib.m4])
 m4_include([m4/alloca.m4])
 m4_include([m4/argmatch.m4])
 m4_include([m4/argp.m4])
+m4_include([m4/asm-underscore.m4])
 m4_include([m4/backupfile.m4])
 m4_include([m4/bison.m4])
 m4_include([m4/btowc.m4])
@@ -1039,6 +1040,7 @@ m4_include([m4/canonicalize.m4])
 m4_include([m4/chdir-long.m4])
 m4_include([m4/chown.m4])
 m4_include([m4/clock_time.m4])
+m4_include([m4/cloexec.m4])
 m4_include([m4/close-stream.m4])
 m4_include([m4/close.m4])
 m4_include([m4/closeout.m4])
@@ -1064,15 +1066,15 @@ m4_include([m4/fcntl.m4])
 m4_include([m4/fcntl_h.m4])
 m4_include([m4/fdopendir.m4])
 m4_include([m4/fileblocks.m4])
+m4_include([m4/filenamecat.m4])
 m4_include([m4/float_h.m4])
 m4_include([m4/fnmatch.m4])
 m4_include([m4/fpending.m4])
 m4_include([m4/fseeko.m4])
-m4_include([m4/ftruncate.m4])
+m4_include([m4/futimens.m4])
 m4_include([m4/getcwd-abort-bug.m4])
 m4_include([m4/getcwd-path-max.m4])
 m4_include([m4/getcwd.m4])
-m4_include([m4/getdate.m4])
 m4_include([m4/getdelim.m4])
 m4_include([m4/getdtablesize.m4])
 m4_include([m4/getline.m4])
@@ -1100,6 +1102,10 @@ m4_include([m4/lchown.m4])
 m4_include([m4/lib-ld.m4])
 m4_include([m4/lib-link.m4])
 m4_include([m4/lib-prefix.m4])
+m4_include([m4/libunistring-base.m4])
+m4_include([m4/link-follow.m4])
+m4_include([m4/link.m4])
+m4_include([m4/linkat.m4])
 m4_include([m4/localcharset.m4])
 m4_include([m4/locale-fr.m4])
 m4_include([m4/locale-ja.m4])
@@ -1120,6 +1126,9 @@ m4_include([m4/mempcpy.m4])
 m4_include([m4/memrchr.m4])
 m4_include([m4/mkdir.m4])
 m4_include([m4/mkdtemp.m4])
+m4_include([m4/mkfifo.m4])
+m4_include([m4/mkfifoat.m4])
+m4_include([m4/mknod.m4])
 m4_include([m4/mktime.m4])
 m4_include([m4/mmap-anon.m4])
 m4_include([m4/mode_t.m4])
@@ -1129,6 +1138,7 @@ m4_include([m4/nl_langinfo.m4])
 m4_include([m4/nls.m4])
 m4_include([m4/open.m4])
 m4_include([m4/openat.m4])
+m4_include([m4/parse-datetime.m4])
 m4_include([m4/pathmax.m4])
 m4_include([m4/paxutils.m4])
 m4_include([m4/po.m4])
@@ -1139,15 +1149,17 @@ m4_include([m4/quote.m4])
 m4_include([m4/quotearg.m4])
 m4_include([m4/rawmemchr.m4])
 m4_include([m4/readlink.m4])
+m4_include([m4/readlinkat.m4])
 m4_include([m4/realloc.m4])
 m4_include([m4/regex.m4])
+m4_include([m4/rename.m4])
+m4_include([m4/renameat.m4])
 m4_include([m4/rmdir.m4])
 m4_include([m4/rmt.m4])
 m4_include([m4/rpmatch.m4])
 m4_include([m4/rtapelib.m4])
 m4_include([m4/safe-read.m4])
 m4_include([m4/safe-write.m4])
-m4_include([m4/same.m4])
 m4_include([m4/save-cwd.m4])
 m4_include([m4/savedir.m4])
 m4_include([m4/setenv.m4])
@@ -1179,6 +1191,8 @@ m4_include([m4/strtoll.m4])
 m4_include([m4/strtoul.m4])
 m4_include([m4/strtoull.m4])
 m4_include([m4/strtoumax.m4])
+m4_include([m4/symlink.m4])
+m4_include([m4/symlinkat.m4])
 m4_include([m4/sys_stat_h.m4])
 m4_include([m4/sys_time_h.m4])
 m4_include([m4/sysexits.m4])
@@ -1195,6 +1209,7 @@ m4_include([m4/unlinkdir.m4])
 m4_include([m4/unlocked-io.m4])
 m4_include([m4/utimbuf.m4])
 m4_include([m4/utimens.m4])
+m4_include([m4/utimensat.m4])
 m4_include([m4/utimes.m4])
 m4_include([m4/vasnprintf.m4])
 m4_include([m4/vasprintf.m4])