* bin/autoreconf.in: Discard stderr for $autoconf/$aclocal --help.

diff --git a/ChangeLog b/ChangeLog
index 412d0e578edccf7ca486e254f8cb497ec7b6a90c..57299a98f23e76615baa81c65407e34fe9c1814e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * bin/autoreconf.in: Discard stderr for $autoconf/$aclocal --help.
+
 2007-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Fix some write failure cases in Autotest.

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index e7074466dff1cf3dcc4ab8ca49c0c46d1728ed98..fa48b20188859c33ecc018c1a372b80690809d02 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -6,8 +6,8 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
     if 0;
 
 # autoreconf - install the GNU Build System in a directory tree
-# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+# 2007, 2008  Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -177,8 +177,8 @@ sub parse_args ()
        }
     }
 
-  $aclocal_supports_force = `$aclocal --help` =~ /--force/;
-  $automake_supports_force_missing = `$automake --help` =~ /--force-missing/;
+  $aclocal_supports_force = `$aclocal --help 2>/dev/null` =~ /--force/;
+  $automake_supports_force_missing = `$automake --help 2>/dev/null` =~ /--force-missing/;
 
   # Dispatch autoreconf's option to the tools.
   # --include;