diff options
Diffstat (limited to '')
| -rw-r--r-- | m4/ChangeLog | 3 | ||||
| -rw-r--r-- | m4/tar-ustar.m4 | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index ae2c584df..a3d9b9cbe 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,5 +1,8 @@ 2006-07-11 David Shaw <[email protected]> + * tar-ustar.m4: Not all greps know the -q (quiet) flag, so + redirect to /dev/null instead. + * 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. diff --git a/m4/tar-ustar.m4 b/m4/tar-ustar.m4 index 7cc1c8926..5ef2e16e4 100644 --- a/m4/tar-ustar.m4 +++ b/m4/tar-ustar.m4 @@ -1,5 +1,5 @@ dnl Check for a tar program that speaks ustar format -dnl Copyright (C) 2005 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc. dnl dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -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 -q ustar + $_mytar -cf - conftest.txt | strings | grep ustar > /dev/null _tar_bad=$? rm conftest.txt |