From 3966dafeb64f63e962ea72a413f52f6259f372c1 Mon Sep 17 00:00:00 2001 From: dshaw Date: Tue, 11 Jul 2006 16:45:17 +0000 Subject: [PATCH] * tar-ustar.m4: Not all greps know the -q (quiet) flag, so redirect to /dev/null instead. git-svn-id: svn://cvs.gnupg.org/gnupg/trunk@4191 8a63c251-dffc-0310-8ec6-d64dca2275b1 --- m4/ChangeLog | 3 +++ m4/tar-ustar.m4 | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/m4/ChangeLog b/m4/ChangeLog index ae2c584d..a3d9b9cb 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,5 +1,8 @@ 2006-07-11 David Shaw + * 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 7cc1c892..5ef2e16e 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 -- 2.11.4.GIT