Merge
authorduke
Wed, 05 Jul 2017 19:43:24 +0200
changeset 24683 fa6f7e4d31c4
parent 24682 b14260e7f98f (current diff)
parent 24656 4f048ac42b56 (diff)
child 24715 67f8ba8e7841
Merge
--- a/.hgtags-top-repo	Thu Jun 05 19:39:08 2014 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 19:43:24 2017 +0200
@@ -258,3 +258,4 @@
 5800456add07e1a68170a229fb5e27376f8875e5 jdk9-b13
 4e3aa9723e9972623e3dafc321b368e7db7e9b3b jdk9-b14
 b114474fb25af4e73cb7219f7c04bd8994da03a5 jdk9-b15
+cf22a728521f91a4692b433d39d730a0a1b23155 jdk9-b16
--- a/common/autoconf/configure	Thu Jun 05 19:39:08 2014 -0700
+++ b/common/autoconf/configure	Wed Jul 05 19:43:24 2017 +0200
@@ -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"