aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2006-07-12 14:41:08 +0000
committerDavid Shaw <[email protected]>2006-07-12 14:41:08 +0000
commit0b5bc307d713c120f4d21cfb3d0a79a5a029edcb (patch)
treedb63328c74959f13826b43747fc13fc8cdf8d0c3
parent* tar-ustar.m4: Not all greps know the -q (quiet) flag, so redirect to (diff)
downloadgnupg-0b5bc307d713c120f4d21cfb3d0a79a5a029edcb.tar.gz
gnupg-0b5bc307d713c120f4d21cfb3d0a79a5a029edcb.zip
* tar-ustar.m4: Use dd instead of strings as it's more likely to be
around. Suggested by Nelson H. F. Beebe.
-rw-r--r--m4/ChangeLog5
-rw-r--r--m4/tar-ustar.m42
2 files changed, 6 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index a3d9b9cbe..67c110636 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-12 David Shaw <[email protected]>
+
+ * tar-ustar.m4: Use dd instead of strings as it's more likely to
+ be around. Suggested by Nelson H. F. Beebe.
+
2006-07-11 David Shaw <[email protected]>
* tar-ustar.m4: Not all greps know the -q (quiet) flag, so
diff --git a/m4/tar-ustar.m4 b/m4/tar-ustar.m4
index 5ef2e16e4..4ae9e63aa 100644
--- a/m4/tar-ustar.m4
+++ b/m4/tar-ustar.m4
@@ -27,7 +27,7 @@ AC_DEFUN([GNUPG_CHECK_USTAR],
if test x$_mytar != x ; then
AC_MSG_CHECKING([whether $_mytar speaks USTAR])
echo hithere > conftest.txt
- $_mytar -cf - conftest.txt | strings | grep ustar > /dev/null
+ $_mytar -cf - conftest.txt | (dd skip=257 bs=1 count=5 2>/dev/null || cat) | grep ustar > /dev/null
_tar_bad=$?
rm conftest.txt