changeset 24655:6940eba5402c

8044733: common/autoconf/configure script doesn't properly detect missing tools Reviewed-by: erikj, mikael
author mduigou
date Wed, 04 Jun 2014 10:03:17 -0700
parents 4a09f5d30be8
children 4f048ac42b56
files common/autoconf/configure
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/configure	Wed Jul 05 19:43:07 2017 +0200
+++ b/common/autoconf/configure	Wed Jun 04 10:03:17 2014 -0700
@@ -49,7 +49,7 @@
 ###
 
 run_autogen_or_fail() {
-  if test "x`which autoconf 2> /dev/null`" = x; then
+  if test "x`which autoconf 2> /dev/null | grep -v '^no autoconf in'`" = x; then
     echo "Cannot locate autoconf, unable to correct situation."
     echo "Please install autoconf and run 'bash autogen.sh' to update the generated files."
     echo "Error: Cannot continue" 1>&2
@@ -80,7 +80,7 @@
 }
 
 check_hg_updates() {
-  if test "x`which hg 2> /dev/null`" != x; then
+  if test "x`which hg 2> /dev/null | grep -v '^no hg in'`" != x; then
     conf_updated_autoconf_files=`cd $conf_script_dir && hg status -mard 2> /dev/null | grep autoconf`
     if test "x$conf_updated_autoconf_files" != x; then
       echo "Configure source code has been updated, checking time stamps"