Mercurial > hg > jdk9-shenandoah
changeset 1064:24152ee0ee1a jdk9-b17
Merge
| author | lana |
|---|---|
| date | Thu, 05 Jun 2014 19:37:09 -0700 |
| parents | 0a0330b1a4ce (current diff) 7d27dbb50d95 (diff) |
| children | 5ade4d887667 ac90e5f3535b 77ee6827e0b2 1ec6463d0499 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/configure Wed Jun 04 20:20:00 2014 -0700 +++ b/common/autoconf/configure Thu Jun 05 19:37:09 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"