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 2dfb19bcdfcfb19dd641e48b1c58c4c829510790..a7d9b6ee3841d9afde0019111e4a9c944d6b71e8 100644 (file)
--- 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 d480f1ee51753671a22dd70c76690032836ca761..2ec7799ab680c155344f66726b19027dc16c91bd 100755 (executable)
--- 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