aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--m4/ChangeLog6
-rw-r--r--m4/tar-ustar.m42
2 files changed, 7 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 9ed0d91f7..ae2c584df 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-11 David Shaw <[email protected]>
+
+ * tar-ustar.m4: Pass tar data through strings so that greps that
+ don't grep in binary files (Solaris) can detect the string. Noted
+ by Mark Davies.
+
2006-06-25 Werner Koch <[email protected]>
* Makefile.am: Added noexecstack.m4 and ldap.m4
diff --git a/m4/tar-ustar.m4 b/m4/tar-ustar.m4
index 8b3d01457..7cc1c8926 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 | grep -q ustar
+ $_mytar -cf - conftest.txt | strings | grep -q ustar
_tar_bad=$?
rm conftest.txt