1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8044733: common/autoconf/configure script doesn't properly detect missing tools

Browse Source 
Reviewed-by: erikj, mikael
This commit is contained in:
Mike Duigou 2014-06-04 10:03:17 -07:00
parent 490b1acb50
commit 0df5686eab
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/autoconf/configure vendored
View File

@ -49,7 +49,7 @@ fi
### ###
run_autogen_or_fail() { 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 "Cannot locate autoconf, unable to correct situation."
echo "Please install autoconf and run 'bash autogen.sh' to update the generated files." echo "Please install autoconf and run 'bash autogen.sh' to update the generated files."
echo "Error: Cannot continue" 1>&2 echo "Error: Cannot continue" 1>&2
@ -80,7 +80,7 @@ check_autoconf_timestamps() {
} }
check_hg_updates() { 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` 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 if test "x$conf_updated_autoconf_files" != x; then
echo "Configure source code has been updated, checking time stamps" echo "Configure source code has been updated, checking time stamps"