From: Eric Blake <eblake@redhat.com>
Date: Mon, 12 Apr 2010 23:03:08 +0000 (-0600)
Subject: gnulib-tool: silence warning on BSD sh
X-Git-Tag: v0.1~4264
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=ce601eb9d9d60ca97aaca92246c0a63c01d9f99a;p=gnulib.git

gnulib-tool: silence warning on BSD sh

FreeBSD /bin/sh issues warnings about commands not found prior
to redirecting stderr.

* gnulib-tool: Avoid leaking warning about unknown 'declare'.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 2dfb19bcd..a7d9b6ee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-13  Eric Blake  <eblake@redhat.com>
+
+	gnulib-tool: silence warning on BSD sh
+	* gnulib-tool: Avoid leaking warning about unknown 'declare'.
+
 2010-04-13  Jim Meyering  <meyering@redhat.com>
 
 	doc: users.txt: GNU patch now uses gnulib
diff --git a/gnulib-tool b/gnulib-tool
index d480f1ee5..2ec7799ab 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1493,7 +1493,7 @@ sed_extract_field_header='
 if $modcache; then
 
   # Note: The 'eval' silences stderr output in dash.
-  if declare -A x 2>/dev/null && { x[f/2]='foo'; x[f/3]='bar'; eval test '${x[f/2]}' = foo; }; then
+  if (declare -A x && { x[f/2]='foo'; x[f/3]='bar'; eval test '${x[f/2]}' = foo; }) 2>/dev/null; then
     # Zsh 4 and Bash 4 have associative arrays.
     have_associative=true
   else