2003-12-03 Paolo Bonzini <bonzini@gnu.org>

        * lib/m4sugar/m4sh.m4 (_AS_SHELL_FN_WORK): Redirect
        stderr to /dev/null.
        * bin/autoconf.in: Regenerate.
        * bin/wrapper.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 0fbd6451cb0bd9dc06736b8bedd4dcd047c6c551..993b024effb54c17aaa10e4312d7f1b25f9fa96d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-03  Paolo Bonzini  <bonzini@gnu.org>
+
+       * lib/m4sugar/m4sh.m4 (_AS_SHELL_FN_WORK): Redirect
+       stderr to /dev/null.
+       * bin/autoconf.in: Regenerate.
+       * bin/wrapper.in: Regenerate.
+
 2003-11-26  Paolo Bonzini  <bonzini@gnu.org>
 
        * lib/m4sugar/m4sh.m4 (_AS_BOURNE_COMPATIBLE):

diff --git a/bin/autoconf.in b/bin/autoconf.in
index d2fd9587c3ea0e06b0c42b97ebb5beedb48893ef..f41958eca57ae2f3ddd88964b1b0f41ce68e7502 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -3,7 +3,6 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
@@ -70,8 +69,7 @@ if test ! -f "$as_myself"; then
    { (exit 1); exit 1; }; }
 fi
 
-if { $SHELL <<\_ASEOF
-
+if { $SHELL 2>/dev/null <<\_ASEOF
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
@@ -153,8 +151,7 @@ do
   for as_base in sh bash ksh sh5; do
         case $as_dir in
         /*)
-          if { $as_dir/$as_base <<\_ASEOF
-
+          if { $as_dir/$as_base 2>/dev/null <<\_ASEOF
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh

diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
index 2f622c26ea7093ba66a0d204bae7d04bf06c9aab..bc6bab46d808a5ef4fd94af5d97959880d8fa020 100644 (file)
--- a/lib/m4sugar/m4sh.m4
+++ b/lib/m4sugar/m4sh.m4
@@ -172,7 +172,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 # This is a spy to detect "in the wild" shells that do not support shell
 # functions correctly.  It is based on the m4sh.at Autotest testcases.
 m4_define([_AS_SHELL_FN_WORK],
-[{ $1 <<\_ASEOF
+[{ $1 2>/dev/null <<\_ASEOF
 _AS_BOURNE_COMPATIBLE
 func_return () {
   (exit [$]1)

diff --git a/tests/wrapper.in b/tests/wrapper.in
index 9d8fd57c07e06c5513db75e2beb6be398f44407f..462f33c76a26be3769edf663675fb6cc73cde3e0 100755 (executable)
--- a/tests/wrapper.in
+++ b/tests/wrapper.in
@@ -3,7 +3,6 @@
 ## M4sh Initialization.  ##
 ## --------------------- ##
 
-
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
@@ -70,8 +69,7 @@ if test ! -f "$as_myself"; then
    { (exit 1); exit 1; }; }
 fi
 
-if { $SHELL <<\_ASEOF
-
+if { $SHELL 2>/dev/null <<\_ASEOF
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
@@ -153,8 +151,7 @@ do
   for as_base in sh bash ksh sh5; do
         case $as_dir in
         /*)
-          if { $as_dir/$as_base <<\_ASEOF
-
+          if { $as_dir/$as_base 2>/dev/null <<\_ASEOF
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh