summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2022-02-24 22:20:53 -0500
committerMike Frysinger <vapier@gentoo.org>2022-03-05 13:12:15 -0500
commitce3bbbb49b22b0d5e7d0d74b2d44438dbc942f7e (patch)
treeea6ea9b0ccf20b0b7fd5b8fead8fec0f3c7cfbf2
parentd747a66a0defe0bf25989cda4f6d9dd89674d8a0 (diff)
downloadautomake-ce3bbbb49b22b0d5e7d0d74b2d44438dbc942f7e.tar.gz
m4: handle id failures when checking ustar support
Fixes automake bug https://bugs.gnu.org/20713. If `id` fails, display a specific warning message to the user. * m4/tar.m4: Check $am_uid & $am_gid if they're unknown.
-rw-r--r--m4/tar.m416
1 files changed, 10 insertions, 6 deletions
diff --git a/m4/tar.m4 b/m4/tar.m4
index 7e3df4f98..8f4d2f213 100644
--- a/m4/tar.m4
+++ b/m4/tar.m4
@@ -46,15 +46,19 @@ m4_if([$1], [v7],
am_uid=`id -u || echo unknown`
am_gid=`id -g || echo unknown`
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test x$am_uid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
+ elif test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test x$gm_gid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
+ elif test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none