changeset 1168:1ec6463d0499

Merge
author prr
date Mon, 09 Jun 2014 11:58:07 -0700
parents 0ab952a8de37 24152ee0ee1a
children fd8ea978b212
files
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue May 27 13:57:42 2014 -0700
+++ b/.hgtags	Mon Jun 09 11:58:07 2014 -0700
@@ -257,3 +257,5 @@
 59f6350295f9681fe5956d8bc889bf341914c6cb jdk9-b12
 5800456add07e1a68170a229fb5e27376f8875e5 jdk9-b13
 4e3aa9723e9972623e3dafc321b368e7db7e9b3b jdk9-b14
+b114474fb25af4e73cb7219f7c04bd8994da03a5 jdk9-b15
+cf22a728521f91a4692b433d39d730a0a1b23155 jdk9-b16
--- a/common/autoconf/configure	Tue May 27 13:57:42 2014 -0700
+++ b/common/autoconf/configure	Mon Jun 09 11:58:07 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"