From dedfcb41aa8de0f7c8e62b10a93b8e132ccd8f37 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sun, 5 Jul 2026 01:33:50 +0300
Subject: [PATCH] acinclude/tar.m4: update from automake mainstream.
(cherry picked from commit 3c7d39becad4d15feedf08491d94b6fc4cea9eed)
---
acinclude/tar.m4 | 6 +++---
configure | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/acinclude/tar.m4 b/acinclude/tar.m4
index 99e3a894..edd334c2 100644
--- a/acinclude/tar.m4
+++ b/acinclude/tar.m4
@@ -1,6 +1,6 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2025 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -80,7 +80,7 @@ m4_if([$1], [v7],
case $_am_tool in
gnutar)
for _am_tar in tar gnutar gtar; do
- AM_RUN_LOG([$_am_tar --version]) && break
+ AM_RUN_LOG([$_am_tar --version | grep GNU >/dev/null]) && break
done
am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -cf - "'"$$tardir"'
am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -cf - "'"$tardir"'
@@ -89,7 +89,7 @@ m4_if([$1], [v7],
plaintar)
# Must skip GNU tar: if it does not support --format= it doesn't create
# ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
+ (tar --version | grep GNU) >/dev/null 2>&1 && continue
am__tar='tar cf - "$$tardir"'
am__tar_='tar cf - "$tardir"'
am__untar='tar xf -'
diff --git a/configure b/configure
index 4eb06c6f..b60ecfc1 100755
--- a/configure
+++ b/configure
@@ -12112,8 +12112,8 @@ printf %s "checking how to create a ustar tar archive... " >&6; }
case $_am_tool in
gnutar)
for _am_tar in tar gnutar gtar; do
- { echo "$as_me:$LINENO: $_am_tar --version" >&5
- ($_am_tar --version) >&5 2>&5
+ { echo "$as_me:$LINENO: $_am_tar --version | grep GNU >/dev/null" >&5
+ ($_am_tar --version | grep GNU >/dev/null) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && break
@@ -12125,7 +12125,7 @@ printf %s "checking how to create a ustar tar archive... " >&6; }
plaintar)
# Must skip GNU tar: if it does not support --format= it doesn't create
# ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
+ (tar --version | grep GNU) >/dev/null 2>&1 && continue
am__tar='tar cf - "$$tardir"'
am__tar_='tar cf - "$tardir"'
am__untar='tar xf -'