Merge jdk8-b112

Wed, 16 Oct 2013 11:55:44 -0700

author
katleman
date
Wed, 16 Oct 2013 11:55:44 -0700
changeset 841
547316ea137d
parent 837
7deff16cf438
parent 840
6274d4cd22d3
child 842
ac748011cbbf
child 857
5b4f14990dd1

Merge

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/makefiles/javadoc/CORE_PKGS.gmk file | annotate | diff | comparison | revisions
common/makefiles/javadoc/Javadoc.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/NewMakefile.gmk	Mon Oct 14 18:53:53 2013 -0400
     1.2 +++ b/NewMakefile.gmk	Wed Oct 16 11:55:44 2013 -0700
     1.3 @@ -37,16 +37,16 @@
     1.4  
     1.5  # Assume we have GNU make, but check version.
     1.6  ifeq (,$(findstring 3.81,$(MAKE_VERSION)))
     1.7 -    ifeq (,$(findstring 3.82,$(MAKE_VERSION)))
     1.8 -        $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
     1.9 -    endif
    1.10 +  ifeq (,$(findstring 3.82,$(MAKE_VERSION)))
    1.11 +    $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
    1.12 +  endif
    1.13  endif
    1.14  
    1.15  # Locate this Makefile
    1.16  ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
    1.17 -    makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
    1.18 +  makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
    1.19  else
    1.20 -    makefile_path:=$(lastword $(MAKEFILE_LIST))
    1.21 +  makefile_path:=$(lastword $(MAKEFILE_LIST))
    1.22  endif
    1.23  root_dir:=$(dir $(makefile_path))
    1.24  
    1.25 @@ -58,27 +58,27 @@
    1.26  
    1.27  # Now determine if we have zero, one or several configurations to build.
    1.28  ifeq ($(SPEC),)
    1.29 -    # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
    1.30 +  # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
    1.31  else
    1.32 -    ifeq ($(words $(SPEC)),1)
    1.33 -        # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
    1.34 -        include $(root_dir)/common/makefiles/Main.gmk
    1.35 -    else
    1.36 -        # We are building multiple configurations.
    1.37 -        # First, find out the valid targets
    1.38 -        # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
    1.39 -        # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
    1.40 -        all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
    1.41 -            $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
    1.42 -            grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
    1.43 +  ifeq ($(words $(SPEC)),1)
    1.44 +    # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
    1.45 +    include $(root_dir)/common/makefiles/Main.gmk
    1.46 +  else
    1.47 +    # We are building multiple configurations.
    1.48 +    # First, find out the valid targets
    1.49 +    # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
    1.50 +    # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
    1.51 +    all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
    1.52 +        $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
    1.53 +        grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
    1.54  
    1.55 -        $(all_phony_targets):
    1.56 -		@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
    1.57 -			$(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
    1.58 +    $(all_phony_targets):
    1.59 +	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
    1.60 +	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
    1.61  
    1.62 -        .PHONY: $(all_phony_targets)
    1.63 +    .PHONY: $(all_phony_targets)
    1.64  
    1.65 -    endif
    1.66 +  endif
    1.67  endif
    1.68  
    1.69  # Include this after a potential spec file has been included so that the bundles target
     2.1 --- a/common/autoconf/autogen.sh	Mon Oct 14 18:53:53 2013 -0400
     2.2 +++ b/common/autoconf/autogen.sh	Wed Oct 16 11:55:44 2013 -0700
     2.3 @@ -62,7 +62,7 @@
     2.4    # We have custom sources available; also generate configure script
     2.5    # with custom hooks compiled in.
     2.6    cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | \
     2.7 -    sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | ${AUTOCONF} -W all -I$script_dir - > $custom_script_dir/generated-configure.sh
     2.8 +      sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | ${AUTOCONF} -W all -I$script_dir - > $custom_script_dir/generated-configure.sh
     2.9    rm -rf autom4te.cache
    2.10  else
    2.11    echo No custom hook found:  $custom_hook
     3.1 --- a/common/autoconf/basics.m4	Mon Oct 14 18:53:53 2013 -0400
     3.2 +++ b/common/autoconf/basics.m4	Wed Oct 16 11:55:44 2013 -0700
     3.3 @@ -24,23 +24,23 @@
     3.4  #
     3.5  
     3.6  # Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
     3.7 -# If so, then append $1 to $2\
     3.8 +# If so, then append $1 to $2 \
     3.9  # Also set JVM_ARG_OK to true/false depending on outcome.
    3.10  AC_DEFUN([ADD_JVM_ARG_IF_OK],
    3.11  [
    3.12 -    $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD
    3.13 -    $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD
    3.14 -    OUTPUT=`$3 $1 -version 2>&1`
    3.15 -    FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
    3.16 -    FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
    3.17 -    if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
    3.18 -        $2="[$]$2 $1"
    3.19 -	JVM_ARG_OK=true
    3.20 -    else
    3.21 -	$ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD
    3.22 -	$ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD
    3.23 -	JVM_ARG_OK=false
    3.24 -    fi
    3.25 +  $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD
    3.26 +  $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD
    3.27 +  OUTPUT=`$3 $1 -version 2>&1`
    3.28 +  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
    3.29 +  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
    3.30 +  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
    3.31 +    $2="[$]$2 $1"
    3.32 +    JVM_ARG_OK=true
    3.33 +  else
    3.34 +    $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD
    3.35 +    $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD
    3.36 +    JVM_ARG_OK=false
    3.37 +  fi
    3.38  ])
    3.39  
    3.40  # Appends a string to a path variable, only adding the : when needed.
    3.41 @@ -82,7 +82,7 @@
    3.42        AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
    3.43      fi
    3.44  
    3.45 -    $1="`cd "$path"; $THEPWDCMD -L`" 
    3.46 +    $1="`cd "$path"; $THEPWDCMD -L`"
    3.47    fi
    3.48  ])
    3.49  
    3.50 @@ -129,78 +129,78 @@
    3.51        AC_MSG_NOTICE([Resolving $1 (as $path) failed, using $path directly.])
    3.52        new_path="$path"
    3.53      fi
    3.54 -    
    3.55 +
    3.56      if test "x$new_path" = x; then
    3.57 -        AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
    3.58 -        has_space=`$ECHO "$complete" | $GREP " "`
    3.59 -        if test "x$has_space" != x; then
    3.60 -          AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.])
    3.61 -        fi
    3.62 -        AC_MSG_ERROR([Cannot locate the the path of $1])
    3.63 +      AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
    3.64 +      has_space=`$ECHO "$complete" | $GREP " "`
    3.65 +      if test "x$has_space" != x; then
    3.66 +        AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.])
    3.67        fi
    3.68 +      AC_MSG_ERROR([Cannot locate the the path of $1])
    3.69 +    fi
    3.70    fi
    3.71  
    3.72 -      # Now join together the path and the arguments once again
    3.73 -      if test "x$arguments" != xEOL; then
    3.74 -        new_complete="$new_path ${arguments% *}"
    3.75 -      else
    3.76 -        new_complete="$new_path"
    3.77 -      fi
    3.78 +  # Now join together the path and the arguments once again
    3.79 +  if test "x$arguments" != xEOL; then
    3.80 +    new_complete="$new_path ${arguments% *}"
    3.81 +  else
    3.82 +    new_complete="$new_path"
    3.83 +  fi
    3.84  
    3.85    if test "x$complete" != "x$new_complete"; then
    3.86 -      $1="$new_complete"
    3.87 -      AC_MSG_NOTICE([Rewriting $1 to "$new_complete"])
    3.88 -    fi
    3.89 +    $1="$new_complete"
    3.90 +    AC_MSG_NOTICE([Rewriting $1 to "$new_complete"])
    3.91 +  fi
    3.92  ])
    3.93  
    3.94  AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
    3.95  [
    3.96 -    if test "x$OPENJDK_BUILD_OS" != xwindows; then
    3.97 -        # Follow a chain of symbolic links. Use readlink
    3.98 -        # where it exists, else fall back to horribly
    3.99 -        # complicated shell code.
   3.100 -        if test "x$READLINK_TESTED" != yes; then
   3.101 -            # On MacOSX there is a readlink tool with a different
   3.102 -            # purpose than the GNU readlink tool. Check the found readlink.
   3.103 -            ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
   3.104 -            if test "x$ISGNU" = x; then
   3.105 -                 # A readlink that we do not know how to use.
   3.106 -                 # Are there other non-GNU readlinks out there?
   3.107 -                 READLINK_TESTED=yes
   3.108 -                 READLINK=
   3.109 -            fi
   3.110 +  if test "x$OPENJDK_BUILD_OS" != xwindows; then
   3.111 +    # Follow a chain of symbolic links. Use readlink
   3.112 +    # where it exists, else fall back to horribly
   3.113 +    # complicated shell code.
   3.114 +    if test "x$READLINK_TESTED" != yes; then
   3.115 +      # On MacOSX there is a readlink tool with a different
   3.116 +      # purpose than the GNU readlink tool. Check the found readlink.
   3.117 +      ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
   3.118 +      if test "x$ISGNU" = x; then
   3.119 +        # A readlink that we do not know how to use.
   3.120 +        # Are there other non-GNU readlinks out there?
   3.121 +        READLINK_TESTED=yes
   3.122 +        READLINK=
   3.123 +      fi
   3.124 +    fi
   3.125 +
   3.126 +    if test "x$READLINK" != x; then
   3.127 +      $1=`$READLINK -f [$]$1`
   3.128 +    else
   3.129 +      # Save the current directory for restoring afterwards
   3.130 +      STARTDIR=$PWD
   3.131 +      COUNTER=0
   3.132 +      sym_link_dir=`$DIRNAME [$]$1`
   3.133 +      sym_link_file=`$BASENAME [$]$1`
   3.134 +      cd $sym_link_dir
   3.135 +      # Use -P flag to resolve symlinks in directories.
   3.136 +      cd `$THEPWDCMD -P`
   3.137 +      sym_link_dir=`$THEPWDCMD -P`
   3.138 +      # Resolve file symlinks
   3.139 +      while test $COUNTER -lt 20; do
   3.140 +        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
   3.141 +        if test "x$ISLINK" == x; then
   3.142 +          # This is not a symbolic link! We are done!
   3.143 +          break
   3.144          fi
   3.145 -
   3.146 -        if test "x$READLINK" != x; then
   3.147 -            $1=`$READLINK -f [$]$1`
   3.148 -        else
   3.149 -            # Save the current directory for restoring afterwards
   3.150 -            STARTDIR=$PWD
   3.151 -            COUNTER=0
   3.152 -            sym_link_dir=`$DIRNAME [$]$1`
   3.153 -            sym_link_file=`$BASENAME [$]$1`
   3.154 -            cd $sym_link_dir
   3.155 -            # Use -P flag to resolve symlinks in directories.
   3.156 -            cd `$THEPWDCMD -P`
   3.157 -            sym_link_dir=`$THEPWDCMD -P`
   3.158 -            # Resolve file symlinks
   3.159 -            while test $COUNTER -lt 20; do
   3.160 -                ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
   3.161 -                if test "x$ISLINK" == x; then
   3.162 -                    # This is not a symbolic link! We are done!
   3.163 -                    break
   3.164 -                fi
   3.165 -                # Again resolve directory symlinks since the target of the just found
   3.166 -                # link could be in a different directory
   3.167 -                cd `$DIRNAME $ISLINK`
   3.168 -                sym_link_dir=`$THEPWDCMD -P`
   3.169 -                sym_link_file=`$BASENAME $ISLINK`
   3.170 -                let COUNTER=COUNTER+1
   3.171 -            done
   3.172 -            cd $STARTDIR
   3.173 -            $1=$sym_link_dir/$sym_link_file
   3.174 -        fi
   3.175 +        # Again resolve directory symlinks since the target of the just found
   3.176 +        # link could be in a different directory
   3.177 +        cd `$DIRNAME $ISLINK`
   3.178 +        sym_link_dir=`$THEPWDCMD -P`
   3.179 +        sym_link_file=`$BASENAME $ISLINK`
   3.180 +        let COUNTER=COUNTER+1
   3.181 +      done
   3.182 +      cd $STARTDIR
   3.183 +      $1=$sym_link_dir/$sym_link_file
   3.184      fi
   3.185 +  fi
   3.186  ])
   3.187  
   3.188  # Register a --with argument but mark it as deprecated
   3.189 @@ -214,12 +214,12 @@
   3.190  
   3.191  AC_DEFUN_ONCE([BASIC_INIT],
   3.192  [
   3.193 -# Save the original command line. This is passed to us by the wrapper configure script.
   3.194 -AC_SUBST(CONFIGURE_COMMAND_LINE)
   3.195 -DATE_WHEN_CONFIGURED=`LANG=C date`
   3.196 -AC_SUBST(DATE_WHEN_CONFIGURED)
   3.197 -AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
   3.198 -AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.])
   3.199 +  # Save the original command line. This is passed to us by the wrapper configure script.
   3.200 +  AC_SUBST(CONFIGURE_COMMAND_LINE)
   3.201 +  DATE_WHEN_CONFIGURED=`LANG=C date`
   3.202 +  AC_SUBST(DATE_WHEN_CONFIGURED)
   3.203 +  AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
   3.204 +  AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.])
   3.205  ])
   3.206  
   3.207  # Test that variable $1 denoting a program is not empty. If empty, exit with an error.
   3.208 @@ -227,15 +227,15 @@
   3.209  # $2: executable name to print in warning (optional)
   3.210  AC_DEFUN([BASIC_CHECK_NONEMPTY],
   3.211  [
   3.212 -    if test "x[$]$1" = x; then
   3.213 -        if test "x$2" = x; then
   3.214 -          PROG_NAME=translit($1,A-Z,a-z)
   3.215 -        else
   3.216 -          PROG_NAME=$2
   3.217 -        fi
   3.218 -        AC_MSG_NOTICE([Could not find $PROG_NAME!])
   3.219 -        AC_MSG_ERROR([Cannot continue])
   3.220 +  if test "x[$]$1" = x; then
   3.221 +    if test "x$2" = x; then
   3.222 +      PROG_NAME=translit($1,A-Z,a-z)
   3.223 +    else
   3.224 +      PROG_NAME=$2
   3.225      fi
   3.226 +    AC_MSG_NOTICE([Could not find $PROG_NAME!])
   3.227 +    AC_MSG_ERROR([Cannot continue])
   3.228 +  fi
   3.229  ])
   3.230  
   3.231  # Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY.
   3.232 @@ -244,8 +244,8 @@
   3.233  # $2: executable name to look for
   3.234  AC_DEFUN([BASIC_REQUIRE_PROG],
   3.235  [
   3.236 -    AC_PATH_PROGS($1, $2)
   3.237 -    BASIC_CHECK_NONEMPTY($1, $2)
   3.238 +  AC_PATH_PROGS($1, $2)
   3.239 +  BASIC_CHECK_NONEMPTY($1, $2)
   3.240  ])
   3.241  
   3.242  # Setup the most fundamental tools that relies on not much else to set up,
   3.243 @@ -253,171 +253,171 @@
   3.244  AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
   3.245  [
   3.246  
   3.247 -# Start with tools that do not need have cross compilation support
   3.248 -# and can be expected to be found in the default PATH. These tools are
   3.249 -# used by configure. Nor are these tools expected to be found in the
   3.250 -# devkit from the builddeps server either, since they are
   3.251 -# needed to download the devkit.
   3.252 +  # Start with tools that do not need have cross compilation support
   3.253 +  # and can be expected to be found in the default PATH. These tools are
   3.254 +  # used by configure. Nor are these tools expected to be found in the
   3.255 +  # devkit from the builddeps server either, since they are
   3.256 +  # needed to download the devkit.
   3.257  
   3.258 -# First are all the simple required tools.
   3.259 -BASIC_REQUIRE_PROG(BASENAME, basename)
   3.260 -BASIC_REQUIRE_PROG(BASH, bash)
   3.261 -BASIC_REQUIRE_PROG(CAT, cat)
   3.262 -BASIC_REQUIRE_PROG(CHMOD, chmod)
   3.263 -BASIC_REQUIRE_PROG(CMP, cmp)
   3.264 -BASIC_REQUIRE_PROG(COMM, comm)
   3.265 -BASIC_REQUIRE_PROG(CP, cp)
   3.266 -BASIC_REQUIRE_PROG(CPIO, cpio)
   3.267 -BASIC_REQUIRE_PROG(CUT, cut)
   3.268 -BASIC_REQUIRE_PROG(DATE, date)
   3.269 -BASIC_REQUIRE_PROG(DIFF, [gdiff diff])
   3.270 -BASIC_REQUIRE_PROG(DIRNAME, dirname)
   3.271 -BASIC_REQUIRE_PROG(ECHO, echo)
   3.272 -BASIC_REQUIRE_PROG(EXPR, expr)
   3.273 -BASIC_REQUIRE_PROG(FILE, file)
   3.274 -BASIC_REQUIRE_PROG(FIND, find)
   3.275 -BASIC_REQUIRE_PROG(HEAD, head)
   3.276 -BASIC_REQUIRE_PROG(LN, ln)
   3.277 -BASIC_REQUIRE_PROG(LS, ls)
   3.278 -BASIC_REQUIRE_PROG(MKDIR, mkdir)
   3.279 -BASIC_REQUIRE_PROG(MKTEMP, mktemp)
   3.280 -BASIC_REQUIRE_PROG(MV, mv)
   3.281 -BASIC_REQUIRE_PROG(PRINTF, printf)
   3.282 -BASIC_REQUIRE_PROG(RM, rm)
   3.283 -BASIC_REQUIRE_PROG(SH, sh)
   3.284 -BASIC_REQUIRE_PROG(SORT, sort)
   3.285 -BASIC_REQUIRE_PROG(TAIL, tail)
   3.286 -BASIC_REQUIRE_PROG(TAR, tar)
   3.287 -BASIC_REQUIRE_PROG(TEE, tee)
   3.288 -BASIC_REQUIRE_PROG(TOUCH, touch)
   3.289 -BASIC_REQUIRE_PROG(TR, tr)
   3.290 -BASIC_REQUIRE_PROG(UNAME, uname)
   3.291 -BASIC_REQUIRE_PROG(UNIQ, uniq)
   3.292 -BASIC_REQUIRE_PROG(WC, wc)
   3.293 -BASIC_REQUIRE_PROG(WHICH, which)
   3.294 -BASIC_REQUIRE_PROG(XARGS, xargs)
   3.295 +  # First are all the simple required tools.
   3.296 +  BASIC_REQUIRE_PROG(BASENAME, basename)
   3.297 +  BASIC_REQUIRE_PROG(BASH, bash)
   3.298 +  BASIC_REQUIRE_PROG(CAT, cat)
   3.299 +  BASIC_REQUIRE_PROG(CHMOD, chmod)
   3.300 +  BASIC_REQUIRE_PROG(CMP, cmp)
   3.301 +  BASIC_REQUIRE_PROG(COMM, comm)
   3.302 +  BASIC_REQUIRE_PROG(CP, cp)
   3.303 +  BASIC_REQUIRE_PROG(CPIO, cpio)
   3.304 +  BASIC_REQUIRE_PROG(CUT, cut)
   3.305 +  BASIC_REQUIRE_PROG(DATE, date)
   3.306 +  BASIC_REQUIRE_PROG(DIFF, [gdiff diff])
   3.307 +  BASIC_REQUIRE_PROG(DIRNAME, dirname)
   3.308 +  BASIC_REQUIRE_PROG(ECHO, echo)
   3.309 +  BASIC_REQUIRE_PROG(EXPR, expr)
   3.310 +  BASIC_REQUIRE_PROG(FILE, file)
   3.311 +  BASIC_REQUIRE_PROG(FIND, find)
   3.312 +  BASIC_REQUIRE_PROG(HEAD, head)
   3.313 +  BASIC_REQUIRE_PROG(LN, ln)
   3.314 +  BASIC_REQUIRE_PROG(LS, ls)
   3.315 +  BASIC_REQUIRE_PROG(MKDIR, mkdir)
   3.316 +  BASIC_REQUIRE_PROG(MKTEMP, mktemp)
   3.317 +  BASIC_REQUIRE_PROG(MV, mv)
   3.318 +  BASIC_REQUIRE_PROG(PRINTF, printf)
   3.319 +  BASIC_REQUIRE_PROG(RM, rm)
   3.320 +  BASIC_REQUIRE_PROG(SH, sh)
   3.321 +  BASIC_REQUIRE_PROG(SORT, sort)
   3.322 +  BASIC_REQUIRE_PROG(TAIL, tail)
   3.323 +  BASIC_REQUIRE_PROG(TAR, tar)
   3.324 +  BASIC_REQUIRE_PROG(TEE, tee)
   3.325 +  BASIC_REQUIRE_PROG(TOUCH, touch)
   3.326 +  BASIC_REQUIRE_PROG(TR, tr)
   3.327 +  BASIC_REQUIRE_PROG(UNAME, uname)
   3.328 +  BASIC_REQUIRE_PROG(UNIQ, uniq)
   3.329 +  BASIC_REQUIRE_PROG(WC, wc)
   3.330 +  BASIC_REQUIRE_PROG(WHICH, which)
   3.331 +  BASIC_REQUIRE_PROG(XARGS, xargs)
   3.332  
   3.333 -# Then required tools that require some special treatment.
   3.334 -AC_PROG_AWK
   3.335 -BASIC_CHECK_NONEMPTY(AWK)
   3.336 -AC_PROG_GREP
   3.337 -BASIC_CHECK_NONEMPTY(GREP)
   3.338 -AC_PROG_EGREP
   3.339 -BASIC_CHECK_NONEMPTY(EGREP)
   3.340 -AC_PROG_FGREP
   3.341 -BASIC_CHECK_NONEMPTY(FGREP)
   3.342 -AC_PROG_SED
   3.343 -BASIC_CHECK_NONEMPTY(SED)
   3.344 +  # Then required tools that require some special treatment.
   3.345 +  AC_PROG_AWK
   3.346 +  BASIC_CHECK_NONEMPTY(AWK)
   3.347 +  AC_PROG_GREP
   3.348 +  BASIC_CHECK_NONEMPTY(GREP)
   3.349 +  AC_PROG_EGREP
   3.350 +  BASIC_CHECK_NONEMPTY(EGREP)
   3.351 +  AC_PROG_FGREP
   3.352 +  BASIC_CHECK_NONEMPTY(FGREP)
   3.353 +  AC_PROG_SED
   3.354 +  BASIC_CHECK_NONEMPTY(SED)
   3.355  
   3.356 -AC_PATH_PROGS(NAWK, [nawk gawk awk])
   3.357 -BASIC_CHECK_NONEMPTY(NAWK)
   3.358 +  AC_PATH_PROGS(NAWK, [nawk gawk awk])
   3.359 +  BASIC_CHECK_NONEMPTY(NAWK)
   3.360  
   3.361 -# Always force rm.
   3.362 -RM="$RM -f"
   3.363 +  # Always force rm.
   3.364 +  RM="$RM -f"
   3.365  
   3.366 -# pwd behaves differently on various platforms and some don't support the -L flag.
   3.367 -# Always use the bash builtin pwd to get uniform behavior.
   3.368 -THEPWDCMD=pwd
   3.369 +  # pwd behaves differently on various platforms and some don't support the -L flag.
   3.370 +  # Always use the bash builtin pwd to get uniform behavior.
   3.371 +  THEPWDCMD=pwd
   3.372  
   3.373 -# These are not required on all platforms
   3.374 -AC_PATH_PROG(CYGPATH, cygpath)
   3.375 -AC_PATH_PROG(READLINK, readlink)
   3.376 -AC_PATH_PROG(DF, df)
   3.377 -AC_PATH_PROG(SETFILE, SetFile)
   3.378 +  # These are not required on all platforms
   3.379 +  AC_PATH_PROG(CYGPATH, cygpath)
   3.380 +  AC_PATH_PROG(READLINK, readlink)
   3.381 +  AC_PATH_PROG(DF, df)
   3.382 +  AC_PATH_PROG(SETFILE, SetFile)
   3.383  ])
   3.384  
   3.385  # Setup basic configuration paths, and platform-specific stuff related to PATHs.
   3.386  AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   3.387  [
   3.388 -# Locate the directory of this script.
   3.389 -SCRIPT="[$]0"
   3.390 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
   3.391 +  # Locate the directory of this script.
   3.392 +  SCRIPT="[$]0"
   3.393 +  AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
   3.394  
   3.395 -# Where is the source? It is located two levels above the configure script.
   3.396 -CURDIR="$PWD"
   3.397 -cd "$AUTOCONF_DIR/../.."
   3.398 -SRC_ROOT="`$THEPWDCMD -L`"
   3.399 +  # Where is the source? It is located two levels above the configure script.
   3.400 +  CURDIR="$PWD"
   3.401 +  cd "$AUTOCONF_DIR/../.."
   3.402 +  SRC_ROOT="`$THEPWDCMD -L`"
   3.403  
   3.404 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
   3.405 -  PATH_SEP=";"
   3.406 -  BASIC_CHECK_PATHS_WINDOWS
   3.407 -else
   3.408 -  PATH_SEP=":"
   3.409 -fi
   3.410 +  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
   3.411 +    PATH_SEP=";"
   3.412 +    BASIC_CHECK_PATHS_WINDOWS
   3.413 +  else
   3.414 +    PATH_SEP=":"
   3.415 +  fi
   3.416  
   3.417 -AC_SUBST(SRC_ROOT)
   3.418 -AC_SUBST(PATH_SEP)
   3.419 -cd "$CURDIR"
   3.420 +  AC_SUBST(SRC_ROOT)
   3.421 +  AC_SUBST(PATH_SEP)
   3.422 +  cd "$CURDIR"
   3.423  
   3.424 -BASIC_FIXUP_PATH(SRC_ROOT)
   3.425 -BASIC_FIXUP_PATH(CURDIR)
   3.426 +  BASIC_FIXUP_PATH(SRC_ROOT)
   3.427 +  BASIC_FIXUP_PATH(CURDIR)
   3.428  
   3.429 -if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
   3.430 +  if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
   3.431      # Add extra search paths on solaris for utilities like ar and as etc...
   3.432      PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
   3.433 -fi
   3.434 +  fi
   3.435  
   3.436 -# You can force the sys-root if the sys-root encoded into the cross compiler tools
   3.437 -# is not correct.
   3.438 -AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
   3.439 -  [pass this sys-root to the compilers and tools (for cross-compiling)])])
   3.440 +  # You can force the sys-root if the sys-root encoded into the cross compiler tools
   3.441 +  # is not correct.
   3.442 +  AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
   3.443 +      [pass this sys-root to the compilers and tools (for cross-compiling)])])
   3.444  
   3.445 -if test "x$with_sys_root" != x; then
   3.446 -  SYS_ROOT=$with_sys_root
   3.447 -else
   3.448 -  SYS_ROOT=/
   3.449 -fi
   3.450 -AC_SUBST(SYS_ROOT)
   3.451 +  if test "x$with_sys_root" != x; then
   3.452 +    SYS_ROOT=$with_sys_root
   3.453 +  else
   3.454 +    SYS_ROOT=/
   3.455 +  fi
   3.456 +  AC_SUBST(SYS_ROOT)
   3.457  
   3.458 -AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
   3.459 -  [search this directory for compilers and tools (for cross-compiling)])], 
   3.460 -  [TOOLS_DIR=$with_tools_dir]
   3.461 -)
   3.462 +  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
   3.463 +      [search this directory for compilers and tools (for cross-compiling)])],
   3.464 +      [TOOLS_DIR=$with_tools_dir]
   3.465 +  )
   3.466  
   3.467 -AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
   3.468 -  [use this directory as base for tools-dir and sys-root (for cross-compiling)])],
   3.469 -  [
   3.470 -    if test "x$with_sys_root" != x; then
   3.471 -      AC_MSG_ERROR([Cannot specify both --with-devkit and --with-sys-root at the same time])
   3.472 -    fi
   3.473 -    BASIC_FIXUP_PATH([with_devkit])
   3.474 -    BASIC_APPEND_TO_PATH([TOOLS_DIR],$with_devkit/bin)
   3.475 -    if test -d "$with_devkit/$host_alias/libc"; then
   3.476 -      SYS_ROOT=$with_devkit/$host_alias/libc
   3.477 -    elif test -d "$with_devkit/$host/sys-root"; then
   3.478 -      SYS_ROOT=$with_devkit/$host/sys-root
   3.479 -    fi
   3.480 -  ])
   3.481 +  AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
   3.482 +      [use this directory as base for tools-dir and sys-root (for cross-compiling)])],
   3.483 +      [
   3.484 +        if test "x$with_sys_root" != x; then
   3.485 +          AC_MSG_ERROR([Cannot specify both --with-devkit and --with-sys-root at the same time])
   3.486 +        fi
   3.487 +        BASIC_FIXUP_PATH([with_devkit])
   3.488 +        BASIC_APPEND_TO_PATH([TOOLS_DIR],$with_devkit/bin)
   3.489 +        if test -d "$with_devkit/$host_alias/libc"; then
   3.490 +          SYS_ROOT=$with_devkit/$host_alias/libc
   3.491 +        elif test -d "$with_devkit/$host/sys-root"; then
   3.492 +          SYS_ROOT=$with_devkit/$host/sys-root
   3.493 +        fi
   3.494 +      ])
   3.495  ])
   3.496  
   3.497  AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
   3.498  [
   3.499  
   3.500 -AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
   3.501 -	[use this as the name of the configuration @<:@generated from important configuration options@:>@])],
   3.502 -        [ CONF_NAME=${with_conf_name} ])
   3.503 +  AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
   3.504 +      [use this as the name of the configuration @<:@generated from important configuration options@:>@])],
   3.505 +      [ CONF_NAME=${with_conf_name} ])
   3.506  
   3.507 -# Test from where we are running configure, in or outside of src root.
   3.508 -if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
   3.509 -        || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
   3.510 -        || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
   3.511 +  # Test from where we are running configure, in or outside of src root.
   3.512 +  if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
   3.513 +      || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
   3.514 +      || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
   3.515      # We are running configure from the src root.
   3.516      # Create a default ./build/target-variant-debuglevel output root.
   3.517      if test "x${CONF_NAME}" = x; then
   3.518 -        CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
   3.519 +      CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
   3.520      fi
   3.521      OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
   3.522      $MKDIR -p "$OUTPUT_ROOT"
   3.523      if test ! -d "$OUTPUT_ROOT"; then
   3.524 -        AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
   3.525 +      AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
   3.526      fi
   3.527 -else
   3.528 +  else
   3.529      # We are running configure from outside of the src dir.
   3.530      # Then use the current directory as output dir!
   3.531      # If configuration is situated in normal build directory, just use the build
   3.532      # directory name as configuration name, otherwise use the complete path.
   3.533      if test "x${CONF_NAME}" = x; then
   3.534 -        CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
   3.535 +      CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
   3.536      fi
   3.537      OUTPUT_ROOT="$CURDIR"
   3.538  
   3.539 @@ -428,10 +428,10 @@
   3.540        # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
   3.541        # other files
   3.542        files_present=`$LS $OUTPUT_ROOT`
   3.543 -      # Configure has already touched config.log and confdefs.h in the current dir when this check 
   3.544 +      # Configure has already touched config.log and confdefs.h in the current dir when this check
   3.545        # is performed.
   3.546        filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \
   3.547 -                                             | $TR -d '\n'`
   3.548 +      | $TR -d '\n'`
   3.549        if test "x$filtered_files" != x; then
   3.550          AC_MSG_NOTICE([Current directory is $CURDIR.])
   3.551          AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here])
   3.552 @@ -443,46 +443,46 @@
   3.553          AC_MSG_ERROR([Will not continue creating configuration in $CURDIR])
   3.554        fi
   3.555      fi
   3.556 -fi
   3.557 -AC_MSG_CHECKING([what configuration name to use])
   3.558 -AC_MSG_RESULT([$CONF_NAME])
   3.559 +  fi
   3.560 +  AC_MSG_CHECKING([what configuration name to use])
   3.561 +  AC_MSG_RESULT([$CONF_NAME])
   3.562  
   3.563 -BASIC_FIXUP_PATH(OUTPUT_ROOT)
   3.564 +  BASIC_FIXUP_PATH(OUTPUT_ROOT)
   3.565  
   3.566 -AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk)
   3.567 -AC_SUBST(CONF_NAME, $CONF_NAME)
   3.568 -AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT)
   3.569 +  AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk)
   3.570 +  AC_SUBST(CONF_NAME, $CONF_NAME)
   3.571 +  AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT)
   3.572  
   3.573 -# Most of the probed defines are put into config.h
   3.574 -AC_CONFIG_HEADERS([$OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in])
   3.575 -# The spec.gmk file contains all variables for the make system.
   3.576 -AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
   3.577 -# The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
   3.578 -AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in])
   3.579 -# The bootcycle-spec.gmk file contains support for boot cycle builds.
   3.580 -AC_CONFIG_FILES([$OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in])
   3.581 -# The compare.sh is used to compare the build output to other builds.
   3.582 -AC_CONFIG_FILES([$OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in])
   3.583 -# Spec.sh is currently used by compare-objects.sh
   3.584 -AC_CONFIG_FILES([$OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in])
   3.585 -# The generated Makefile knows where the spec.gmk is and where the source is.
   3.586 -# You can run make from the OUTPUT_ROOT, or from the top-level Makefile
   3.587 -# which will look for generated configurations
   3.588 -AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in])
   3.589 +  # Most of the probed defines are put into config.h
   3.590 +  AC_CONFIG_HEADERS([$OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in])
   3.591 +  # The spec.gmk file contains all variables for the make system.
   3.592 +  AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
   3.593 +  # The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
   3.594 +  AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in])
   3.595 +  # The bootcycle-spec.gmk file contains support for boot cycle builds.
   3.596 +  AC_CONFIG_FILES([$OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in])
   3.597 +  # The compare.sh is used to compare the build output to other builds.
   3.598 +  AC_CONFIG_FILES([$OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in])
   3.599 +  # Spec.sh is currently used by compare-objects.sh
   3.600 +  AC_CONFIG_FILES([$OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in])
   3.601 +  # The generated Makefile knows where the spec.gmk is and where the source is.
   3.602 +  # You can run make from the OUTPUT_ROOT, or from the top-level Makefile
   3.603 +  # which will look for generated configurations
   3.604 +  AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in])
   3.605  
   3.606 -# Save the arguments given to us
   3.607 -echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
   3.608 +  # Save the arguments given to us
   3.609 +  echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
   3.610  ])
   3.611  
   3.612  AC_DEFUN_ONCE([BASIC_SETUP_LOGGING],
   3.613  [
   3.614 -# Setup default logging of stdout and stderr to build.log in the output root.
   3.615 -BUILD_LOG='$(OUTPUT_ROOT)/build.log'
   3.616 -BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
   3.617 -BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
   3.618 -AC_SUBST(BUILD_LOG)
   3.619 -AC_SUBST(BUILD_LOG_PREVIOUS)
   3.620 -AC_SUBST(BUILD_LOG_WRAPPER)
   3.621 +  # Setup default logging of stdout and stderr to build.log in the output root.
   3.622 +  BUILD_LOG='$(OUTPUT_ROOT)/build.log'
   3.623 +  BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
   3.624 +  BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
   3.625 +  AC_SUBST(BUILD_LOG)
   3.626 +  AC_SUBST(BUILD_LOG_PREVIOUS)
   3.627 +  AC_SUBST(BUILD_LOG_WRAPPER)
   3.628  ])
   3.629  
   3.630  
   3.631 @@ -581,85 +581,85 @@
   3.632  
   3.633  AC_DEFUN([BASIC_CHECK_FIND_DELETE],
   3.634  [
   3.635 -    # Test if find supports -delete
   3.636 -    AC_MSG_CHECKING([if find supports -delete])
   3.637 -    FIND_DELETE="-delete"
   3.638 +  # Test if find supports -delete
   3.639 +  AC_MSG_CHECKING([if find supports -delete])
   3.640 +  FIND_DELETE="-delete"
   3.641  
   3.642 -    DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
   3.643 +  DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
   3.644  
   3.645 -    echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
   3.646 +  echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
   3.647  
   3.648 -    TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
   3.649 -    if test -f $DELETEDIR/TestIfFindSupportsDelete; then
   3.650 -        # No, it does not.
   3.651 -        rm $DELETEDIR/TestIfFindSupportsDelete
   3.652 -        FIND_DELETE="-exec rm \{\} \+"
   3.653 -        AC_MSG_RESULT([no])    
   3.654 -    else
   3.655 -        AC_MSG_RESULT([yes])    
   3.656 -    fi
   3.657 -    rmdir $DELETEDIR
   3.658 -    AC_SUBST(FIND_DELETE)
   3.659 +  TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
   3.660 +  if test -f $DELETEDIR/TestIfFindSupportsDelete; then
   3.661 +    # No, it does not.
   3.662 +    rm $DELETEDIR/TestIfFindSupportsDelete
   3.663 +    FIND_DELETE="-exec rm \{\} \+"
   3.664 +    AC_MSG_RESULT([no])
   3.665 +  else
   3.666 +    AC_MSG_RESULT([yes])
   3.667 +  fi
   3.668 +  rmdir $DELETEDIR
   3.669 +  AC_SUBST(FIND_DELETE)
   3.670  ])
   3.671  
   3.672  AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
   3.673  [
   3.674 -BASIC_CHECK_GNU_MAKE
   3.675 +  BASIC_CHECK_GNU_MAKE
   3.676  
   3.677 -BASIC_CHECK_FIND_DELETE
   3.678 +  BASIC_CHECK_FIND_DELETE
   3.679  
   3.680 -# These tools might not be installed by default, 
   3.681 -# need hint on how to install them.
   3.682 -BASIC_REQUIRE_PROG(UNZIP, unzip)
   3.683 -BASIC_REQUIRE_PROG(ZIP, zip)
   3.684 +  # These tools might not be installed by default,
   3.685 +  # need hint on how to install them.
   3.686 +  BASIC_REQUIRE_PROG(UNZIP, unzip)
   3.687 +  BASIC_REQUIRE_PROG(ZIP, zip)
   3.688  
   3.689 -# Non-required basic tools
   3.690 +  # Non-required basic tools
   3.691  
   3.692 -AC_PATH_PROG(LDD, ldd)
   3.693 -if test "x$LDD" = "x"; then
   3.694 +  AC_PATH_PROG(LDD, ldd)
   3.695 +  if test "x$LDD" = "x"; then
   3.696      # List shared lib dependencies is used for
   3.697      # debug output and checking for forbidden dependencies.
   3.698      # We can build without it.
   3.699      LDD="true"
   3.700 -fi
   3.701 -AC_PATH_PROG(OTOOL, otool)
   3.702 -if test "x$OTOOL" = "x"; then
   3.703 -   OTOOL="true"
   3.704 -fi
   3.705 -AC_PATH_PROGS(READELF, [readelf greadelf])
   3.706 -AC_PATH_PROG(HG, hg)
   3.707 -AC_PATH_PROG(STAT, stat)
   3.708 -AC_PATH_PROG(TIME, time)
   3.709 -# Check if it's GNU time
   3.710 -IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
   3.711 -if test "x$IS_GNU_TIME" != x; then
   3.712 -  IS_GNU_TIME=yes
   3.713 -else
   3.714 -  IS_GNU_TIME=no
   3.715 -fi
   3.716 -AC_SUBST(IS_GNU_TIME)
   3.717 +  fi
   3.718 +  AC_PATH_PROG(OTOOL, otool)
   3.719 +  if test "x$OTOOL" = "x"; then
   3.720 +    OTOOL="true"
   3.721 +  fi
   3.722 +  AC_PATH_PROGS(READELF, [readelf greadelf])
   3.723 +  AC_PATH_PROG(HG, hg)
   3.724 +  AC_PATH_PROG(STAT, stat)
   3.725 +  AC_PATH_PROG(TIME, time)
   3.726 +  # Check if it's GNU time
   3.727 +  IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
   3.728 +  if test "x$IS_GNU_TIME" != x; then
   3.729 +    IS_GNU_TIME=yes
   3.730 +  else
   3.731 +    IS_GNU_TIME=no
   3.732 +  fi
   3.733 +  AC_SUBST(IS_GNU_TIME)
   3.734  
   3.735 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
   3.736 -  BASIC_REQUIRE_PROG(COMM, comm)
   3.737 -fi
   3.738 +  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
   3.739 +    BASIC_REQUIRE_PROG(COMM, comm)
   3.740 +  fi
   3.741  
   3.742 -if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
   3.743 -  BASIC_REQUIRE_PROG(XATTR, xattr)
   3.744 -  AC_PATH_PROG(CODESIGN, codesign)
   3.745 -  if test "x$CODESIGN" != "x"; then
   3.746 -    # Verify that the openjdk_codesign certificate is present
   3.747 -    AC_MSG_CHECKING([if openjdk_codesign certificate is present])
   3.748 -    rm -f codesign-testfile
   3.749 -    touch codesign-testfile
   3.750 -    codesign -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
   3.751 -    rm -f codesign-testfile
   3.752 -    if test "x$CODESIGN" = x; then
   3.753 -      AC_MSG_RESULT([no])
   3.754 -    else
   3.755 -      AC_MSG_RESULT([yes])
   3.756 +  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
   3.757 +    BASIC_REQUIRE_PROG(XATTR, xattr)
   3.758 +    AC_PATH_PROG(CODESIGN, codesign)
   3.759 +    if test "x$CODESIGN" != "x"; then
   3.760 +      # Verify that the openjdk_codesign certificate is present
   3.761 +      AC_MSG_CHECKING([if openjdk_codesign certificate is present])
   3.762 +      rm -f codesign-testfile
   3.763 +      touch codesign-testfile
   3.764 +      codesign -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
   3.765 +      rm -f codesign-testfile
   3.766 +      if test "x$CODESIGN" = x; then
   3.767 +        AC_MSG_RESULT([no])
   3.768 +      else
   3.769 +        AC_MSG_RESULT([yes])
   3.770 +      fi
   3.771      fi
   3.772    fi
   3.773 -fi
   3.774  ])
   3.775  
   3.776  # Check if build directory is on local disk. If not possible to determine,
   3.777 @@ -669,8 +669,8 @@
   3.778  # Argument 3: what to do otherwise (remote disk or failure)
   3.779  AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
   3.780  [
   3.781 -	# df -l lists only local disks; if the given directory is not found then
   3.782 -	# a non-zero exit code is given
   3.783 +  # df -l lists only local disks; if the given directory is not found then
   3.784 +  # a non-zero exit code is given
   3.785    if test "x$DF" = x; then
   3.786      if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
   3.787        # msys does not have df; use Windows "net use" instead.
   3.788 @@ -707,32 +707,30 @@
   3.789  
   3.790  AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
   3.791  [
   3.792 +  AC_MSG_CHECKING([if build directory is on local disk])
   3.793 +  BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT,
   3.794 +      [OUTPUT_DIR_IS_LOCAL="yes"],
   3.795 +      [OUTPUT_DIR_IS_LOCAL="no"])
   3.796 +  AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL)
   3.797  
   3.798 -AC_MSG_CHECKING([if build directory is on local disk])
   3.799 -BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT,
   3.800 -  [OUTPUT_DIR_IS_LOCAL="yes"],
   3.801 -  [OUTPUT_DIR_IS_LOCAL="no"])
   3.802 -AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL)
   3.803 +  BASIC_CHECK_SRC_PERMS
   3.804  
   3.805 -BASIC_CHECK_SRC_PERMS
   3.806 +  # Check if the user has any old-style ALT_ variables set.
   3.807 +  FOUND_ALT_VARIABLES=`env | grep ^ALT_`
   3.808  
   3.809 -# Check if the user has any old-style ALT_ variables set.
   3.810 -FOUND_ALT_VARIABLES=`env | grep ^ALT_`
   3.811 +  # Before generating output files, test if they exist. If they do, this is a reconfigure.
   3.812 +  # Since we can't properly handle the dependencies for this, warn the user about the situation
   3.813 +  if test -e $OUTPUT_ROOT/spec.gmk; then
   3.814 +    IS_RECONFIGURE=yes
   3.815 +  else
   3.816 +    IS_RECONFIGURE=no
   3.817 +  fi
   3.818  
   3.819 -# Before generating output files, test if they exist. If they do, this is a reconfigure.
   3.820 -# Since we can't properly handle the dependencies for this, warn the user about the situation
   3.821 -if test -e $OUTPUT_ROOT/spec.gmk; then
   3.822 -  IS_RECONFIGURE=yes
   3.823 -else
   3.824 -  IS_RECONFIGURE=no
   3.825 -fi
   3.826 -
   3.827 -if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then
   3.828 -  HIDE_PERFORMANCE_HINTS=yes
   3.829 -else
   3.830 -  HIDE_PERFORMANCE_HINTS=no
   3.831 -  # Hide it the next time around...
   3.832 -  $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1
   3.833 -fi
   3.834 -
   3.835 +  if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then
   3.836 +    HIDE_PERFORMANCE_HINTS=yes
   3.837 +  else
   3.838 +    HIDE_PERFORMANCE_HINTS=no
   3.839 +    # Hide it the next time around...
   3.840 +    $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1
   3.841 +  fi
   3.842  ])
     4.1 --- a/common/autoconf/basics_windows.m4	Mon Oct 14 18:53:53 2013 -0400
     4.2 +++ b/common/autoconf/basics_windows.m4	Wed Oct 16 11:55:44 2013 -0700
     4.3 @@ -145,7 +145,7 @@
     4.4      # Not in mixed or Windows style, start by that.
     4.5      new_path=`cmd //c echo $path`
     4.6    fi
     4.7 -  
     4.8 +
     4.9    BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path])
    4.10    BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
    4.11    if test "x$path" != "x$new_path"; then
    4.12 @@ -175,8 +175,8 @@
    4.13    # bat and cmd files are not always considered executable in cygwin causing which
    4.14    # to not find them
    4.15    if test "x$new_path" = x \
    4.16 -           && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
    4.17 -           && test "x`$LS \"$path\" 2>/dev/null`" != x; then
    4.18 +      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
    4.19 +      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
    4.20      new_path=`$CYGPATH -u "$path"`
    4.21    fi
    4.22    if test "x$new_path" = x; then
    4.23 @@ -191,8 +191,8 @@
    4.24      # bat and cmd files are not always considered executable in cygwin causing which
    4.25      # to not find them
    4.26      if test "x$new_path" = x \
    4.27 -             && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
    4.28 -             && test "x`$LS \"$path\" 2>/dev/null`" != x; then
    4.29 +        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
    4.30 +        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
    4.31        new_path=`$CYGPATH -u "$path"`
    4.32      fi
    4.33      if test "x$new_path" = x; then
    4.34 @@ -218,9 +218,9 @@
    4.35      # Short path failed, file does not exist as specified.
    4.36      # Try adding .exe or .cmd
    4.37      if test -f "${new_path}.exe"; then
    4.38 -       input_to_shortpath="${new_path}.exe"
    4.39 +      input_to_shortpath="${new_path}.exe"
    4.40      elif test -f "${new_path}.cmd"; then
    4.41 -       input_to_shortpath="${new_path}.cmd"
    4.42 +      input_to_shortpath="${new_path}.cmd"
    4.43      else
    4.44        AC_MSG_NOTICE([The path of $1, which resolves as "$new_path", is invalid.])
    4.45        AC_MSG_NOTICE([Neither "$new_path" nor "$new_path.exe/cmd" can be found])
    4.46 @@ -254,7 +254,7 @@
    4.47  
    4.48    # Now try to locate executable using which
    4.49    new_path=`$WHICH "$new_path" 2> /dev/null`
    4.50 -  
    4.51 +
    4.52    if test "x$new_path" = x; then
    4.53      # Oops. Which didn't find the executable.
    4.54      # The splitting of arguments from the executable at a space might have been incorrect,
    4.55 @@ -264,9 +264,9 @@
    4.56      arguments="EOL"
    4.57      new_path="$path"
    4.58      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
    4.59 -    
    4.60 +
    4.61      new_path=`$WHICH "$new_path" 2> /dev/null`
    4.62 -    
    4.63 +
    4.64      if test "x$new_path" = x; then
    4.65        # It's still not found. Now this is an unrecoverable error.
    4.66        AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
    4.67 @@ -302,7 +302,7 @@
    4.68  [
    4.69    SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
    4.70    if test $SRC_ROOT_LENGTH -gt 100; then
    4.71 -      AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported])
    4.72 +    AC_MSG_ERROR([Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported])
    4.73    fi
    4.74  
    4.75    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
    4.76 @@ -311,14 +311,14 @@
    4.77      AC_MSG_RESULT([$CYGWIN_VERSION])
    4.78      WINDOWS_ENV_VENDOR='cygwin'
    4.79      WINDOWS_ENV_VERSION="$CYGWIN_VERSION"
    4.80 -    
    4.81 +
    4.82      CYGWIN_VERSION_OK=`$ECHO $CYGWIN_VERSION | $GREP ^1.7.`
    4.83      if test "x$CYGWIN_VERSION_OK" = x; then
    4.84        AC_MSG_NOTICE([Your cygwin is too old. You are running $CYGWIN_VERSION, but at least cygwin 1.7 is required. Please upgrade.])
    4.85        AC_MSG_ERROR([Cannot continue])
    4.86      fi
    4.87      if test "x$CYGPATH" = x; then
    4.88 -        AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path])
    4.89 +      AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path])
    4.90      fi
    4.91      AC_MSG_CHECKING([cygwin root directory as unix-style path])
    4.92      # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away
    4.93 @@ -329,13 +329,13 @@
    4.94      WINDOWS_ENV_ROOT_PATH="$CYGWIN_ROOT_PATH"
    4.95      test_cygdrive_prefix=`$ECHO $CYGWIN_ROOT_PATH | $GREP ^/cygdrive/`
    4.96      if test "x$test_cygdrive_prefix" = x; then
    4.97 -        AC_MSG_ERROR([Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c.])
    4.98 +      AC_MSG_ERROR([Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c.])
    4.99      fi
   4.100    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
   4.101      AC_MSG_CHECKING([msys release])
   4.102      MSYS_VERSION=`$UNAME -r`
   4.103      AC_MSG_RESULT([$MSYS_VERSION])
   4.104 -    
   4.105 +
   4.106      WINDOWS_ENV_VENDOR='msys'
   4.107      WINDOWS_ENV_VERSION="$MSYS_VERSION"
   4.108  
   4.109 @@ -367,12 +367,12 @@
   4.110  
   4.111  AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH],
   4.112  [
   4.113 -# When using cygwin or msys, we need a wrapper binary that renames
   4.114 -# /cygdrive/c/ arguments into c:/ arguments and peeks into
   4.115 -# @files and rewrites these too! This wrapper binary is
   4.116 -# called fixpath.
   4.117 -FIXPATH=
   4.118 -if test "x$OPENJDK_BUILD_OS" = xwindows; then
   4.119 +  # When using cygwin or msys, we need a wrapper binary that renames
   4.120 +  # /cygdrive/c/ arguments into c:/ arguments and peeks into
   4.121 +  # @files and rewrites these too! This wrapper binary is
   4.122 +  # called fixpath.
   4.123 +  FIXPATH=
   4.124 +  if test "x$OPENJDK_BUILD_OS" = xwindows; then
   4.125      AC_MSG_CHECKING([if fixpath can be created])
   4.126      FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
   4.127      FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe"
   4.128 @@ -389,7 +389,7 @@
   4.129        # @ was chosen as separator to minimize risk of other tools messing around with it
   4.130        all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" | tr ' ' '\n' | grep '^/./' | sort | uniq`
   4.131        fixpath_argument_list=`echo $all_unique_prefixes  | tr ' ' '@'`
   4.132 -      
   4.133 +
   4.134        FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list"
   4.135      fi
   4.136      rm -f $OUTPUT_ROOT/fixpath*
   4.137 @@ -397,24 +397,24 @@
   4.138      $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1
   4.139      cd $CURDIR
   4.140  
   4.141 -    if test ! -x $OUTPUT_ROOT/fixpath.exe; then 
   4.142 -        AC_MSG_RESULT([no])
   4.143 -        cat $OUTPUT_ROOT/fixpath1.log
   4.144 -        AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe])
   4.145 +    if test ! -x $OUTPUT_ROOT/fixpath.exe; then
   4.146 +      AC_MSG_RESULT([no])
   4.147 +      cat $OUTPUT_ROOT/fixpath1.log
   4.148 +      AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe])
   4.149      fi
   4.150      AC_MSG_RESULT([yes])
   4.151      AC_MSG_CHECKING([if fixpath.exe works])
   4.152      cd $OUTPUT_ROOT
   4.153 -    $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1 
   4.154 +    $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1
   4.155      cd $CURDIR
   4.156 -    if test ! -x $OUTPUT_ROOT/fixpath2.exe; then 
   4.157 -        AC_MSG_RESULT([no])
   4.158 -        cat $OUTPUT_ROOT/fixpath2.log
   4.159 -        AC_MSG_ERROR([fixpath did not work!])
   4.160 +    if test ! -x $OUTPUT_ROOT/fixpath2.exe; then
   4.161 +      AC_MSG_RESULT([no])
   4.162 +      cat $OUTPUT_ROOT/fixpath2.log
   4.163 +      AC_MSG_ERROR([fixpath did not work!])
   4.164      fi
   4.165      AC_MSG_RESULT([yes])
   4.166      rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj
   4.167 -fi
   4.168 +  fi
   4.169  
   4.170 -AC_SUBST(FIXPATH)
   4.171 +  AC_SUBST(FIXPATH)
   4.172  ])
     5.1 --- a/common/autoconf/boot-jdk.m4	Mon Oct 14 18:53:53 2013 -0400
     5.2 +++ b/common/autoconf/boot-jdk.m4	Wed Oct 16 11:55:44 2013 -0700
     5.3 @@ -44,7 +44,7 @@
     5.4            AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring])
     5.5            AC_MSG_NOTICE([(This might be an JRE instead of an JDK)])
     5.6            BOOT_JDK_FOUND=no
     5.7 -        else 
     5.8 +        else
     5.9            # Do we have an rt.jar? (On MacOSX it is called classes.jar)
    5.10            if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
    5.11              AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring])
    5.12 @@ -79,70 +79,70 @@
    5.13  # Test: Is bootjdk explicitely set by command line arguments?
    5.14  AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS],
    5.15  [
    5.16 -if test "x$with_boot_jdk" != x; then
    5.17 +  if test "x$with_boot_jdk" != x; then
    5.18      BOOT_JDK=$with_boot_jdk
    5.19      BOOT_JDK_FOUND=maybe
    5.20      AC_MSG_NOTICE([Found potential Boot JDK using configure arguments])
    5.21 -fi
    5.22 +  fi
    5.23  ])
    5.24  
    5.25  # Test: Is bootjdk available from builddeps?
    5.26  AC_DEFUN([BOOTJDK_CHECK_BUILDDEPS],
    5.27  [
    5.28 -    BDEPS_CHECK_MODULE(BOOT_JDK, bootjdk, xxx, [BOOT_JDK_FOUND=maybe], [BOOT_JDK_FOUND=no])
    5.29 +  BDEPS_CHECK_MODULE(BOOT_JDK, bootjdk, xxx, [BOOT_JDK_FOUND=maybe], [BOOT_JDK_FOUND=no])
    5.30  ])
    5.31  
    5.32  # Test: Is $JAVA_HOME set?
    5.33  AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME],
    5.34  [
    5.35 -    if test "x$JAVA_HOME" != x; then
    5.36 -        JAVA_HOME_PROCESSED="$JAVA_HOME"
    5.37 -        BASIC_FIXUP_PATH(JAVA_HOME_PROCESSED)
    5.38 -        if test ! -d "$JAVA_HOME_PROCESSED"; then
    5.39 -            AC_MSG_NOTICE([Your JAVA_HOME points to a non-existing directory!])
    5.40 -        else
    5.41 -          # Aha, the user has set a JAVA_HOME
    5.42 -          # let us use that as the Boot JDK.
    5.43 -          BOOT_JDK="$JAVA_HOME_PROCESSED"
    5.44 -          BOOT_JDK_FOUND=maybe
    5.45 -          AC_MSG_NOTICE([Found potential Boot JDK using JAVA_HOME])
    5.46 -        fi
    5.47 +  if test "x$JAVA_HOME" != x; then
    5.48 +    JAVA_HOME_PROCESSED="$JAVA_HOME"
    5.49 +    BASIC_FIXUP_PATH(JAVA_HOME_PROCESSED)
    5.50 +    if test ! -d "$JAVA_HOME_PROCESSED"; then
    5.51 +      AC_MSG_NOTICE([Your JAVA_HOME points to a non-existing directory!])
    5.52 +    else
    5.53 +      # Aha, the user has set a JAVA_HOME
    5.54 +      # let us use that as the Boot JDK.
    5.55 +      BOOT_JDK="$JAVA_HOME_PROCESSED"
    5.56 +      BOOT_JDK_FOUND=maybe
    5.57 +      AC_MSG_NOTICE([Found potential Boot JDK using JAVA_HOME])
    5.58      fi
    5.59 +  fi
    5.60  ])
    5.61  
    5.62  # Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
    5.63  AC_DEFUN([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK],
    5.64  [
    5.65 -    AC_PATH_PROG(JAVAC_CHECK, javac)
    5.66 -    AC_PATH_PROG(JAVA_CHECK, java)
    5.67 -    BINARY="$JAVAC_CHECK"
    5.68 -    if test "x$JAVAC_CHECK" = x; then
    5.69 -        BINARY="$JAVA_CHECK"
    5.70 +  AC_PATH_PROG(JAVAC_CHECK, javac)
    5.71 +  AC_PATH_PROG(JAVA_CHECK, java)
    5.72 +  BINARY="$JAVAC_CHECK"
    5.73 +  if test "x$JAVAC_CHECK" = x; then
    5.74 +    BINARY="$JAVA_CHECK"
    5.75 +  fi
    5.76 +  if test "x$BINARY" != x; then
    5.77 +    # So there is a java(c) binary, it might be part of a JDK.
    5.78 +    # Lets find the JDK/JRE directory by following symbolic links.
    5.79 +    # Linux/GNU systems often have links from /usr/bin/java to
    5.80 +    # /etc/alternatives/java to the real JDK binary.
    5.81 +    BASIC_REMOVE_SYMBOLIC_LINKS(BINARY)
    5.82 +    BOOT_JDK=`dirname "$BINARY"`
    5.83 +    BOOT_JDK=`cd "$BOOT_JDK/.."; pwd`
    5.84 +    if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then
    5.85 +      # Looks like we found ourselves an JDK
    5.86 +      BOOT_JDK_FOUND=maybe
    5.87 +      AC_MSG_NOTICE([Found potential Boot JDK using java(c) in PATH])
    5.88      fi
    5.89 -    if test "x$BINARY" != x; then
    5.90 -        # So there is a java(c) binary, it might be part of a JDK.
    5.91 -        # Lets find the JDK/JRE directory by following symbolic links.
    5.92 -        # Linux/GNU systems often have links from /usr/bin/java to 
    5.93 -        # /etc/alternatives/java to the real JDK binary.
    5.94 -        BASIC_REMOVE_SYMBOLIC_LINKS(BINARY)
    5.95 -        BOOT_JDK=`dirname "$BINARY"`
    5.96 -        BOOT_JDK=`cd "$BOOT_JDK/.."; pwd`
    5.97 -        if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then
    5.98 -            # Looks like we found ourselves an JDK
    5.99 -            BOOT_JDK_FOUND=maybe
   5.100 -            AC_MSG_NOTICE([Found potential Boot JDK using java(c) in PATH])
   5.101 -        fi
   5.102 -    fi
   5.103 +  fi
   5.104  ])
   5.105  
   5.106  # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
   5.107  AC_DEFUN([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME],
   5.108  [
   5.109 -    if test -x /usr/libexec/java_home; then
   5.110 -        BOOT_JDK=`/usr/libexec/java_home`
   5.111 -        BOOT_JDK_FOUND=maybe
   5.112 -        AC_MSG_NOTICE([Found potential Boot JDK using /usr/libexec/java_home])
   5.113 -    fi
   5.114 +  if test -x /usr/libexec/java_home; then
   5.115 +    BOOT_JDK=`/usr/libexec/java_home`
   5.116 +    BOOT_JDK_FOUND=maybe
   5.117 +    AC_MSG_NOTICE([Found potential Boot JDK using /usr/libexec/java_home])
   5.118 +  fi
   5.119  ])
   5.120  
   5.121  # Look for a jdk in the given path. If there are multiple, try to select the newest.
   5.122 @@ -204,123 +204,123 @@
   5.123    AC_MSG_CHECKING([for $2 in Boot JDK])
   5.124    $1=$BOOT_JDK/bin/$2
   5.125    if test ! -x [$]$1; then
   5.126 -      AC_MSG_RESULT(not found)
   5.127 -      AC_MSG_NOTICE([Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk])
   5.128 -      AC_MSG_ERROR([Could not find $2 in the Boot JDK])
   5.129 +    AC_MSG_RESULT(not found)
   5.130 +    AC_MSG_NOTICE([Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk])
   5.131 +    AC_MSG_ERROR([Could not find $2 in the Boot JDK])
   5.132    fi
   5.133    AC_MSG_RESULT(ok)
   5.134  ])
   5.135  
   5.136  ###############################################################################
   5.137  #
   5.138 -# We need a Boot JDK to bootstrap the build. 
   5.139 +# We need a Boot JDK to bootstrap the build.
   5.140  #
   5.141  
   5.142  AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
   5.143  [
   5.144 -BOOT_JDK_FOUND=no
   5.145 -AC_ARG_WITH(boot-jdk, [AS_HELP_STRING([--with-boot-jdk],
   5.146 -    [path to Boot JDK (used to bootstrap build) @<:@probed@:>@])])
   5.147 +  BOOT_JDK_FOUND=no
   5.148 +  AC_ARG_WITH(boot-jdk, [AS_HELP_STRING([--with-boot-jdk],
   5.149 +      [path to Boot JDK (used to bootstrap build) @<:@probed@:>@])])
   5.150  
   5.151 -# We look for the Boot JDK through various means, going from more certain to
   5.152 -# more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if
   5.153 -# we detected something (if so, the path to the jdk is in BOOT_JDK). But we 
   5.154 -# must check if this is indeed valid; otherwise we'll continue looking.
   5.155 +  # We look for the Boot JDK through various means, going from more certain to
   5.156 +  # more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if
   5.157 +  # we detected something (if so, the path to the jdk is in BOOT_JDK). But we
   5.158 +  # must check if this is indeed valid; otherwise we'll continue looking.
   5.159  
   5.160 -# Test: Is bootjdk explicitely set by command line arguments?
   5.161 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_ARGUMENTS])
   5.162 -if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then
   5.163 -  # Having specified an argument which is incorrect will produce an instant failure;
   5.164 -  # we should not go on looking
   5.165 -  AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK])
   5.166 -fi
   5.167 +  # Test: Is bootjdk explicitely set by command line arguments?
   5.168 +  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_ARGUMENTS])
   5.169 +  if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then
   5.170 +    # Having specified an argument which is incorrect will produce an instant failure;
   5.171 +    # we should not go on looking
   5.172 +    AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK])
   5.173 +  fi
   5.174  
   5.175 -# Test: Is bootjdk available from builddeps?
   5.176 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_BUILDDEPS])
   5.177 +  # Test: Is bootjdk available from builddeps?
   5.178 +  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_BUILDDEPS])
   5.179  
   5.180 -# Test: Is $JAVA_HOME set?
   5.181 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_HOME])
   5.182 +  # Test: Is $JAVA_HOME set?
   5.183 +  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_HOME])
   5.184  
   5.185 -# Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
   5.186 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME])
   5.187 +  # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
   5.188 +  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME])
   5.189  
   5.190 -# Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
   5.191 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK])
   5.192 +  # Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
   5.193 +  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK])
   5.194  
   5.195 -# Test: Is there a JDK installed in default, well-known locations?
   5.196 -BOOTJDK_DO_CHECK([BOOTJDK_CHECK_WELL_KNOWN_LOCATIONS])
   5.197 +  # Test: Is there a JDK installed in default, well-known locations?
   5.198 +  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_WELL_KNOWN_LOCATIONS])
   5.199  
   5.200 -# If we haven't found anything yet, we've truly lost. Give up.
   5.201 -if test "x$BOOT_JDK_FOUND" = xno; then
   5.202 -  HELP_MSG_MISSING_DEPENDENCY([openjdk])
   5.203 -  AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG])
   5.204 -  AC_MSG_NOTICE([This might be fixed by explicitely setting --with-boot-jdk])
   5.205 -  AC_MSG_ERROR([Cannot continue])
   5.206 -fi
   5.207 +  # If we haven't found anything yet, we've truly lost. Give up.
   5.208 +  if test "x$BOOT_JDK_FOUND" = xno; then
   5.209 +    HELP_MSG_MISSING_DEPENDENCY([openjdk])
   5.210 +    AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG])
   5.211 +    AC_MSG_NOTICE([This might be fixed by explicitely setting --with-boot-jdk])
   5.212 +    AC_MSG_ERROR([Cannot continue])
   5.213 +  fi
   5.214  
   5.215 -# Setup proper paths for what we found
   5.216 -BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
   5.217 -if test ! -f "$BOOT_RTJAR"; then
   5.218 +  # Setup proper paths for what we found
   5.219 +  BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
   5.220 +  if test ! -f "$BOOT_RTJAR"; then
   5.221      # On MacOSX it is called classes.jar
   5.222      BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar"
   5.223      if test -f "$BOOT_RTJAR"; then
   5.224 -      # Remove the .. 
   5.225 +      # Remove the ..
   5.226        BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}"
   5.227      fi
   5.228 -fi
   5.229 -BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
   5.230 -BOOT_JDK="$BOOT_JDK"
   5.231 -AC_SUBST(BOOT_RTJAR)
   5.232 -AC_SUBST(BOOT_TOOLSJAR)
   5.233 -AC_SUBST(BOOT_JDK)
   5.234 +  fi
   5.235 +  BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
   5.236 +  BOOT_JDK="$BOOT_JDK"
   5.237 +  AC_SUBST(BOOT_RTJAR)
   5.238 +  AC_SUBST(BOOT_TOOLSJAR)
   5.239 +  AC_SUBST(BOOT_JDK)
   5.240  
   5.241 -# Setup tools from the Boot JDK.
   5.242 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA,java)
   5.243 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC,javac)
   5.244 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH,javah)
   5.245 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAP,javap)
   5.246 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR,jar)
   5.247 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(RMIC,rmic)
   5.248 -BOOTJDK_CHECK_TOOL_IN_BOOTJDK(NATIVE2ASCII,native2ascii)
   5.249 +  # Setup tools from the Boot JDK.
   5.250 +  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA,java)
   5.251 +  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC,javac)
   5.252 +  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH,javah)
   5.253 +  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAP,javap)
   5.254 +  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR,jar)
   5.255 +  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(RMIC,rmic)
   5.256 +  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(NATIVE2ASCII,native2ascii)
   5.257  
   5.258 -# Finally, set some other options...
   5.259 +  # Finally, set some other options...
   5.260  
   5.261 -# When compiling code to be executed by the Boot JDK, force jdk7 compatibility.
   5.262 -BOOT_JDK_SOURCETARGET="-source 7 -target 7"
   5.263 -AC_SUBST(BOOT_JDK_SOURCETARGET)
   5.264 -AC_SUBST(JAVAC_FLAGS)
   5.265 +  # When compiling code to be executed by the Boot JDK, force jdk7 compatibility.
   5.266 +  BOOT_JDK_SOURCETARGET="-source 7 -target 7"
   5.267 +  AC_SUBST(BOOT_JDK_SOURCETARGET)
   5.268 +  AC_SUBST(JAVAC_FLAGS)
   5.269  ])
   5.270  
   5.271  AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
   5.272  [
   5.273 -##############################################################################
   5.274 -#
   5.275 -# Specify options for anything that is run with the Boot JDK.
   5.276 -#
   5.277 -AC_ARG_WITH(boot-jdk-jvmargs, [AS_HELP_STRING([--with-boot-jdk-jvmargs],
   5.278 -	[specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default values,
   5.279 -     e.g --with-boot-jdk-jvmargs="-Xmx8G -enableassertions"])])
   5.280 +  ##############################################################################
   5.281 +  #
   5.282 +  # Specify options for anything that is run with the Boot JDK.
   5.283 +  #
   5.284 +  AC_ARG_WITH(boot-jdk-jvmargs, [AS_HELP_STRING([--with-boot-jdk-jvmargs],
   5.285 +  [specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default values,
   5.286 +  e.g --with-boot-jdk-jvmargs="-Xmx8G -enableassertions"])])
   5.287  
   5.288 -if test "x$with_boot_jdk_jvmargs" = x; then
   5.289 +  if test "x$with_boot_jdk_jvmargs" = x; then
   5.290      # Not all JVM:s accept the same arguments on the command line.
   5.291      # OpenJDK specific increase in thread stack for JDK build,
   5.292      # well more specifically, when running javac.
   5.293      if test "x$BUILD_NUM_BITS" = x32; then
   5.294 -       STACK_SIZE=768
   5.295 +      STACK_SIZE=768
   5.296      else
   5.297 -       # Running Javac on a JVM on a 64-bit machine, the stack takes more space
   5.298 -       # since 64-bit pointers are pushed on the stach. Apparently, we need
   5.299 -       # to increase the stack space when javacing the JDK....
   5.300 -       STACK_SIZE=1536
   5.301 +      # Running Javac on a JVM on a 64-bit machine, the stack takes more space
   5.302 +      # since 64-bit pointers are pushed on the stach. Apparently, we need
   5.303 +      # to increase the stack space when javacing the JDK....
   5.304 +      STACK_SIZE=1536
   5.305      fi
   5.306  
   5.307      # Minimum amount of heap memory.
   5.308      ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA])
   5.309      if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
   5.310 -        # Why does macosx need more heap? Its the huge JDK batch.
   5.311 -        ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA])
   5.312 +      # Why does macosx need more heap? Its the huge JDK batch.
   5.313 +      ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA])
   5.314      else
   5.315 -        ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA])
   5.316 +      ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA])
   5.317      fi
   5.318      # When is adding -client something that speeds up the JVM?
   5.319      # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA])
   5.320 @@ -329,7 +329,7 @@
   5.321      ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs,[$JAVA])
   5.322      # Disable special log output when a debug build is used as Boot JDK...
   5.323      ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA])
   5.324 -fi
   5.325 +  fi
   5.326  
   5.327 -AC_SUBST(BOOT_JDK_JVMARGS, $boot_jdk_jvmargs)
   5.328 +  AC_SUBST(BOOT_JDK_JVMARGS, $boot_jdk_jvmargs)
   5.329  ])
     6.1 --- a/common/autoconf/bootcycle-spec.gmk.in	Mon Oct 14 18:53:53 2013 -0400
     6.2 +++ b/common/autoconf/bootcycle-spec.gmk.in	Wed Oct 16 11:55:44 2013 -0700
     6.3 @@ -36,7 +36,7 @@
     6.4    JAVA_EXEC_POS=1
     6.5  endif
     6.6  ifneq ($(word $(JAVA_EXEC_POS),$(SJAVAC_SERVER_JAVA)),$(word $(JAVA_EXEC_POS),$(JAVA)))
     6.7 -    $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified)
     6.8 +  $(error Bootcycle builds are not possible if --with-sjavac-server-java is specified)
     6.9  endif
    6.10  
    6.11  
     7.1 --- a/common/autoconf/build-aux/config.guess	Mon Oct 14 18:53:53 2013 -0400
     7.2 +++ b/common/autoconf/build-aux/config.guess	Wed Oct 16 11:55:44 2013 -0700
     7.3 @@ -58,6 +58,6 @@
     7.4        OUT=$REAL_CPU`echo $OUT | sed -e 's/[^-]*//'`
     7.5        ;;
     7.6    esac
     7.7 -fi  
     7.8 +fi
     7.9  
    7.10  echo $OUT
     8.1 --- a/common/autoconf/build-performance.m4	Mon Oct 14 18:53:53 2013 -0400
     8.2 +++ b/common/autoconf/build-performance.m4	Wed Oct 16 11:55:44 2013 -0700
     8.3 @@ -25,78 +25,77 @@
     8.4  
     8.5  AC_DEFUN([BPERF_CHECK_CORES],
     8.6  [
     8.7 -    AC_MSG_CHECKING([for number of cores])
     8.8 -    NUM_CORES=1
     8.9 -    FOUND_CORES=no
    8.10 -    
    8.11 -    if test -f /proc/cpuinfo; then
    8.12 -        # Looks like a Linux (or cygwin) system
    8.13 -        NUM_CORES=`cat /proc/cpuinfo  | grep -c processor`
    8.14 -        FOUND_CORES=yes
    8.15 -    elif test -x /usr/sbin/psrinfo; then
    8.16 -        # Looks like a Solaris system
    8.17 -        NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line`
    8.18 -        FOUND_CORES=yes
    8.19 -    elif test -x /usr/sbin/system_profiler; then
    8.20 -        # Looks like a MacOSX system
    8.21 -        NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk  '{print [$]5}'`
    8.22 -        FOUND_CORES=yes
    8.23 -    elif test -n "$NUMBER_OF_PROCESSORS"; then
    8.24 -        # On windows, look in the env
    8.25 -        NUM_CORES=$NUMBER_OF_PROCESSORS
    8.26 -        FOUND_CORES=yes
    8.27 -    fi
    8.28 +  AC_MSG_CHECKING([for number of cores])
    8.29 +  NUM_CORES=1
    8.30 +  FOUND_CORES=no
    8.31  
    8.32 -    if test "x$FOUND_CORES" = xyes; then
    8.33 -        AC_MSG_RESULT([$NUM_CORES])
    8.34 -    else
    8.35 -        AC_MSG_RESULT([could not detect number of cores, defaulting to 1])
    8.36 -        AC_MSG_WARN([This will disable all parallelism from build!])
    8.37 -    fi 
    8.38 +  if test -f /proc/cpuinfo; then
    8.39 +    # Looks like a Linux (or cygwin) system
    8.40 +    NUM_CORES=`cat /proc/cpuinfo  | grep -c processor`
    8.41 +    FOUND_CORES=yes
    8.42 +  elif test -x /usr/sbin/psrinfo; then
    8.43 +    # Looks like a Solaris system
    8.44 +    NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line`
    8.45 +    FOUND_CORES=yes
    8.46 +  elif test -x /usr/sbin/system_profiler; then
    8.47 +    # Looks like a MacOSX system
    8.48 +    NUM_CORES=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Cores' | awk  '{print [$]5}'`
    8.49 +    FOUND_CORES=yes
    8.50 +  elif test -n "$NUMBER_OF_PROCESSORS"; then
    8.51 +    # On windows, look in the env
    8.52 +    NUM_CORES=$NUMBER_OF_PROCESSORS
    8.53 +    FOUND_CORES=yes
    8.54 +  fi
    8.55  
    8.56 +  if test "x$FOUND_CORES" = xyes; then
    8.57 +    AC_MSG_RESULT([$NUM_CORES])
    8.58 +  else
    8.59 +    AC_MSG_RESULT([could not detect number of cores, defaulting to 1])
    8.60 +    AC_MSG_WARN([This will disable all parallelism from build!])
    8.61 +  fi
    8.62  ])
    8.63  
    8.64  AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
    8.65  [
    8.66 -    AC_MSG_CHECKING([for memory size])
    8.67 -    # Default to 1024 MB
    8.68 -    MEMORY_SIZE=1024
    8.69 -    FOUND_MEM=no
    8.70 -    
    8.71 -    if test -f /proc/meminfo; then
    8.72 -        # Looks like a Linux (or cygwin) system
    8.73 -        MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print [$]2}'`
    8.74 -        MEMORY_SIZE=`expr $MEMORY_SIZE / 1024`
    8.75 -        FOUND_MEM=yes
    8.76 -    elif test -x /usr/sbin/prtconf; then
    8.77 -        # Looks like a Solaris system
    8.78 -        MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print [$]3 }'`
    8.79 -        FOUND_MEM=yes
    8.80 -    elif test -x /usr/sbin/system_profiler; then
    8.81 -        # Looks like a MacOSX system
    8.82 -        MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk  '{print [$]2}'`
    8.83 -        MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024`
    8.84 -        FOUND_MEM=yes
    8.85 -    elif test "x$OPENJDK_BUILD_OS" = xwindows; then
    8.86 -        # Windows, but without cygwin
    8.87 -        MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
    8.88 -        MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
    8.89 -        FOUND_MEM=yes    
    8.90 -    fi
    8.91 +  AC_MSG_CHECKING([for memory size])
    8.92 +  # Default to 1024 MB
    8.93 +  MEMORY_SIZE=1024
    8.94 +  FOUND_MEM=no
    8.95  
    8.96 -    if test "x$FOUND_MEM" = xyes; then
    8.97 -        AC_MSG_RESULT([$MEMORY_SIZE MB])
    8.98 -    else
    8.99 -        AC_MSG_RESULT([could not detect memory size, defaulting to 1024 MB])
   8.100 -        AC_MSG_WARN([This might seriously impact build performance!])
   8.101 -    fi 
   8.102 +  if test -f /proc/meminfo; then
   8.103 +    # Looks like a Linux (or cygwin) system
   8.104 +    MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print [$]2}'`
   8.105 +    MEMORY_SIZE=`expr $MEMORY_SIZE / 1024`
   8.106 +    FOUND_MEM=yes
   8.107 +  elif test -x /usr/sbin/prtconf; then
   8.108 +    # Looks like a Solaris system
   8.109 +    MEMORY_SIZE=`/usr/sbin/prtconf | grep "Memory size" | awk '{ print [$]3 }'`
   8.110 +    FOUND_MEM=yes
   8.111 +  elif test -x /usr/sbin/system_profiler; then
   8.112 +    # Looks like a MacOSX system
   8.113 +    MEMORY_SIZE=`/usr/sbin/system_profiler -detailLevel full SPHardwareDataType | grep 'Memory' | awk  '{print [$]2}'`
   8.114 +    MEMORY_SIZE=`expr $MEMORY_SIZE \* 1024`
   8.115 +    FOUND_MEM=yes
   8.116 +  elif test "x$OPENJDK_BUILD_OS" = xwindows; then
   8.117 +    # Windows, but without cygwin
   8.118 +    MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-`
   8.119 +    MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024`
   8.120 +    FOUND_MEM=yes
   8.121 +  fi
   8.122 +
   8.123 +  if test "x$FOUND_MEM" = xyes; then
   8.124 +    AC_MSG_RESULT([$MEMORY_SIZE MB])
   8.125 +  else
   8.126 +    AC_MSG_RESULT([could not detect memory size, defaulting to 1024 MB])
   8.127 +    AC_MSG_WARN([This might seriously impact build performance!])
   8.128 +  fi
   8.129  ])
   8.130  
   8.131  AC_DEFUN_ONCE([BPERF_SETUP_BUILD_CORES],
   8.132  [
   8.133    # How many cores do we have on this build system?
   8.134    AC_ARG_WITH(num-cores, [AS_HELP_STRING([--with-num-cores],
   8.135 -    [number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])])
   8.136 +      [number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])])
   8.137    if test "x$with_num_cores" = x; then
   8.138      # The number of cores were not specified, try to probe them.
   8.139      BPERF_CHECK_CORES
   8.140 @@ -110,7 +109,7 @@
   8.141  [
   8.142    # How much memory do we have on this build system?
   8.143    AC_ARG_WITH(memory-size, [AS_HELP_STRING([--with-memory-size],
   8.144 -    [memory (in MB) available in the build system, e.g. --with-memory-size=1024 @<:@probed@:>@])])
   8.145 +      [memory (in MB) available in the build system, e.g. --with-memory-size=1024 @<:@probed@:>@])])
   8.146    if test "x$with_memory_size" = x; then
   8.147      # The memory size was not specified, try to probe it.
   8.148      BPERF_CHECK_MEMORY_SIZE
   8.149 @@ -122,10 +121,10 @@
   8.150  
   8.151  AC_DEFUN_ONCE([BPERF_SETUP_BUILD_JOBS],
   8.152  [
   8.153 -  # Provide a decent default number of parallel jobs for make depending on 
   8.154 +  # Provide a decent default number of parallel jobs for make depending on
   8.155    # number of cores, amount of memory and machine architecture.
   8.156    AC_ARG_WITH(jobs, [AS_HELP_STRING([--with-jobs],
   8.157 -    [number of parallel jobs to let make run @<:@calculated based on cores and memory@:>@])])
   8.158 +      [number of parallel jobs to let make run @<:@calculated based on cores and memory@:>@])])
   8.159    if test "x$with_jobs" = x; then
   8.160      # Number of jobs was not specified, calculate.
   8.161      AC_MSG_CHECKING([for appropriate number of jobs to run in parallel])
   8.162 @@ -157,179 +156,178 @@
   8.163  
   8.164  AC_DEFUN([BPERF_SETUP_CCACHE],
   8.165  [
   8.166 -    AC_ARG_ENABLE([ccache],
   8.167 -	      [AS_HELP_STRING([--disable-ccache],
   8.168 -	      		      [disable using ccache to speed up recompilations @<:@enabled@:>@])],
   8.169 -              [ENABLE_CCACHE=${enable_ccache}], [ENABLE_CCACHE=yes])
   8.170 -    if test "x$ENABLE_CCACHE" = xyes; then
   8.171 -        OLD_PATH="$PATH"
   8.172 -        if test "x$TOOLS_DIR" != x; then
   8.173 -          PATH=$TOOLS_DIR:$PATH
   8.174 -        fi
   8.175 -        AC_PATH_PROG(CCACHE, ccache)
   8.176 -        PATH="$OLD_PATH"
   8.177 -    else
   8.178 -        AC_MSG_CHECKING([for ccache])
   8.179 -        AC_MSG_RESULT([explicitly disabled])    
   8.180 -        CCACHE=
   8.181 -    fi    
   8.182 -    AC_SUBST(CCACHE)
   8.183 +  AC_ARG_ENABLE([ccache],
   8.184 +      [AS_HELP_STRING([--disable-ccache],
   8.185 +      [disable using ccache to speed up recompilations @<:@enabled@:>@])],
   8.186 +      [ENABLE_CCACHE=${enable_ccache}], [ENABLE_CCACHE=yes])
   8.187 +  if test "x$ENABLE_CCACHE" = xyes; then
   8.188 +    OLD_PATH="$PATH"
   8.189 +    if test "x$TOOLS_DIR" != x; then
   8.190 +      PATH=$TOOLS_DIR:$PATH
   8.191 +    fi
   8.192 +    AC_PATH_PROG(CCACHE, ccache)
   8.193 +    PATH="$OLD_PATH"
   8.194 +  else
   8.195 +    AC_MSG_CHECKING([for ccache])
   8.196 +    AC_MSG_RESULT([explicitly disabled])
   8.197 +    CCACHE=
   8.198 +  fi
   8.199 +  AC_SUBST(CCACHE)
   8.200  
   8.201 -    AC_ARG_WITH([ccache-dir],
   8.202 -	      [AS_HELP_STRING([--with-ccache-dir],
   8.203 -	      		      [where to store ccache files @<:@~/.ccache@:>@])])
   8.204 +  AC_ARG_WITH([ccache-dir],
   8.205 +      [AS_HELP_STRING([--with-ccache-dir],
   8.206 +      [where to store ccache files @<:@~/.ccache@:>@])])
   8.207  
   8.208 -    if test "x$with_ccache_dir" != x; then
   8.209 -        # When using a non home ccache directory, assume the use is to share ccache files
   8.210 -        # with other users. Thus change the umask.
   8.211 -        SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002"
   8.212 -    fi
   8.213 -    CCACHE_FOUND=""
   8.214 -    if test "x$CCACHE" != x; then
   8.215 -        BPERF_SETUP_CCACHE_USAGE
   8.216 -    fi    
   8.217 +  if test "x$with_ccache_dir" != x; then
   8.218 +    # When using a non home ccache directory, assume the use is to share ccache files
   8.219 +    # with other users. Thus change the umask.
   8.220 +    SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002"
   8.221 +  fi
   8.222 +  CCACHE_FOUND=""
   8.223 +  if test "x$CCACHE" != x; then
   8.224 +    BPERF_SETUP_CCACHE_USAGE
   8.225 +  fi
   8.226  ])
   8.227  
   8.228  AC_DEFUN([BPERF_SETUP_CCACHE_USAGE],
   8.229  [
   8.230 -    if test "x$CCACHE" != x; then
   8.231 -        CCACHE_FOUND="true"
   8.232 -        # Only use ccache if it is 3.1.4 or later, which supports
   8.233 -        # precompiled headers.
   8.234 -        AC_MSG_CHECKING([if ccache supports precompiled headers])
   8.235 -        HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null`
   8.236 -        if test "x$HAS_GOOD_CCACHE" = x; then
   8.237 -            AC_MSG_RESULT([no, disabling ccache])
   8.238 -            CCACHE=
   8.239 -        else
   8.240 -            AC_MSG_RESULT([yes])
   8.241 -            AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers])
   8.242 -            PUSHED_FLAGS="$CXXFLAGS"
   8.243 -            CXXFLAGS="-fpch-preprocess $CXXFLAGS"
   8.244 -            AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no])
   8.245 -            CXXFLAGS="$PUSHED_FLAGS"
   8.246 -            if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then
   8.247 -                AC_MSG_RESULT([yes])
   8.248 -            else
   8.249 -                AC_MSG_RESULT([no, disabling ccaching of precompiled headers])
   8.250 -                CCACHE=
   8.251 -            fi
   8.252 -        fi
   8.253 +  if test "x$CCACHE" != x; then
   8.254 +    CCACHE_FOUND="true"
   8.255 +    # Only use ccache if it is 3.1.4 or later, which supports
   8.256 +    # precompiled headers.
   8.257 +    AC_MSG_CHECKING([if ccache supports precompiled headers])
   8.258 +    HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E 3.1.@<:@456789@:>@) 2> /dev/null`
   8.259 +    if test "x$HAS_GOOD_CCACHE" = x; then
   8.260 +      AC_MSG_RESULT([no, disabling ccache])
   8.261 +      CCACHE=
   8.262 +    else
   8.263 +      AC_MSG_RESULT([yes])
   8.264 +      AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers])
   8.265 +      PUSHED_FLAGS="$CXXFLAGS"
   8.266 +      CXXFLAGS="-fpch-preprocess $CXXFLAGS"
   8.267 +      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no])
   8.268 +      CXXFLAGS="$PUSHED_FLAGS"
   8.269 +      if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then
   8.270 +        AC_MSG_RESULT([yes])
   8.271 +      else
   8.272 +        AC_MSG_RESULT([no, disabling ccaching of precompiled headers])
   8.273 +        CCACHE=
   8.274 +      fi
   8.275      fi
   8.276 +  fi
   8.277  
   8.278 -    if test "x$CCACHE" != x; then
   8.279 -        CCACHE_SLOPPINESS=time_macros
   8.280 -        CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE"
   8.281 -        CCACHE_FLAGS=-fpch-preprocess
   8.282 +  if test "x$CCACHE" != x; then
   8.283 +    CCACHE_SLOPPINESS=time_macros
   8.284 +    CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS $CCACHE"
   8.285 +    CCACHE_FLAGS=-fpch-preprocess
   8.286  
   8.287 -        if test "x$SET_CCACHE_DIR" != x; then
   8.288 -            mkdir -p $CCACHE_DIR > /dev/null 2>&1
   8.289 -	    chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1
   8.290 -        fi
   8.291 +    if test "x$SET_CCACHE_DIR" != x; then
   8.292 +      mkdir -p $CCACHE_DIR > /dev/null 2>&1
   8.293 +      chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1
   8.294      fi
   8.295 +  fi
   8.296  ])
   8.297  
   8.298  AC_DEFUN_ONCE([BPERF_SETUP_PRECOMPILED_HEADERS],
   8.299  [
   8.300 -       
   8.301 -###############################################################################
   8.302 -#
   8.303 -# Can the C/C++ compiler use precompiled headers?
   8.304 -#
   8.305 -AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers],
   8.306 -	[disable using precompiled headers when compiling C++ @<:@enabled@:>@])],
   8.307 -    [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes])
   8.308  
   8.309 -USE_PRECOMPILED_HEADER=1
   8.310 -if test "x$ENABLE_PRECOMPH" = xno; then
   8.311 +  ###############################################################################
   8.312 +  #
   8.313 +  # Can the C/C++ compiler use precompiled headers?
   8.314 +  #
   8.315 +  AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers],
   8.316 +      [disable using precompiled headers when compiling C++ @<:@enabled@:>@])],
   8.317 +      [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes])
   8.318 +
   8.319 +  USE_PRECOMPILED_HEADER=1
   8.320 +  if test "x$ENABLE_PRECOMPH" = xno; then
   8.321      USE_PRECOMPILED_HEADER=0
   8.322 -fi
   8.323 +  fi
   8.324  
   8.325 -if test "x$ENABLE_PRECOMPH" = xyes; then
   8.326 +  if test "x$ENABLE_PRECOMPH" = xyes; then
   8.327      # Check that the compiler actually supports precomp headers.
   8.328      if test "x$GCC" = xyes; then
   8.329 -         AC_MSG_CHECKING([that precompiled headers work])
   8.330 -         echo "int alfa();" > conftest.h
   8.331 -         $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD
   8.332 -         if test ! -f conftest.hpp.gch; then
   8.333 -             USE_PRECOMPILED_HEADER=0
   8.334 -             AC_MSG_RESULT([no])        
   8.335 -         else
   8.336 -             AC_MSG_RESULT([yes])
   8.337 -         fi
   8.338 -         rm -f conftest.h conftest.hpp.gch
   8.339 +      AC_MSG_CHECKING([that precompiled headers work])
   8.340 +      echo "int alfa();" > conftest.h
   8.341 +      $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD
   8.342 +      if test ! -f conftest.hpp.gch; then
   8.343 +        USE_PRECOMPILED_HEADER=0
   8.344 +        AC_MSG_RESULT([no])
   8.345 +      else
   8.346 +        AC_MSG_RESULT([yes])
   8.347 +      fi
   8.348 +      rm -f conftest.h conftest.hpp.gch
   8.349      fi
   8.350 -fi
   8.351 +  fi
   8.352  
   8.353 -AC_SUBST(USE_PRECOMPILED_HEADER)
   8.354 +  AC_SUBST(USE_PRECOMPILED_HEADER)
   8.355  ])
   8.356  
   8.357  
   8.358  AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC],
   8.359  [
   8.360 -AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java],
   8.361 -	[use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])])
   8.362 +  AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java],
   8.363 +      [use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])])
   8.364  
   8.365 -if test "x$with_sjavac_server_java" != x; then
   8.366 +  if test "x$with_sjavac_server_java" != x; then
   8.367      SJAVAC_SERVER_JAVA="$with_sjavac_server_java"
   8.368      FOUND_VERSION=`$SJAVAC_SERVER_JAVA -version 2>&1 | grep " version \""`
   8.369      if test "x$FOUND_VERSION" = x; then
   8.370 -        AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA])
   8.371 +      AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA])
   8.372      fi
   8.373 -else
   8.374 +  else
   8.375      SJAVAC_SERVER_JAVA=""
   8.376      # Hotspot specific options.
   8.377      ADD_JVM_ARG_IF_OK([-verbosegc],SJAVAC_SERVER_JAVA,[$JAVA])
   8.378      # JRockit specific options.
   8.379      ADD_JVM_ARG_IF_OK([-Xverbose:gc],SJAVAC_SERVER_JAVA,[$JAVA])
   8.380      SJAVAC_SERVER_JAVA="$JAVA $SJAVAC_SERVER_JAVA"
   8.381 -fi                    
   8.382 -AC_SUBST(SJAVAC_SERVER_JAVA)
   8.383 +  fi
   8.384 +  AC_SUBST(SJAVAC_SERVER_JAVA)
   8.385  
   8.386 -if test "$MEMORY_SIZE" -gt "2500"; then
   8.387 +  if test "$MEMORY_SIZE" -gt "2500"; then
   8.388      ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.389      if test "$JVM_ARG_OK" = true; then
   8.390 -        JVM_64BIT=true
   8.391 -	JVM_ARG_OK=false
   8.392 +      JVM_64BIT=true
   8.393 +      JVM_ARG_OK=false
   8.394      fi
   8.395 -    fi
   8.396 +  fi
   8.397  
   8.398 -if test "$JVM_64BIT" = true; then
   8.399 +  if test "$JVM_64BIT" = true; then
   8.400      if test "$MEMORY_SIZE" -gt "17000"; then
   8.401 -        ADD_JVM_ARG_IF_OK([-Xms10G -Xmx10G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.402 +      ADD_JVM_ARG_IF_OK([-Xms10G -Xmx10G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.403      fi
   8.404      if test "$MEMORY_SIZE" -gt "10000" && test "$JVM_ARG_OK" = false; then
   8.405 -        ADD_JVM_ARG_IF_OK([-Xms6G -Xmx6G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.406 +      ADD_JVM_ARG_IF_OK([-Xms6G -Xmx6G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.407      fi
   8.408      if test "$MEMORY_SIZE" -gt "5000" && test "$JVM_ARG_OK" = false; then
   8.409 -        ADD_JVM_ARG_IF_OK([-Xms1G -Xmx3G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.410 +      ADD_JVM_ARG_IF_OK([-Xms1G -Xmx3G],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.411      fi
   8.412      if test "$MEMORY_SIZE" -gt "3800" && test "$JVM_ARG_OK" = false; then
   8.413 -        ADD_JVM_ARG_IF_OK([-Xms1G -Xmx2500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.414 +      ADD_JVM_ARG_IF_OK([-Xms1G -Xmx2500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.415      fi
   8.416 -fi
   8.417 -if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then
   8.418 +  fi
   8.419 +  if test "$MEMORY_SIZE" -gt "2500" && test "$JVM_ARG_OK" = false; then
   8.420      ADD_JVM_ARG_IF_OK([-Xms1000M -Xmx1500M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.421 -fi
   8.422 -if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then
   8.423 +  fi
   8.424 +  if test "$MEMORY_SIZE" -gt "1000" && test "$JVM_ARG_OK" = false; then
   8.425      ADD_JVM_ARG_IF_OK([-Xms400M -Xmx1100M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.426 -fi
   8.427 -if test "$JVM_ARG_OK" = false; then
   8.428 +  fi
   8.429 +  if test "$JVM_ARG_OK" = false; then
   8.430      ADD_JVM_ARG_IF_OK([-Xms256M -Xmx512M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA])
   8.431 -fi
   8.432 +  fi
   8.433  
   8.434 -AC_MSG_CHECKING([whether to use sjavac])
   8.435 -AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac],
   8.436 -	[use sjavac to do fast incremental compiles @<:@disabled@:>@])],
   8.437 -	[ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC='no'])
   8.438 -AC_MSG_RESULT([$ENABLE_SJAVAC])
   8.439 -AC_SUBST(ENABLE_SJAVAC)
   8.440 +  AC_MSG_CHECKING([whether to use sjavac])
   8.441 +  AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac],
   8.442 +      [use sjavac to do fast incremental compiles @<:@disabled@:>@])],
   8.443 +      [ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC='no'])
   8.444 +  AC_MSG_RESULT([$ENABLE_SJAVAC])
   8.445 +  AC_SUBST(ENABLE_SJAVAC)
   8.446  
   8.447 -if test "x$ENABLE_SJAVAC" = xyes; then
   8.448 +  if test "x$ENABLE_SJAVAC" = xyes; then
   8.449      SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers"
   8.450 -else
   8.451 +  else
   8.452      SJAVAC_SERVER_DIR=
   8.453 -fi
   8.454 -AC_SUBST(SJAVAC_SERVER_DIR)
   8.455 -
   8.456 +  fi
   8.457 +  AC_SUBST(SJAVAC_SERVER_DIR)
   8.458  ])
     9.1 --- a/common/autoconf/builddeps.conf.example	Mon Oct 14 18:53:53 2013 -0400
     9.2 +++ b/common/autoconf/builddeps.conf.example	Wed Oct 16 11:55:44 2013 -0700
     9.3 @@ -34,7 +34,7 @@
     9.4  # If no rewrite was found, then rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
     9.5  REWRITE_i686_pc_linux_gnu=i686-unknown-linux-gnu
     9.6  REWRITE_i386_pc_solaris2_10=i686-sun-solaris2_10
     9.7 - 
     9.8 +
     9.9  # The needed cups builddeps are platform independent header files.
    9.10  # I.e. they need not be part of the devkit.
    9.11  builddep_cups=lib/cups_1_3_9.zip
    10.1 --- a/common/autoconf/builddeps.conf.nfs.example	Mon Oct 14 18:53:53 2013 -0400
    10.2 +++ b/common/autoconf/builddeps.conf.nfs.example	Wed Oct 16 11:55:44 2013 -0700
    10.3 @@ -29,7 +29,7 @@
    10.4  
    10.5  REWRITE_i686_pc_linux_gnu=i686-unknown-linux-gnu
    10.6  REWRITE_i386_pc_solaris2_10=i686-sun-solaris2_10
    10.7 - 
    10.8 +
    10.9  DEVTOOLS=/java/devtools
   10.10  
   10.11  builddep_cups=${DEVTOOLS}/linux/cups/include
    11.1 --- a/common/autoconf/builddeps.m4	Mon Oct 14 18:53:53 2013 -0400
    11.2 +++ b/common/autoconf/builddeps.m4	Wed Oct 16 11:55:44 2013 -0700
    11.3 @@ -25,223 +25,223 @@
    11.4  
    11.5  AC_DEFUN_ONCE([BDEPS_SCAN_FOR_BUILDDEPS],
    11.6  [
    11.7 -    define(LIST_OF_BUILD_DEPENDENCIES,)
    11.8 -    if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
    11.9 -        if test "x$with_builddeps_conf" != x; then
   11.10 -            AC_MSG_CHECKING([for supplied builddeps configuration file])
   11.11 -            builddepsfile=$with_builddeps_conf        
   11.12 -            if test -s $builddepsfile; then
   11.13 -                . $builddepsfile
   11.14 -                AC_MSG_RESULT([loaded!])
   11.15 -            else
   11.16 -               AC_MSG_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!])
   11.17 -           fi
   11.18 -        else
   11.19 -            AC_MSG_CHECKING([for builddeps.conf files in sources...])
   11.20 -            builddepsfile=`mktemp`
   11.21 -            touch $builddepsfile
   11.22 -            # Put all found confs into a single file.
   11.23 -            find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile
   11.24 -            # Source the file to acquire the variables
   11.25 -            if test -s $builddepsfile; then
   11.26 -                . $builddepsfile
   11.27 -                AC_MSG_RESULT([found at least one!])
   11.28 -            else
   11.29 -               AC_MSG_ERROR([Could not find any builddeps.conf at all!])
   11.30 -           fi
   11.31 -        fi
   11.32 -        # Create build and target names that use _ instead of "-" and ".".
   11.33 -        # This is necessary to use them in variable names.
   11.34 -        build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
   11.35 -        target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
   11.36 -        # Extract rewrite information for build and target
   11.37 -        eval rewritten_build=\${REWRITE_${build_var}}
   11.38 -        if test "x$rewritten_build" = x; then
   11.39 -            rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
   11.40 -            echo Build stays the same $rewritten_build
   11.41 -        else
   11.42 -            echo Rewriting build for builddeps into $rewritten_build
   11.43 -        fi
   11.44 -        eval rewritten_target=\${REWRITE_${target_var}}
   11.45 -        if test "x$rewritten_target" = x; then
   11.46 -            rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
   11.47 -            echo Target stays the same $rewritten_target
   11.48 -        else
   11.49 -            echo Rewriting target for builddeps into $rewritten_target
   11.50 -        fi
   11.51 -        rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'`
   11.52 -        rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'`        
   11.53 +  define(LIST_OF_BUILD_DEPENDENCIES,)
   11.54 +  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
   11.55 +    if test "x$with_builddeps_conf" != x; then
   11.56 +      AC_MSG_CHECKING([for supplied builddeps configuration file])
   11.57 +      builddepsfile=$with_builddeps_conf
   11.58 +      if test -s $builddepsfile; then
   11.59 +        . $builddepsfile
   11.60 +        AC_MSG_RESULT([loaded!])
   11.61 +      else
   11.62 +        AC_MSG_ERROR([The given builddeps conf file $with_builddeps_conf could not be loaded!])
   11.63 +      fi
   11.64 +    else
   11.65 +      AC_MSG_CHECKING([for builddeps.conf files in sources...])
   11.66 +      builddepsfile=`mktemp`
   11.67 +      touch $builddepsfile
   11.68 +      # Put all found confs into a single file.
   11.69 +      find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile
   11.70 +      # Source the file to acquire the variables
   11.71 +      if test -s $builddepsfile; then
   11.72 +        . $builddepsfile
   11.73 +        AC_MSG_RESULT([found at least one!])
   11.74 +      else
   11.75 +        AC_MSG_ERROR([Could not find any builddeps.conf at all!])
   11.76 +      fi
   11.77      fi
   11.78 -    AC_CHECK_PROGS(BDEPS_UNZIP, [7z unzip])
   11.79 -    if test "x$BDEPS_UNZIP" = x7z; then
   11.80 -        BDEPS_UNZIP="7z x"
   11.81 +    # Create build and target names that use _ instead of "-" and ".".
   11.82 +    # This is necessary to use them in variable names.
   11.83 +    build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
   11.84 +    target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
   11.85 +    # Extract rewrite information for build and target
   11.86 +    eval rewritten_build=\${REWRITE_${build_var}}
   11.87 +    if test "x$rewritten_build" = x; then
   11.88 +      rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
   11.89 +      echo Build stays the same $rewritten_build
   11.90 +    else
   11.91 +      echo Rewriting build for builddeps into $rewritten_build
   11.92      fi
   11.93 +    eval rewritten_target=\${REWRITE_${target_var}}
   11.94 +    if test "x$rewritten_target" = x; then
   11.95 +      rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
   11.96 +      echo Target stays the same $rewritten_target
   11.97 +    else
   11.98 +      echo Rewriting target for builddeps into $rewritten_target
   11.99 +    fi
  11.100 +    rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'`
  11.101 +    rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'`
  11.102 +  fi
  11.103 +  AC_CHECK_PROGS(BDEPS_UNZIP, [7z unzip])
  11.104 +  if test "x$BDEPS_UNZIP" = x7z; then
  11.105 +    BDEPS_UNZIP="7z x"
  11.106 +  fi
  11.107  
  11.108 -    AC_CHECK_PROGS(BDEPS_FTP, [wget lftp ftp]) 
  11.109 +  AC_CHECK_PROGS(BDEPS_FTP, [wget lftp ftp])
  11.110  ])
  11.111  
  11.112  AC_DEFUN([BDEPS_FTPGET],
  11.113  [
  11.114 -    # $1 is the ftp://abuilddeps.server.com/libs/cups.zip
  11.115 -    # $2 is the local file name for the downloaded file.
  11.116 -    VALID_TOOL=no
  11.117 -    if test "x$BDEPS_FTP" = xwget; then
  11.118 -       VALID_TOOL=yes
  11.119 -       wget -O $2 $1
  11.120 +  # $1 is the ftp://abuilddeps.server.com/libs/cups.zip
  11.121 +  # $2 is the local file name for the downloaded file.
  11.122 +  VALID_TOOL=no
  11.123 +  if test "x$BDEPS_FTP" = xwget; then
  11.124 +    VALID_TOOL=yes
  11.125 +    wget -O $2 $1
  11.126 +  fi
  11.127 +  if test "x$BDEPS_FTP" = xlftp; then
  11.128 +    VALID_TOOL=yes
  11.129 +    lftp -c "get $1 -o $2"
  11.130 +  fi
  11.131 +  if test "x$BDEPS_FTP" = xftp; then
  11.132 +    VALID_TOOL=yes
  11.133 +    FTPSERVER=`echo $1 | cut -f 3 -d '/'`
  11.134 +    FTPPATH=`echo $1 | cut -f 4- -d '/'`
  11.135 +    FTPUSERPWD=${FTPSERVER%%@*}
  11.136 +    if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
  11.137 +      FTPUSER=${userpwd%%:*}
  11.138 +      FTPPWD=${userpwd#*@}
  11.139 +      FTPSERVER=${FTPSERVER#*@}
  11.140 +    else
  11.141 +      FTPUSER=ftp
  11.142 +      FTPPWD=ftp
  11.143      fi
  11.144 -    if test "x$BDEPS_FTP" = xlftp; then
  11.145 -       VALID_TOOL=yes
  11.146 -       lftp -c "get $1 -o $2"
  11.147 -    fi
  11.148 -    if test "x$BDEPS_FTP" = xftp; then
  11.149 -        VALID_TOOL=yes
  11.150 -        FTPSERVER=`echo $1 | cut -f 3 -d '/'`
  11.151 -        FTPPATH=`echo $1 | cut -f 4- -d '/'`
  11.152 -        FTPUSERPWD=${FTPSERVER%%@*}
  11.153 -        if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
  11.154 -            FTPUSER=${userpwd%%:*}
  11.155 -            FTPPWD=${userpwd#*@}
  11.156 -            FTPSERVER=${FTPSERVER#*@}
  11.157 -        else
  11.158 -            FTPUSER=ftp
  11.159 -            FTPPWD=ftp
  11.160 -        fi
  11.161 -        # the "pass" command does not work on some
  11.162 -        # ftp clients (read ftp.exe) but if it works,
  11.163 -        # passive mode is better!
  11.164 -        (\
  11.165 -            echo "user $FTPUSER $FTPPWD"        ;\
  11.166 -            echo "pass"                         ;\
  11.167 -            echo "bin"                          ;\
  11.168 -            echo "get $FTPPATH $2"              ;\
  11.169 -        ) | ftp -in $FTPSERVER
  11.170 -    fi
  11.171 -    if test "x$VALID_TOOL" != xyes; then
  11.172 -       AC_MSG_ERROR([I do not know how to use the tool: $BDEPS_FTP])
  11.173 -    fi
  11.174 +    # the "pass" command does not work on some
  11.175 +    # ftp clients (read ftp.exe) but if it works,
  11.176 +    # passive mode is better!
  11.177 +    ( \
  11.178 +        echo "user $FTPUSER $FTPPWD"        ; \
  11.179 +        echo "pass"                         ; \
  11.180 +        echo "bin"                          ; \
  11.181 +        echo "get $FTPPATH $2"              ; \
  11.182 +    ) | ftp -in $FTPSERVER
  11.183 +  fi
  11.184 +  if test "x$VALID_TOOL" != xyes; then
  11.185 +    AC_MSG_ERROR([I do not know how to use the tool: $BDEPS_FTP])
  11.186 +  fi
  11.187  ])
  11.188  
  11.189  AC_DEFUN([BDEPS_CHECK_MODULE],
  11.190  [
  11.191 -    define([LIST_OF_BUILD_DEPENDENCIES],LIST_OF_BUILD_DEPENDENCIES[$2=$3'\n'])
  11.192 -    if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
  11.193 -        # Source the builddeps file again, to make sure it uses the latest variables!
  11.194 -        . $builddepsfile
  11.195 -        # Look for a target and build machine specific resource!
  11.196 -        eval resource=\${builddep_$2_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
  11.197 -        if test "x$resource" = x; then
  11.198 -            # Ok, lets instead look for a target specific resource
  11.199 -            eval resource=\${builddep_$2_TARGET_${rewritten_target_var}}
  11.200 -        fi
  11.201 -        if test "x$resource" = x; then
  11.202 -            # Ok, lets instead look for a build specific resource
  11.203 -            eval resource=\${builddep_$2_BUILD_${rewritten_build_var}}
  11.204 -        fi
  11.205 -        if test "x$resource" = x; then
  11.206 -            # Ok, lets instead look for a generic resource
  11.207 -            # (The $2 comes from M4 and not the shell, thus no need for eval here.)
  11.208 -            resource=${builddep_$2}
  11.209 -        fi
  11.210 -        if test "x$resource" != x; then
  11.211 -            AC_MSG_NOTICE([Using builddeps $resource for $2])
  11.212 -	    # If the resource in the builddeps.conf file is an existing directory,
  11.213 -	    # for example /java/linux/cups
  11.214 -	    if test -d ${resource}; then
  11.215 -	       depdir=${resource}
  11.216 -	    else
  11.217 -		BDEPS_FETCH($2, $resource, $with_builddeps_server, $with_builddeps_dir, depdir)
  11.218 -	    fi
  11.219 -            # Source the builddeps file again, because in the previous command, the depdir
  11.220 -            # was updated to point at the current build dependency install directory.
  11.221 -            . $builddepsfile
  11.222 -            # Now extract variables from the builddeps.conf files.
  11.223 -            theroot=${builddep_$2_ROOT}
  11.224 -            thecflags=${builddep_$2_CFLAGS}
  11.225 -            thelibs=${builddep_$2_LIBS}
  11.226 -            if test "x$depdir" = x; then
  11.227 -                AC_MSG_ERROR([Could not download build dependency $2])
  11.228 -            fi
  11.229 -            $1=$depdir
  11.230 -            if test "x$theroot" != x; then
  11.231 -               $1="$theroot"
  11.232 -            fi
  11.233 -            if test "x$thecflags" != x; then
  11.234 -               $1_CFLAGS="$thecflags"
  11.235 -            fi
  11.236 -            if test "x$thelibs" != x; then
  11.237 -               $1_LIBS="$thelibs"
  11.238 -            fi
  11.239 -            m4_default([$4], [:])
  11.240 -            m4_ifvaln([$5], [else $5])
  11.241 -        fi
  11.242 -        m4_ifvaln([$5], [else $5])
  11.243 +  define([LIST_OF_BUILD_DEPENDENCIES],LIST_OF_BUILD_DEPENDENCIES[$2=$3'\n'])
  11.244 +  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
  11.245 +    # Source the builddeps file again, to make sure it uses the latest variables!
  11.246 +    . $builddepsfile
  11.247 +    # Look for a target and build machine specific resource!
  11.248 +    eval resource=\${builddep_$2_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
  11.249 +    if test "x$resource" = x; then
  11.250 +      # Ok, lets instead look for a target specific resource
  11.251 +      eval resource=\${builddep_$2_TARGET_${rewritten_target_var}}
  11.252      fi
  11.253 +    if test "x$resource" = x; then
  11.254 +      # Ok, lets instead look for a build specific resource
  11.255 +      eval resource=\${builddep_$2_BUILD_${rewritten_build_var}}
  11.256 +    fi
  11.257 +    if test "x$resource" = x; then
  11.258 +      # Ok, lets instead look for a generic resource
  11.259 +      # (The $2 comes from M4 and not the shell, thus no need for eval here.)
  11.260 +      resource=${builddep_$2}
  11.261 +    fi
  11.262 +    if test "x$resource" != x; then
  11.263 +      AC_MSG_NOTICE([Using builddeps $resource for $2])
  11.264 +      # If the resource in the builddeps.conf file is an existing directory,
  11.265 +      # for example /java/linux/cups
  11.266 +      if test -d ${resource}; then
  11.267 +        depdir=${resource}
  11.268 +      else
  11.269 +        BDEPS_FETCH($2, $resource, $with_builddeps_server, $with_builddeps_dir, depdir)
  11.270 +      fi
  11.271 +      # Source the builddeps file again, because in the previous command, the depdir
  11.272 +      # was updated to point at the current build dependency install directory.
  11.273 +      . $builddepsfile
  11.274 +      # Now extract variables from the builddeps.conf files.
  11.275 +      theroot=${builddep_$2_ROOT}
  11.276 +      thecflags=${builddep_$2_CFLAGS}
  11.277 +      thelibs=${builddep_$2_LIBS}
  11.278 +      if test "x$depdir" = x; then
  11.279 +        AC_MSG_ERROR([Could not download build dependency $2])
  11.280 +      fi
  11.281 +      $1=$depdir
  11.282 +      if test "x$theroot" != x; then
  11.283 +        $1="$theroot"
  11.284 +      fi
  11.285 +      if test "x$thecflags" != x; then
  11.286 +        $1_CFLAGS="$thecflags"
  11.287 +      fi
  11.288 +      if test "x$thelibs" != x; then
  11.289 +        $1_LIBS="$thelibs"
  11.290 +      fi
  11.291 +      m4_default([$4], [:])
  11.292 +      m4_ifvaln([$5], [else $5])
  11.293 +    fi
  11.294 +    m4_ifvaln([$5], [else $5])
  11.295 +  fi
  11.296  ])
  11.297  
  11.298  AC_DEFUN([BDEPS_FETCH],
  11.299  [
  11.300 -# $1 is for example mymodule
  11.301 -# $2 is for example libs/general/libmymod_1_2_3.zip
  11.302 -# $3 is for example ftp://mybuilddeps.myserver.com/builddeps
  11.303 -# $4 is for example /localhome/builddeps
  11.304 -# $5 is the name of the variable into which we store the depdir, eg MYMOD
  11.305 -# Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
  11.306 -# unzip into the directory: /localhome/builddeps/libmymod_1_2_3
  11.307 -    filename=`basename $2`
  11.308 -    filebase=`echo $filename | sed 's/\.[[^\.]]*$//'`
  11.309 -    filebase=${filename%%.*}
  11.310 -    extension=${filename#*.}
  11.311 -    installdir=$4/$filebase
  11.312 -    if test ! -f $installdir/$filename.unpacked; then
  11.313 -        AC_MSG_NOTICE([Downloading build dependency $1 from $3/$2 and installing into $installdir])
  11.314 -        if test ! -d $installdir; then
  11.315 -            mkdir -p $installdir
  11.316 -        fi
  11.317 -        if test ! -d $installdir; then
  11.318 -            AC_MSG_ERROR([Could not create directory $installdir])
  11.319 -        fi
  11.320 -        tmpfile=`mktemp $installdir/$1.XXXXXXXXX`
  11.321 -        touch $tmpfile    
  11.322 -        if test ! -f $tmpfile; then
  11.323 -            AC_MSG_ERROR([Could not create files in directory $installdir])
  11.324 -        fi
  11.325 -        BDEPS_FTPGET([$3/$2] , [$tmpfile])
  11.326 -        mv $tmpfile $installdir/$filename
  11.327 -        if test ! -s $installdir/$filename; then 
  11.328 -            AC_MSG_ERROR([Could not download $3/$2])
  11.329 -        fi
  11.330 -        case "$extension" in
  11.331 -            zip)  echo "Unzipping $installdir/$filename..."
  11.332 -               (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
  11.333 -            ;;
  11.334 -            tar.gz) echo "Untaring $installdir/$filename..."
  11.335 -               (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
  11.336 -            ;;
  11.337 -            tgz) echo "Untaring $installdir/$filename..."
  11.338 -               (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
  11.339 -            ;;
  11.340 -            *) AC_MSG_ERROR([Cannot handle build depency archive with extension $extension])
  11.341 -            ;;
  11.342 -        esac
  11.343 +  # $1 is for example mymodule
  11.344 +  # $2 is for example libs/general/libmymod_1_2_3.zip
  11.345 +  # $3 is for example ftp://mybuilddeps.myserver.com/builddeps
  11.346 +  # $4 is for example /localhome/builddeps
  11.347 +  # $5 is the name of the variable into which we store the depdir, eg MYMOD
  11.348 +  # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
  11.349 +  # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
  11.350 +  filename=`basename $2`
  11.351 +  filebase=`echo $filename | sed 's/\.[[^\.]]*$//'`
  11.352 +  filebase=${filename%%.*}
  11.353 +  extension=${filename#*.}
  11.354 +  installdir=$4/$filebase
  11.355 +  if test ! -f $installdir/$filename.unpacked; then
  11.356 +    AC_MSG_NOTICE([Downloading build dependency $1 from $3/$2 and installing into $installdir])
  11.357 +    if test ! -d $installdir; then
  11.358 +      mkdir -p $installdir
  11.359      fi
  11.360 -    if test -f $installdir/$filename.unpacked; then
  11.361 -        $5=$installdir
  11.362 +    if test ! -d $installdir; then
  11.363 +      AC_MSG_ERROR([Could not create directory $installdir])
  11.364      fi
  11.365 +    tmpfile=`mktemp $installdir/$1.XXXXXXXXX`
  11.366 +    touch $tmpfile
  11.367 +    if test ! -f $tmpfile; then
  11.368 +      AC_MSG_ERROR([Could not create files in directory $installdir])
  11.369 +    fi
  11.370 +    BDEPS_FTPGET([$3/$2] , [$tmpfile])
  11.371 +    mv $tmpfile $installdir/$filename
  11.372 +    if test ! -s $installdir/$filename; then
  11.373 +      AC_MSG_ERROR([Could not download $3/$2])
  11.374 +    fi
  11.375 +    case "$extension" in
  11.376 +      zip)  echo "Unzipping $installdir/$filename..."
  11.377 +        (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
  11.378 +        ;;
  11.379 +      tar.gz) echo "Untaring $installdir/$filename..."
  11.380 +        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
  11.381 +        ;;
  11.382 +      tgz) echo "Untaring $installdir/$filename..."
  11.383 +        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
  11.384 +        ;;
  11.385 +      *) AC_MSG_ERROR([Cannot handle build depency archive with extension $extension])
  11.386 +        ;;
  11.387 +    esac
  11.388 +  fi
  11.389 +  if test -f $installdir/$filename.unpacked; then
  11.390 +    $5=$installdir
  11.391 +  fi
  11.392  ])
  11.393  
  11.394  AC_DEFUN_ONCE([BDEPS_CONFIGURE_BUILDDEPS],
  11.395  [
  11.396 -AC_ARG_WITH(builddeps-conf, [AS_HELP_STRING([--with-builddeps-conf],
  11.397 -    [use this configuration file for the builddeps])])
  11.398 +  AC_ARG_WITH(builddeps-conf, [AS_HELP_STRING([--with-builddeps-conf],
  11.399 +      [use this configuration file for the builddeps])])
  11.400  
  11.401 -AC_ARG_WITH(builddeps-server, [AS_HELP_STRING([--with-builddeps-server],
  11.402 -    [download and use build dependencies from this server url])])
  11.403 +  AC_ARG_WITH(builddeps-server, [AS_HELP_STRING([--with-builddeps-server],
  11.404 +      [download and use build dependencies from this server url])])
  11.405  
  11.406 -AC_ARG_WITH(builddeps-dir, [AS_HELP_STRING([--with-builddeps-dir],
  11.407 -    [store downloaded build dependencies here @<:@/localhome/builddeps@:>@])],
  11.408 -    [],
  11.409 -    [with_builddeps_dir=/localhome/builddeps])
  11.410 +  AC_ARG_WITH(builddeps-dir, [AS_HELP_STRING([--with-builddeps-dir],
  11.411 +      [store downloaded build dependencies here @<:@/localhome/builddeps@:>@])],
  11.412 +      [],
  11.413 +      [with_builddeps_dir=/localhome/builddeps])
  11.414  
  11.415 -AC_ARG_WITH(builddeps-group, [AS_HELP_STRING([--with-builddeps-group],
  11.416 -    [chgrp the downloaded build dependencies to this group])])
  11.417 +  AC_ARG_WITH(builddeps-group, [AS_HELP_STRING([--with-builddeps-group],
  11.418 +      [chgrp the downloaded build dependencies to this group])])
  11.419  ])
    12.1 --- a/common/autoconf/compare.sh.in	Mon Oct 14 18:53:53 2013 -0400
    12.2 +++ b/common/autoconf/compare.sh.in	Wed Oct 16 11:55:44 2013 -0700
    12.3 @@ -22,7 +22,7 @@
    12.4  # questions.
    12.5  #
    12.6  
    12.7 -# This script is processed by configure before it's usable. It is run from 
    12.8 +# This script is processed by configure before it's usable. It is run from
    12.9  # the root of the build directory.
   12.10  
   12.11  
   12.12 @@ -67,14 +67,14 @@
   12.13  SRC_ROOT="@SRC_ROOT@"
   12.14  
   12.15  if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
   12.16 -    PATH="@VS_PATH@"
   12.17 +  PATH="@VS_PATH@"
   12.18  fi
   12.19  
   12.20  # Now locate the main script and run it.
   12.21  REAL_COMPARE_SCRIPT="$SRC_ROOT/common/bin/compare.sh"
   12.22  if [ ! -e "$REAL_COMPARE_SCRIPT" ]; then
   12.23 -    echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT"
   12.24 -    exit 1
   12.25 +  echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT"
   12.26 +  exit 1
   12.27  fi
   12.28  
   12.29  . "$REAL_COMPARE_SCRIPT" "$@"
    13.1 --- a/common/autoconf/config.h.in	Mon Oct 14 18:53:53 2013 -0400
    13.2 +++ b/common/autoconf/config.h.in	Wed Oct 16 11:55:44 2013 -0700
    13.3 @@ -46,4 +46,4 @@
    13.4  #define HAVE_LIBGIF
    13.5  #define HAVE_LIBZ
    13.6  #define HAVE_LIBM
    13.7 -#define HAVE_ALTZONE 
    13.8 +#define HAVE_ALTZONE
    14.1 --- a/common/autoconf/configure	Mon Oct 14 18:53:53 2013 -0400
    14.2 +++ b/common/autoconf/configure	Wed Oct 16 11:55:44 2013 -0700
    14.3 @@ -88,7 +88,6 @@
    14.4          check_autoconf_timestamps
    14.5        fi
    14.6      fi
    14.7 -    
    14.8    fi
    14.9  }
   14.10  
   14.11 @@ -106,7 +105,7 @@
   14.12    fi
   14.13  fi
   14.14  
   14.15 -# Autoconf calls the configure script recursively sometimes. 
   14.16 +# Autoconf calls the configure script recursively sometimes.
   14.17  # Don't start logging twice in that case
   14.18  if test "x$conf_debug_configure" = xtrue; then
   14.19    conf_debug_configure=recursive
   14.20 @@ -120,28 +119,28 @@
   14.21  for conf_option
   14.22  do
   14.23    case $conf_option in
   14.24 -  --openjdk-target=*)
   14.25 -    conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'`
   14.26 -    continue ;;
   14.27 -  --debug-configure)
   14.28 -    if test "x$conf_debug_configure" != xrecursive; then
   14.29 -      conf_debug_configure=true
   14.30 -      export conf_debug_configure
   14.31 -    fi
   14.32 -    continue ;;
   14.33 -  *)
   14.34 -    conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") ;;
   14.35 +    --openjdk-target=*)
   14.36 +      conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'`
   14.37 +      continue ;;
   14.38 +    --debug-configure)
   14.39 +      if test "x$conf_debug_configure" != xrecursive; then
   14.40 +        conf_debug_configure=true
   14.41 +        export conf_debug_configure
   14.42 +      fi
   14.43 +      continue ;;
   14.44 +    *)
   14.45 +      conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") ;;
   14.46    esac
   14.47  
   14.48    case $conf_option in
   14.49 -  -build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*)
   14.50 -    conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
   14.51 -  -target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
   14.52 -    conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
   14.53 -  -host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*)
   14.54 -    conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
   14.55 -  -help | --help | --hel | --he | -h)
   14.56 -    conf_print_help=true ;;
   14.57 +    -build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*)
   14.58 +      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
   14.59 +    -target | --target | --targe | --targ | --tar | --ta | --t | -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
   14.60 +      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
   14.61 +    -host | --host | --hos | --ho | -host=* | --host=* | --hos=* | --ho=*)
   14.62 +      conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
   14.63 +    -help | --help | --hel | --he | -h)
   14.64 +      conf_print_help=true ;;
   14.65    esac
   14.66  done
   14.67  
   14.68 @@ -179,7 +178,7 @@
   14.69  else
   14.70    echo Running generated-configure.sh
   14.71    conf_script_to_run=$conf_script_dir/generated-configure.sh
   14.72 -fi  
   14.73 +fi
   14.74  
   14.75  if test "x$conf_debug_configure" != x; then
   14.76    # Turn on shell debug output if requested (initial or recursive)
    15.1 --- a/common/autoconf/configure.ac	Mon Oct 14 18:53:53 2013 -0400
    15.2 +++ b/common/autoconf/configure.ac	Wed Oct 16 11:55:44 2013 -0700
    15.3 @@ -236,7 +236,7 @@
    15.4  # Create the actual output files. Now the main work of configure is done.
    15.5  AC_OUTPUT
    15.6  
    15.7 -# Try to move the config.log file to the output directory. 
    15.8 +# Try to move the config.log file to the output directory.
    15.9  if test -e ./config.log; then
   15.10    $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null
   15.11  fi
    16.1 --- a/common/autoconf/generated-configure.sh	Mon Oct 14 18:53:53 2013 -0400
    16.2 +++ b/common/autoconf/generated-configure.sh	Wed Oct 16 11:55:44 2013 -0700
    16.3 @@ -3112,7 +3112,7 @@
    16.4  #
    16.5  
    16.6  # Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
    16.7 -# If so, then append $1 to $2\
    16.8 +# If so, then append $1 to $2 \
    16.9  # Also set JVM_ARG_OK to true/false depending on outcome.
   16.10  
   16.11  
   16.12 @@ -3441,74 +3441,74 @@
   16.13  
   16.14  
   16.15  cygwin_help() {
   16.16 -    case $1 in
   16.17 +  case $1 in
   16.18      unzip)
   16.19 -        PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
   16.20 +      PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P unzip" ;;
   16.21      zip)
   16.22 -        PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
   16.23 +      PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P zip" ;;
   16.24      make)
   16.25 -        PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
   16.26 +      PKGHANDLER_COMMAND="cd <location of cygwin setup.exe> && cmd /c setup -q -P make" ;;
   16.27      * )
   16.28 -       break ;;
   16.29 -    esac
   16.30 +      break ;;
   16.31 +  esac
   16.32  }
   16.33  
   16.34  apt_help() {
   16.35 -    case $1 in
   16.36 +  case $1 in
   16.37      devkit)
   16.38 -        PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
   16.39 +      PKGHANDLER_COMMAND="sudo apt-get install build-essential" ;;
   16.40      openjdk)
   16.41 -        PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;;
   16.42 +      PKGHANDLER_COMMAND="sudo apt-get install openjdk-7-jdk" ;;
   16.43      alsa)
   16.44 -        PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
   16.45 +      PKGHANDLER_COMMAND="sudo apt-get install libasound2-dev" ;;
   16.46      cups)
   16.47 -        PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
   16.48 +      PKGHANDLER_COMMAND="sudo apt-get install libcups2-dev" ;;
   16.49      freetype2)
   16.50 -        PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
   16.51 +      PKGHANDLER_COMMAND="sudo apt-get install libfreetype6-dev" ;;
   16.52      pulse)
   16.53 -        PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
   16.54 +      PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
   16.55      x11)
   16.56 -        PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
   16.57 +      PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
   16.58      ccache)
   16.59 -        PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
   16.60 +      PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
   16.61      * )
   16.62 -       break ;;
   16.63 -    esac
   16.64 +      break ;;
   16.65 +  esac
   16.66  }
   16.67  
   16.68  yum_help() {
   16.69 -    case $1 in
   16.70 +  case $1 in
   16.71      devkit)
   16.72 -        PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;;
   16.73 +      PKGHANDLER_COMMAND="sudo yum groupinstall \"Development Tools\"" ;;
   16.74      openjdk)
   16.75 -        PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;;
   16.76 +      PKGHANDLER_COMMAND="sudo yum install java-1.7.0-openjdk" ;;
   16.77      alsa)
   16.78 -        PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
   16.79 +      PKGHANDLER_COMMAND="sudo yum install alsa-lib-devel" ;;
   16.80      cups)
   16.81 -        PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
   16.82 +      PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
   16.83      freetype2)
   16.84 -        PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
   16.85 +      PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
   16.86      pulse)
   16.87 -        PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
   16.88 +      PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
   16.89      x11)
   16.90 -        PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
   16.91 +      PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
   16.92      ccache)
   16.93 -        PKGHANDLER_COMMAND="sudo yum install ccache" ;;
   16.94 +      PKGHANDLER_COMMAND="sudo yum install ccache" ;;
   16.95      * )
   16.96 -       break ;;
   16.97 -    esac
   16.98 +      break ;;
   16.99 +  esac
  16.100  }
  16.101  
  16.102  port_help() {
  16.103 -    PKGHANDLER_COMMAND=""
  16.104 +  PKGHANDLER_COMMAND=""
  16.105  }
  16.106  
  16.107  pkgutil_help() {
  16.108 -    PKGHANDLER_COMMAND=""
  16.109 +  PKGHANDLER_COMMAND=""
  16.110  }
  16.111  
  16.112  pkgadd_help() {
  16.113 -    PKGHANDLER_COMMAND=""
  16.114 +  PKGHANDLER_COMMAND=""
  16.115  }
  16.116  
  16.117  
  16.118 @@ -3662,8 +3662,8 @@
  16.119  # doing anything else with these values.
  16.120  
  16.121  
  16.122 -    # Setup the legacy variables, for controlling the old makefiles.
  16.123 -    #
  16.124 +# Setup the legacy variables, for controlling the old makefiles.
  16.125 +#
  16.126  
  16.127  
  16.128  
  16.129 @@ -3818,7 +3818,7 @@
  16.130  #CUSTOM_AUTOCONF_INCLUDE
  16.131  
  16.132  # Do not change or remove the following line, it is needed for consistency checks:
  16.133 -DATE_WHEN_GENERATED=1381162713
  16.134 +DATE_WHEN_GENERATED=1381407169
  16.135  
  16.136  ###############################################################################
  16.137  #
  16.138 @@ -3831,26 +3831,26 @@
  16.139  
  16.140  # Basic initialization that must happen first of all
  16.141  
  16.142 -# Save the original command line. This is passed to us by the wrapper configure script.
  16.143 -
  16.144 -DATE_WHEN_CONFIGURED=`LANG=C date`
  16.145 -
  16.146 -{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuration created at $DATE_WHEN_CONFIGURED." >&5
  16.147 +  # Save the original command line. This is passed to us by the wrapper configure script.
  16.148 +
  16.149 +  DATE_WHEN_CONFIGURED=`LANG=C date`
  16.150 +
  16.151 +  { $as_echo "$as_me:${as_lineno-$LINENO}: Configuration created at $DATE_WHEN_CONFIGURED." >&5
  16.152  $as_echo "$as_me: Configuration created at $DATE_WHEN_CONFIGURED." >&6;}
  16.153 -{ $as_echo "$as_me:${as_lineno-$LINENO}: configure script generated at timestamp $DATE_WHEN_GENERATED." >&5
  16.154 +  { $as_echo "$as_me:${as_lineno-$LINENO}: configure script generated at timestamp $DATE_WHEN_GENERATED." >&5
  16.155  $as_echo "$as_me: configure script generated at timestamp $DATE_WHEN_GENERATED." >&6;}
  16.156  
  16.157  
  16.158  
  16.159 -# Start with tools that do not need have cross compilation support
  16.160 -# and can be expected to be found in the default PATH. These tools are
  16.161 -# used by configure. Nor are these tools expected to be found in the
  16.162 -# devkit from the builddeps server either, since they are
  16.163 -# needed to download the devkit.
  16.164 -
  16.165 -# First are all the simple required tools.
  16.166 -
  16.167 -    for ac_prog in basename
  16.168 +  # Start with tools that do not need have cross compilation support
  16.169 +  # and can be expected to be found in the default PATH. These tools are
  16.170 +  # used by configure. Nor are these tools expected to be found in the
  16.171 +  # devkit from the builddeps server either, since they are
  16.172 +  # needed to download the devkit.
  16.173 +
  16.174 +  # First are all the simple required tools.
  16.175 +
  16.176 +  for ac_prog in basename
  16.177  do
  16.178    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.179  set dummy $ac_prog; ac_word=$2
  16.180 @@ -3896,20 +3896,20 @@
  16.181  done
  16.182  
  16.183  
  16.184 -    if test "x$BASENAME" = x; then
  16.185 -        if test "xbasename" = x; then
  16.186 -          PROG_NAME=basename
  16.187 -        else
  16.188 -          PROG_NAME=basename
  16.189 -        fi
  16.190 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.191 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.192 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.193 -    fi
  16.194 -
  16.195 -
  16.196 -
  16.197 -    for ac_prog in bash
  16.198 +  if test "x$BASENAME" = x; then
  16.199 +    if test "xbasename" = x; then
  16.200 +      PROG_NAME=basename
  16.201 +    else
  16.202 +      PROG_NAME=basename
  16.203 +    fi
  16.204 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.205 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.206 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.207 +  fi
  16.208 +
  16.209 +
  16.210 +
  16.211 +  for ac_prog in bash
  16.212  do
  16.213    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.214  set dummy $ac_prog; ac_word=$2
  16.215 @@ -3955,20 +3955,20 @@
  16.216  done
  16.217  
  16.218  
  16.219 -    if test "x$BASH" = x; then
  16.220 -        if test "xbash" = x; then
  16.221 -          PROG_NAME=bash
  16.222 -        else
  16.223 -          PROG_NAME=bash
  16.224 -        fi
  16.225 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.226 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.227 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.228 -    fi
  16.229 -
  16.230 -
  16.231 -
  16.232 -    for ac_prog in cat
  16.233 +  if test "x$BASH" = x; then
  16.234 +    if test "xbash" = x; then
  16.235 +      PROG_NAME=bash
  16.236 +    else
  16.237 +      PROG_NAME=bash
  16.238 +    fi
  16.239 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.240 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.241 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.242 +  fi
  16.243 +
  16.244 +
  16.245 +
  16.246 +  for ac_prog in cat
  16.247  do
  16.248    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.249  set dummy $ac_prog; ac_word=$2
  16.250 @@ -4014,20 +4014,20 @@
  16.251  done
  16.252  
  16.253  
  16.254 -    if test "x$CAT" = x; then
  16.255 -        if test "xcat" = x; then
  16.256 -          PROG_NAME=cat
  16.257 -        else
  16.258 -          PROG_NAME=cat
  16.259 -        fi
  16.260 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.261 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.262 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.263 -    fi
  16.264 -
  16.265 -
  16.266 -
  16.267 -    for ac_prog in chmod
  16.268 +  if test "x$CAT" = x; then
  16.269 +    if test "xcat" = x; then
  16.270 +      PROG_NAME=cat
  16.271 +    else
  16.272 +      PROG_NAME=cat
  16.273 +    fi
  16.274 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.275 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.276 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.277 +  fi
  16.278 +
  16.279 +
  16.280 +
  16.281 +  for ac_prog in chmod
  16.282  do
  16.283    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.284  set dummy $ac_prog; ac_word=$2
  16.285 @@ -4073,20 +4073,20 @@
  16.286  done
  16.287  
  16.288  
  16.289 -    if test "x$CHMOD" = x; then
  16.290 -        if test "xchmod" = x; then
  16.291 -          PROG_NAME=chmod
  16.292 -        else
  16.293 -          PROG_NAME=chmod
  16.294 -        fi
  16.295 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.296 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.297 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.298 -    fi
  16.299 -
  16.300 -
  16.301 -
  16.302 -    for ac_prog in cmp
  16.303 +  if test "x$CHMOD" = x; then
  16.304 +    if test "xchmod" = x; then
  16.305 +      PROG_NAME=chmod
  16.306 +    else
  16.307 +      PROG_NAME=chmod
  16.308 +    fi
  16.309 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.310 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.311 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.312 +  fi
  16.313 +
  16.314 +
  16.315 +
  16.316 +  for ac_prog in cmp
  16.317  do
  16.318    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.319  set dummy $ac_prog; ac_word=$2
  16.320 @@ -4132,20 +4132,20 @@
  16.321  done
  16.322  
  16.323  
  16.324 -    if test "x$CMP" = x; then
  16.325 -        if test "xcmp" = x; then
  16.326 -          PROG_NAME=cmp
  16.327 -        else
  16.328 -          PROG_NAME=cmp
  16.329 -        fi
  16.330 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.331 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.332 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.333 -    fi
  16.334 -
  16.335 -
  16.336 -
  16.337 -    for ac_prog in comm
  16.338 +  if test "x$CMP" = x; then
  16.339 +    if test "xcmp" = x; then
  16.340 +      PROG_NAME=cmp
  16.341 +    else
  16.342 +      PROG_NAME=cmp
  16.343 +    fi
  16.344 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.345 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.346 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.347 +  fi
  16.348 +
  16.349 +
  16.350 +
  16.351 +  for ac_prog in comm
  16.352  do
  16.353    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.354  set dummy $ac_prog; ac_word=$2
  16.355 @@ -4191,20 +4191,20 @@
  16.356  done
  16.357  
  16.358  
  16.359 -    if test "x$COMM" = x; then
  16.360 -        if test "xcomm" = x; then
  16.361 -          PROG_NAME=comm
  16.362 -        else
  16.363 -          PROG_NAME=comm
  16.364 -        fi
  16.365 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.366 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.367 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.368 -    fi
  16.369 -
  16.370 -
  16.371 -
  16.372 -    for ac_prog in cp
  16.373 +  if test "x$COMM" = x; then
  16.374 +    if test "xcomm" = x; then
  16.375 +      PROG_NAME=comm
  16.376 +    else
  16.377 +      PROG_NAME=comm
  16.378 +    fi
  16.379 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.380 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.381 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.382 +  fi
  16.383 +
  16.384 +
  16.385 +
  16.386 +  for ac_prog in cp
  16.387  do
  16.388    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.389  set dummy $ac_prog; ac_word=$2
  16.390 @@ -4250,20 +4250,20 @@
  16.391  done
  16.392  
  16.393  
  16.394 -    if test "x$CP" = x; then
  16.395 -        if test "xcp" = x; then
  16.396 -          PROG_NAME=cp
  16.397 -        else
  16.398 -          PROG_NAME=cp
  16.399 -        fi
  16.400 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.401 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.402 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.403 -    fi
  16.404 -
  16.405 -
  16.406 -
  16.407 -    for ac_prog in cpio
  16.408 +  if test "x$CP" = x; then
  16.409 +    if test "xcp" = x; then
  16.410 +      PROG_NAME=cp
  16.411 +    else
  16.412 +      PROG_NAME=cp
  16.413 +    fi
  16.414 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.415 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.416 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.417 +  fi
  16.418 +
  16.419 +
  16.420 +
  16.421 +  for ac_prog in cpio
  16.422  do
  16.423    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.424  set dummy $ac_prog; ac_word=$2
  16.425 @@ -4309,20 +4309,20 @@
  16.426  done
  16.427  
  16.428  
  16.429 -    if test "x$CPIO" = x; then
  16.430 -        if test "xcpio" = x; then
  16.431 -          PROG_NAME=cpio
  16.432 -        else
  16.433 -          PROG_NAME=cpio
  16.434 -        fi
  16.435 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.436 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.437 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.438 -    fi
  16.439 -
  16.440 -
  16.441 -
  16.442 -    for ac_prog in cut
  16.443 +  if test "x$CPIO" = x; then
  16.444 +    if test "xcpio" = x; then
  16.445 +      PROG_NAME=cpio
  16.446 +    else
  16.447 +      PROG_NAME=cpio
  16.448 +    fi
  16.449 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.450 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.451 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.452 +  fi
  16.453 +
  16.454 +
  16.455 +
  16.456 +  for ac_prog in cut
  16.457  do
  16.458    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.459  set dummy $ac_prog; ac_word=$2
  16.460 @@ -4368,20 +4368,20 @@
  16.461  done
  16.462  
  16.463  
  16.464 -    if test "x$CUT" = x; then
  16.465 -        if test "xcut" = x; then
  16.466 -          PROG_NAME=cut
  16.467 -        else
  16.468 -          PROG_NAME=cut
  16.469 -        fi
  16.470 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.471 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.472 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.473 -    fi
  16.474 -
  16.475 -
  16.476 -
  16.477 -    for ac_prog in date
  16.478 +  if test "x$CUT" = x; then
  16.479 +    if test "xcut" = x; then
  16.480 +      PROG_NAME=cut
  16.481 +    else
  16.482 +      PROG_NAME=cut
  16.483 +    fi
  16.484 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.485 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.486 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.487 +  fi
  16.488 +
  16.489 +
  16.490 +
  16.491 +  for ac_prog in date
  16.492  do
  16.493    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.494  set dummy $ac_prog; ac_word=$2
  16.495 @@ -4427,20 +4427,20 @@
  16.496  done
  16.497  
  16.498  
  16.499 -    if test "x$DATE" = x; then
  16.500 -        if test "xdate" = x; then
  16.501 -          PROG_NAME=date
  16.502 -        else
  16.503 -          PROG_NAME=date
  16.504 -        fi
  16.505 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.506 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.507 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.508 -    fi
  16.509 -
  16.510 -
  16.511 -
  16.512 -    for ac_prog in gdiff diff
  16.513 +  if test "x$DATE" = x; then
  16.514 +    if test "xdate" = x; then
  16.515 +      PROG_NAME=date
  16.516 +    else
  16.517 +      PROG_NAME=date
  16.518 +    fi
  16.519 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.520 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.521 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.522 +  fi
  16.523 +
  16.524 +
  16.525 +
  16.526 +  for ac_prog in gdiff diff
  16.527  do
  16.528    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.529  set dummy $ac_prog; ac_word=$2
  16.530 @@ -4486,20 +4486,20 @@
  16.531  done
  16.532  
  16.533  
  16.534 -    if test "x$DIFF" = x; then
  16.535 -        if test "xgdiff diff" = x; then
  16.536 -          PROG_NAME=diff
  16.537 -        else
  16.538 -          PROG_NAME=gdiff diff
  16.539 -        fi
  16.540 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.541 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.542 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.543 -    fi
  16.544 -
  16.545 -
  16.546 -
  16.547 -    for ac_prog in dirname
  16.548 +  if test "x$DIFF" = x; then
  16.549 +    if test "xgdiff diff" = x; then
  16.550 +      PROG_NAME=diff
  16.551 +    else
  16.552 +      PROG_NAME=gdiff diff
  16.553 +    fi
  16.554 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.555 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.556 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.557 +  fi
  16.558 +
  16.559 +
  16.560 +
  16.561 +  for ac_prog in dirname
  16.562  do
  16.563    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.564  set dummy $ac_prog; ac_word=$2
  16.565 @@ -4545,20 +4545,20 @@
  16.566  done
  16.567  
  16.568  
  16.569 -    if test "x$DIRNAME" = x; then
  16.570 -        if test "xdirname" = x; then
  16.571 -          PROG_NAME=dirname
  16.572 -        else
  16.573 -          PROG_NAME=dirname
  16.574 -        fi
  16.575 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.576 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.577 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.578 -    fi
  16.579 -
  16.580 -
  16.581 -
  16.582 -    for ac_prog in echo
  16.583 +  if test "x$DIRNAME" = x; then
  16.584 +    if test "xdirname" = x; then
  16.585 +      PROG_NAME=dirname
  16.586 +    else
  16.587 +      PROG_NAME=dirname
  16.588 +    fi
  16.589 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.590 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.591 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.592 +  fi
  16.593 +
  16.594 +
  16.595 +
  16.596 +  for ac_prog in echo
  16.597  do
  16.598    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.599  set dummy $ac_prog; ac_word=$2
  16.600 @@ -4604,20 +4604,20 @@
  16.601  done
  16.602  
  16.603  
  16.604 -    if test "x$ECHO" = x; then
  16.605 -        if test "xecho" = x; then
  16.606 -          PROG_NAME=echo
  16.607 -        else
  16.608 -          PROG_NAME=echo
  16.609 -        fi
  16.610 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.611 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.612 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.613 -    fi
  16.614 -
  16.615 -
  16.616 -
  16.617 -    for ac_prog in expr
  16.618 +  if test "x$ECHO" = x; then
  16.619 +    if test "xecho" = x; then
  16.620 +      PROG_NAME=echo
  16.621 +    else
  16.622 +      PROG_NAME=echo
  16.623 +    fi
  16.624 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.625 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.626 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.627 +  fi
  16.628 +
  16.629 +
  16.630 +
  16.631 +  for ac_prog in expr
  16.632  do
  16.633    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.634  set dummy $ac_prog; ac_word=$2
  16.635 @@ -4663,20 +4663,20 @@
  16.636  done
  16.637  
  16.638  
  16.639 -    if test "x$EXPR" = x; then
  16.640 -        if test "xexpr" = x; then
  16.641 -          PROG_NAME=expr
  16.642 -        else
  16.643 -          PROG_NAME=expr
  16.644 -        fi
  16.645 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.646 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.647 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.648 -    fi
  16.649 -
  16.650 -
  16.651 -
  16.652 -    for ac_prog in file
  16.653 +  if test "x$EXPR" = x; then
  16.654 +    if test "xexpr" = x; then
  16.655 +      PROG_NAME=expr
  16.656 +    else
  16.657 +      PROG_NAME=expr
  16.658 +    fi
  16.659 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.660 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.661 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.662 +  fi
  16.663 +
  16.664 +
  16.665 +
  16.666 +  for ac_prog in file
  16.667  do
  16.668    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.669  set dummy $ac_prog; ac_word=$2
  16.670 @@ -4722,20 +4722,20 @@
  16.671  done
  16.672  
  16.673  
  16.674 -    if test "x$FILE" = x; then
  16.675 -        if test "xfile" = x; then
  16.676 -          PROG_NAME=file
  16.677 -        else
  16.678 -          PROG_NAME=file
  16.679 -        fi
  16.680 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.681 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.682 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.683 -    fi
  16.684 -
  16.685 -
  16.686 -
  16.687 -    for ac_prog in find
  16.688 +  if test "x$FILE" = x; then
  16.689 +    if test "xfile" = x; then
  16.690 +      PROG_NAME=file
  16.691 +    else
  16.692 +      PROG_NAME=file
  16.693 +    fi
  16.694 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.695 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.696 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.697 +  fi
  16.698 +
  16.699 +
  16.700 +
  16.701 +  for ac_prog in find
  16.702  do
  16.703    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.704  set dummy $ac_prog; ac_word=$2
  16.705 @@ -4781,20 +4781,20 @@
  16.706  done
  16.707  
  16.708  
  16.709 -    if test "x$FIND" = x; then
  16.710 -        if test "xfind" = x; then
  16.711 -          PROG_NAME=find
  16.712 -        else
  16.713 -          PROG_NAME=find
  16.714 -        fi
  16.715 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.716 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.717 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.718 -    fi
  16.719 -
  16.720 -
  16.721 -
  16.722 -    for ac_prog in head
  16.723 +  if test "x$FIND" = x; then
  16.724 +    if test "xfind" = x; then
  16.725 +      PROG_NAME=find
  16.726 +    else
  16.727 +      PROG_NAME=find
  16.728 +    fi
  16.729 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.730 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.731 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.732 +  fi
  16.733 +
  16.734 +
  16.735 +
  16.736 +  for ac_prog in head
  16.737  do
  16.738    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.739  set dummy $ac_prog; ac_word=$2
  16.740 @@ -4840,20 +4840,20 @@
  16.741  done
  16.742  
  16.743  
  16.744 -    if test "x$HEAD" = x; then
  16.745 -        if test "xhead" = x; then
  16.746 -          PROG_NAME=head
  16.747 -        else
  16.748 -          PROG_NAME=head
  16.749 -        fi
  16.750 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.751 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.752 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.753 -    fi
  16.754 -
  16.755 -
  16.756 -
  16.757 -    for ac_prog in ln
  16.758 +  if test "x$HEAD" = x; then
  16.759 +    if test "xhead" = x; then
  16.760 +      PROG_NAME=head
  16.761 +    else
  16.762 +      PROG_NAME=head
  16.763 +    fi
  16.764 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.765 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.766 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.767 +  fi
  16.768 +
  16.769 +
  16.770 +
  16.771 +  for ac_prog in ln
  16.772  do
  16.773    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.774  set dummy $ac_prog; ac_word=$2
  16.775 @@ -4899,20 +4899,20 @@
  16.776  done
  16.777  
  16.778  
  16.779 -    if test "x$LN" = x; then
  16.780 -        if test "xln" = x; then
  16.781 -          PROG_NAME=ln
  16.782 -        else
  16.783 -          PROG_NAME=ln
  16.784 -        fi
  16.785 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.786 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.787 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.788 -    fi
  16.789 -
  16.790 -
  16.791 -
  16.792 -    for ac_prog in ls
  16.793 +  if test "x$LN" = x; then
  16.794 +    if test "xln" = x; then
  16.795 +      PROG_NAME=ln
  16.796 +    else
  16.797 +      PROG_NAME=ln
  16.798 +    fi
  16.799 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.800 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.801 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.802 +  fi
  16.803 +
  16.804 +
  16.805 +
  16.806 +  for ac_prog in ls
  16.807  do
  16.808    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.809  set dummy $ac_prog; ac_word=$2
  16.810 @@ -4958,20 +4958,20 @@
  16.811  done
  16.812  
  16.813  
  16.814 -    if test "x$LS" = x; then
  16.815 -        if test "xls" = x; then
  16.816 -          PROG_NAME=ls
  16.817 -        else
  16.818 -          PROG_NAME=ls
  16.819 -        fi
  16.820 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.821 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.822 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.823 -    fi
  16.824 -
  16.825 -
  16.826 -
  16.827 -    for ac_prog in mkdir
  16.828 +  if test "x$LS" = x; then
  16.829 +    if test "xls" = x; then
  16.830 +      PROG_NAME=ls
  16.831 +    else
  16.832 +      PROG_NAME=ls
  16.833 +    fi
  16.834 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.835 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.836 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.837 +  fi
  16.838 +
  16.839 +
  16.840 +
  16.841 +  for ac_prog in mkdir
  16.842  do
  16.843    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.844  set dummy $ac_prog; ac_word=$2
  16.845 @@ -5017,20 +5017,20 @@
  16.846  done
  16.847  
  16.848  
  16.849 -    if test "x$MKDIR" = x; then
  16.850 -        if test "xmkdir" = x; then
  16.851 -          PROG_NAME=mkdir
  16.852 -        else
  16.853 -          PROG_NAME=mkdir
  16.854 -        fi
  16.855 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.856 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.857 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.858 -    fi
  16.859 -
  16.860 -
  16.861 -
  16.862 -    for ac_prog in mktemp
  16.863 +  if test "x$MKDIR" = x; then
  16.864 +    if test "xmkdir" = x; then
  16.865 +      PROG_NAME=mkdir
  16.866 +    else
  16.867 +      PROG_NAME=mkdir
  16.868 +    fi
  16.869 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.870 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.871 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.872 +  fi
  16.873 +
  16.874 +
  16.875 +
  16.876 +  for ac_prog in mktemp
  16.877  do
  16.878    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.879  set dummy $ac_prog; ac_word=$2
  16.880 @@ -5076,20 +5076,20 @@
  16.881  done
  16.882  
  16.883  
  16.884 -    if test "x$MKTEMP" = x; then
  16.885 -        if test "xmktemp" = x; then
  16.886 -          PROG_NAME=mktemp
  16.887 -        else
  16.888 -          PROG_NAME=mktemp
  16.889 -        fi
  16.890 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.891 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.892 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.893 -    fi
  16.894 -
  16.895 -
  16.896 -
  16.897 -    for ac_prog in mv
  16.898 +  if test "x$MKTEMP" = x; then
  16.899 +    if test "xmktemp" = x; then
  16.900 +      PROG_NAME=mktemp
  16.901 +    else
  16.902 +      PROG_NAME=mktemp
  16.903 +    fi
  16.904 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.905 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.906 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.907 +  fi
  16.908 +
  16.909 +
  16.910 +
  16.911 +  for ac_prog in mv
  16.912  do
  16.913    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.914  set dummy $ac_prog; ac_word=$2
  16.915 @@ -5135,20 +5135,20 @@
  16.916  done
  16.917  
  16.918  
  16.919 -    if test "x$MV" = x; then
  16.920 -        if test "xmv" = x; then
  16.921 -          PROG_NAME=mv
  16.922 -        else
  16.923 -          PROG_NAME=mv
  16.924 -        fi
  16.925 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.926 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.927 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.928 -    fi
  16.929 -
  16.930 -
  16.931 -
  16.932 -    for ac_prog in printf
  16.933 +  if test "x$MV" = x; then
  16.934 +    if test "xmv" = x; then
  16.935 +      PROG_NAME=mv
  16.936 +    else
  16.937 +      PROG_NAME=mv
  16.938 +    fi
  16.939 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.940 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.941 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.942 +  fi
  16.943 +
  16.944 +
  16.945 +
  16.946 +  for ac_prog in printf
  16.947  do
  16.948    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.949  set dummy $ac_prog; ac_word=$2
  16.950 @@ -5194,20 +5194,20 @@
  16.951  done
  16.952  
  16.953  
  16.954 -    if test "x$PRINTF" = x; then
  16.955 -        if test "xprintf" = x; then
  16.956 -          PROG_NAME=printf
  16.957 -        else
  16.958 -          PROG_NAME=printf
  16.959 -        fi
  16.960 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.961 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.962 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.963 -    fi
  16.964 -
  16.965 -
  16.966 -
  16.967 -    for ac_prog in rm
  16.968 +  if test "x$PRINTF" = x; then
  16.969 +    if test "xprintf" = x; then
  16.970 +      PROG_NAME=printf
  16.971 +    else
  16.972 +      PROG_NAME=printf
  16.973 +    fi
  16.974 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.975 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.976 +    as_fn_error $? "Cannot continue" "$LINENO" 5
  16.977 +  fi
  16.978 +
  16.979 +
  16.980 +
  16.981 +  for ac_prog in rm
  16.982  do
  16.983    # Extract the first word of "$ac_prog", so it can be a program name with args.
  16.984  set dummy $ac_prog; ac_word=$2
  16.985 @@ -5253,20 +5253,20 @@
  16.986  done
  16.987  
  16.988  
  16.989 -    if test "x$RM" = x; then
  16.990 -        if test "xrm" = x; then
  16.991 -          PROG_NAME=rm
  16.992 -        else
  16.993 -          PROG_NAME=rm
  16.994 -        fi
  16.995 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  16.996 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  16.997 -        as_fn_error $? "Cannot continue" "$LINENO" 5
  16.998 -    fi
  16.999 -
 16.1000 -
 16.1001 -
 16.1002 -    for ac_prog in sh
 16.1003 +  if test "x$RM" = x; then
 16.1004 +    if test "xrm" = x; then
 16.1005 +      PROG_NAME=rm
 16.1006 +    else
 16.1007 +      PROG_NAME=rm
 16.1008 +    fi
 16.1009 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1010 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1011 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1012 +  fi
 16.1013 +
 16.1014 +
 16.1015 +
 16.1016 +  for ac_prog in sh
 16.1017  do
 16.1018    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1019  set dummy $ac_prog; ac_word=$2
 16.1020 @@ -5312,20 +5312,20 @@
 16.1021  done
 16.1022  
 16.1023  
 16.1024 -    if test "x$SH" = x; then
 16.1025 -        if test "xsh" = x; then
 16.1026 -          PROG_NAME=sh
 16.1027 -        else
 16.1028 -          PROG_NAME=sh
 16.1029 -        fi
 16.1030 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1031 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1032 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1033 -    fi
 16.1034 -
 16.1035 -
 16.1036 -
 16.1037 -    for ac_prog in sort
 16.1038 +  if test "x$SH" = x; then
 16.1039 +    if test "xsh" = x; then
 16.1040 +      PROG_NAME=sh
 16.1041 +    else
 16.1042 +      PROG_NAME=sh
 16.1043 +    fi
 16.1044 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1045 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1046 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1047 +  fi
 16.1048 +
 16.1049 +
 16.1050 +
 16.1051 +  for ac_prog in sort
 16.1052  do
 16.1053    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1054  set dummy $ac_prog; ac_word=$2
 16.1055 @@ -5371,20 +5371,20 @@
 16.1056  done
 16.1057  
 16.1058  
 16.1059 -    if test "x$SORT" = x; then
 16.1060 -        if test "xsort" = x; then
 16.1061 -          PROG_NAME=sort
 16.1062 -        else
 16.1063 -          PROG_NAME=sort
 16.1064 -        fi
 16.1065 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1066 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1067 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1068 -    fi
 16.1069 -
 16.1070 -
 16.1071 -
 16.1072 -    for ac_prog in tail
 16.1073 +  if test "x$SORT" = x; then
 16.1074 +    if test "xsort" = x; then
 16.1075 +      PROG_NAME=sort
 16.1076 +    else
 16.1077 +      PROG_NAME=sort
 16.1078 +    fi
 16.1079 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1080 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1081 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1082 +  fi
 16.1083 +
 16.1084 +
 16.1085 +
 16.1086 +  for ac_prog in tail
 16.1087  do
 16.1088    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1089  set dummy $ac_prog; ac_word=$2
 16.1090 @@ -5430,20 +5430,20 @@
 16.1091  done
 16.1092  
 16.1093  
 16.1094 -    if test "x$TAIL" = x; then
 16.1095 -        if test "xtail" = x; then
 16.1096 -          PROG_NAME=tail
 16.1097 -        else
 16.1098 -          PROG_NAME=tail
 16.1099 -        fi
 16.1100 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1101 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1102 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1103 -    fi
 16.1104 -
 16.1105 -
 16.1106 -
 16.1107 -    for ac_prog in tar
 16.1108 +  if test "x$TAIL" = x; then
 16.1109 +    if test "xtail" = x; then
 16.1110 +      PROG_NAME=tail
 16.1111 +    else
 16.1112 +      PROG_NAME=tail
 16.1113 +    fi
 16.1114 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1115 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1116 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1117 +  fi
 16.1118 +
 16.1119 +
 16.1120 +
 16.1121 +  for ac_prog in tar
 16.1122  do
 16.1123    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1124  set dummy $ac_prog; ac_word=$2
 16.1125 @@ -5489,20 +5489,20 @@
 16.1126  done
 16.1127  
 16.1128  
 16.1129 -    if test "x$TAR" = x; then
 16.1130 -        if test "xtar" = x; then
 16.1131 -          PROG_NAME=tar
 16.1132 -        else
 16.1133 -          PROG_NAME=tar
 16.1134 -        fi
 16.1135 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1136 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1137 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1138 -    fi
 16.1139 -
 16.1140 -
 16.1141 -
 16.1142 -    for ac_prog in tee
 16.1143 +  if test "x$TAR" = x; then
 16.1144 +    if test "xtar" = x; then
 16.1145 +      PROG_NAME=tar
 16.1146 +    else
 16.1147 +      PROG_NAME=tar
 16.1148 +    fi
 16.1149 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1150 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1151 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1152 +  fi
 16.1153 +
 16.1154 +
 16.1155 +
 16.1156 +  for ac_prog in tee
 16.1157  do
 16.1158    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1159  set dummy $ac_prog; ac_word=$2
 16.1160 @@ -5548,20 +5548,20 @@
 16.1161  done
 16.1162  
 16.1163  
 16.1164 -    if test "x$TEE" = x; then
 16.1165 -        if test "xtee" = x; then
 16.1166 -          PROG_NAME=tee
 16.1167 -        else
 16.1168 -          PROG_NAME=tee
 16.1169 -        fi
 16.1170 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1171 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1172 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1173 -    fi
 16.1174 -
 16.1175 -
 16.1176 -
 16.1177 -    for ac_prog in touch
 16.1178 +  if test "x$TEE" = x; then
 16.1179 +    if test "xtee" = x; then
 16.1180 +      PROG_NAME=tee
 16.1181 +    else
 16.1182 +      PROG_NAME=tee
 16.1183 +    fi
 16.1184 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1185 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1186 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1187 +  fi
 16.1188 +
 16.1189 +
 16.1190 +
 16.1191 +  for ac_prog in touch
 16.1192  do
 16.1193    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1194  set dummy $ac_prog; ac_word=$2
 16.1195 @@ -5607,20 +5607,20 @@
 16.1196  done
 16.1197  
 16.1198  
 16.1199 -    if test "x$TOUCH" = x; then
 16.1200 -        if test "xtouch" = x; then
 16.1201 -          PROG_NAME=touch
 16.1202 -        else
 16.1203 -          PROG_NAME=touch
 16.1204 -        fi
 16.1205 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1206 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1207 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1208 -    fi
 16.1209 -
 16.1210 -
 16.1211 -
 16.1212 -    for ac_prog in tr
 16.1213 +  if test "x$TOUCH" = x; then
 16.1214 +    if test "xtouch" = x; then
 16.1215 +      PROG_NAME=touch
 16.1216 +    else
 16.1217 +      PROG_NAME=touch
 16.1218 +    fi
 16.1219 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1220 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1221 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1222 +  fi
 16.1223 +
 16.1224 +
 16.1225 +
 16.1226 +  for ac_prog in tr
 16.1227  do
 16.1228    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1229  set dummy $ac_prog; ac_word=$2
 16.1230 @@ -5666,20 +5666,20 @@
 16.1231  done
 16.1232  
 16.1233  
 16.1234 -    if test "x$TR" = x; then
 16.1235 -        if test "xtr" = x; then
 16.1236 -          PROG_NAME=tr
 16.1237 -        else
 16.1238 -          PROG_NAME=tr
 16.1239 -        fi
 16.1240 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1241 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1242 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1243 -    fi
 16.1244 -
 16.1245 -
 16.1246 -
 16.1247 -    for ac_prog in uname
 16.1248 +  if test "x$TR" = x; then
 16.1249 +    if test "xtr" = x; then
 16.1250 +      PROG_NAME=tr
 16.1251 +    else
 16.1252 +      PROG_NAME=tr
 16.1253 +    fi
 16.1254 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1255 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1256 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1257 +  fi
 16.1258 +
 16.1259 +
 16.1260 +
 16.1261 +  for ac_prog in uname
 16.1262  do
 16.1263    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1264  set dummy $ac_prog; ac_word=$2
 16.1265 @@ -5725,20 +5725,20 @@
 16.1266  done
 16.1267  
 16.1268  
 16.1269 -    if test "x$UNAME" = x; then
 16.1270 -        if test "xuname" = x; then
 16.1271 -          PROG_NAME=uname
 16.1272 -        else
 16.1273 -          PROG_NAME=uname
 16.1274 -        fi
 16.1275 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1276 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1277 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1278 -    fi
 16.1279 -
 16.1280 -
 16.1281 -
 16.1282 -    for ac_prog in uniq
 16.1283 +  if test "x$UNAME" = x; then
 16.1284 +    if test "xuname" = x; then
 16.1285 +      PROG_NAME=uname
 16.1286 +    else
 16.1287 +      PROG_NAME=uname
 16.1288 +    fi
 16.1289 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1290 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1291 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1292 +  fi
 16.1293 +
 16.1294 +
 16.1295 +
 16.1296 +  for ac_prog in uniq
 16.1297  do
 16.1298    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1299  set dummy $ac_prog; ac_word=$2
 16.1300 @@ -5784,20 +5784,20 @@
 16.1301  done
 16.1302  
 16.1303  
 16.1304 -    if test "x$UNIQ" = x; then
 16.1305 -        if test "xuniq" = x; then
 16.1306 -          PROG_NAME=uniq
 16.1307 -        else
 16.1308 -          PROG_NAME=uniq
 16.1309 -        fi
 16.1310 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1311 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1312 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1313 -    fi
 16.1314 -
 16.1315 -
 16.1316 -
 16.1317 -    for ac_prog in wc
 16.1318 +  if test "x$UNIQ" = x; then
 16.1319 +    if test "xuniq" = x; then
 16.1320 +      PROG_NAME=uniq
 16.1321 +    else
 16.1322 +      PROG_NAME=uniq
 16.1323 +    fi
 16.1324 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1325 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1326 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1327 +  fi
 16.1328 +
 16.1329 +
 16.1330 +
 16.1331 +  for ac_prog in wc
 16.1332  do
 16.1333    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1334  set dummy $ac_prog; ac_word=$2
 16.1335 @@ -5843,20 +5843,20 @@
 16.1336  done
 16.1337  
 16.1338  
 16.1339 -    if test "x$WC" = x; then
 16.1340 -        if test "xwc" = x; then
 16.1341 -          PROG_NAME=wc
 16.1342 -        else
 16.1343 -          PROG_NAME=wc
 16.1344 -        fi
 16.1345 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1346 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1347 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1348 -    fi
 16.1349 -
 16.1350 -
 16.1351 -
 16.1352 -    for ac_prog in which
 16.1353 +  if test "x$WC" = x; then
 16.1354 +    if test "xwc" = x; then
 16.1355 +      PROG_NAME=wc
 16.1356 +    else
 16.1357 +      PROG_NAME=wc
 16.1358 +    fi
 16.1359 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1360 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1361 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1362 +  fi
 16.1363 +
 16.1364 +
 16.1365 +
 16.1366 +  for ac_prog in which
 16.1367  do
 16.1368    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1369  set dummy $ac_prog; ac_word=$2
 16.1370 @@ -5902,20 +5902,20 @@
 16.1371  done
 16.1372  
 16.1373  
 16.1374 -    if test "x$WHICH" = x; then
 16.1375 -        if test "xwhich" = x; then
 16.1376 -          PROG_NAME=which
 16.1377 -        else
 16.1378 -          PROG_NAME=which
 16.1379 -        fi
 16.1380 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1381 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1382 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1383 -    fi
 16.1384 -
 16.1385 -
 16.1386 -
 16.1387 -    for ac_prog in xargs
 16.1388 +  if test "x$WHICH" = x; then
 16.1389 +    if test "xwhich" = x; then
 16.1390 +      PROG_NAME=which
 16.1391 +    else
 16.1392 +      PROG_NAME=which
 16.1393 +    fi
 16.1394 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1395 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1396 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1397 +  fi
 16.1398 +
 16.1399 +
 16.1400 +
 16.1401 +  for ac_prog in xargs
 16.1402  do
 16.1403    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1404  set dummy $ac_prog; ac_word=$2
 16.1405 @@ -5961,21 +5961,21 @@
 16.1406  done
 16.1407  
 16.1408  
 16.1409 -    if test "x$XARGS" = x; then
 16.1410 -        if test "xxargs" = x; then
 16.1411 -          PROG_NAME=xargs
 16.1412 -        else
 16.1413 -          PROG_NAME=xargs
 16.1414 -        fi
 16.1415 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1416 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1417 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1418 -    fi
 16.1419 -
 16.1420 -
 16.1421 -
 16.1422 -# Then required tools that require some special treatment.
 16.1423 -for ac_prog in gawk mawk nawk awk
 16.1424 +  if test "x$XARGS" = x; then
 16.1425 +    if test "xxargs" = x; then
 16.1426 +      PROG_NAME=xargs
 16.1427 +    else
 16.1428 +      PROG_NAME=xargs
 16.1429 +    fi
 16.1430 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1431 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1432 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1433 +  fi
 16.1434 +
 16.1435 +
 16.1436 +
 16.1437 +  # Then required tools that require some special treatment.
 16.1438 +  for ac_prog in gawk mawk nawk awk
 16.1439  do
 16.1440    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1441  set dummy $ac_prog; ac_word=$2
 16.1442 @@ -6018,18 +6018,18 @@
 16.1443  done
 16.1444  
 16.1445  
 16.1446 -    if test "x$AWK" = x; then
 16.1447 -        if test "x" = x; then
 16.1448 -          PROG_NAME=awk
 16.1449 -        else
 16.1450 -          PROG_NAME=
 16.1451 -        fi
 16.1452 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1453 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1454 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1455 -    fi
 16.1456 -
 16.1457 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 16.1458 +  if test "x$AWK" = x; then
 16.1459 +    if test "x" = x; then
 16.1460 +      PROG_NAME=awk
 16.1461 +    else
 16.1462 +      PROG_NAME=
 16.1463 +    fi
 16.1464 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1465 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1466 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1467 +  fi
 16.1468 +
 16.1469 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 16.1470  $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 16.1471  if ${ac_cv_path_GREP+:} false; then :
 16.1472    $as_echo_n "(cached) " >&6
 16.1473 @@ -6093,18 +6093,18 @@
 16.1474  
 16.1475  
 16.1476  
 16.1477 -    if test "x$GREP" = x; then
 16.1478 -        if test "x" = x; then
 16.1479 -          PROG_NAME=grep
 16.1480 -        else
 16.1481 -          PROG_NAME=
 16.1482 -        fi
 16.1483 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1484 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1485 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1486 -    fi
 16.1487 -
 16.1488 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 16.1489 +  if test "x$GREP" = x; then
 16.1490 +    if test "x" = x; then
 16.1491 +      PROG_NAME=grep
 16.1492 +    else
 16.1493 +      PROG_NAME=
 16.1494 +    fi
 16.1495 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1496 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1497 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1498 +  fi
 16.1499 +
 16.1500 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 16.1501  $as_echo_n "checking for egrep... " >&6; }
 16.1502  if ${ac_cv_path_EGREP+:} false; then :
 16.1503    $as_echo_n "(cached) " >&6
 16.1504 @@ -6172,18 +6172,18 @@
 16.1505  
 16.1506  
 16.1507  
 16.1508 -    if test "x$EGREP" = x; then
 16.1509 -        if test "x" = x; then
 16.1510 -          PROG_NAME=egrep
 16.1511 -        else
 16.1512 -          PROG_NAME=
 16.1513 -        fi
 16.1514 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1515 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1516 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1517 -    fi
 16.1518 -
 16.1519 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 16.1520 +  if test "x$EGREP" = x; then
 16.1521 +    if test "x" = x; then
 16.1522 +      PROG_NAME=egrep
 16.1523 +    else
 16.1524 +      PROG_NAME=
 16.1525 +    fi
 16.1526 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1527 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1528 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1529 +  fi
 16.1530 +
 16.1531 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 16.1532  $as_echo_n "checking for fgrep... " >&6; }
 16.1533  if ${ac_cv_path_FGREP+:} false; then :
 16.1534    $as_echo_n "(cached) " >&6
 16.1535 @@ -6251,18 +6251,18 @@
 16.1536  
 16.1537  
 16.1538  
 16.1539 -    if test "x$FGREP" = x; then
 16.1540 -        if test "x" = x; then
 16.1541 -          PROG_NAME=fgrep
 16.1542 -        else
 16.1543 -          PROG_NAME=
 16.1544 -        fi
 16.1545 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1546 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1547 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1548 -    fi
 16.1549 -
 16.1550 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 16.1551 +  if test "x$FGREP" = x; then
 16.1552 +    if test "x" = x; then
 16.1553 +      PROG_NAME=fgrep
 16.1554 +    else
 16.1555 +      PROG_NAME=
 16.1556 +    fi
 16.1557 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1558 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1559 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1560 +  fi
 16.1561 +
 16.1562 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 16.1563  $as_echo_n "checking for a sed that does not truncate output... " >&6; }
 16.1564  if ${ac_cv_path_SED+:} false; then :
 16.1565    $as_echo_n "(cached) " >&6
 16.1566 @@ -6332,19 +6332,19 @@
 16.1567    rm -f conftest.sed
 16.1568  
 16.1569  
 16.1570 -    if test "x$SED" = x; then
 16.1571 -        if test "x" = x; then
 16.1572 -          PROG_NAME=sed
 16.1573 -        else
 16.1574 -          PROG_NAME=
 16.1575 -        fi
 16.1576 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1577 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1578 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1579 -    fi
 16.1580 -
 16.1581 -
 16.1582 -for ac_prog in nawk gawk awk
 16.1583 +  if test "x$SED" = x; then
 16.1584 +    if test "x" = x; then
 16.1585 +      PROG_NAME=sed
 16.1586 +    else
 16.1587 +      PROG_NAME=
 16.1588 +    fi
 16.1589 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1590 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1591 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1592 +  fi
 16.1593 +
 16.1594 +
 16.1595 +  for ac_prog in nawk gawk awk
 16.1596  do
 16.1597    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.1598  set dummy $ac_prog; ac_word=$2
 16.1599 @@ -6390,27 +6390,27 @@
 16.1600  done
 16.1601  
 16.1602  
 16.1603 -    if test "x$NAWK" = x; then
 16.1604 -        if test "x" = x; then
 16.1605 -          PROG_NAME=nawk
 16.1606 -        else
 16.1607 -          PROG_NAME=
 16.1608 -        fi
 16.1609 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1610 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1611 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1612 -    fi
 16.1613 -
 16.1614 -
 16.1615 -# Always force rm.
 16.1616 -RM="$RM -f"
 16.1617 -
 16.1618 -# pwd behaves differently on various platforms and some don't support the -L flag.
 16.1619 -# Always use the bash builtin pwd to get uniform behavior.
 16.1620 -THEPWDCMD=pwd
 16.1621 -
 16.1622 -# These are not required on all platforms
 16.1623 -# Extract the first word of "cygpath", so it can be a program name with args.
 16.1624 +  if test "x$NAWK" = x; then
 16.1625 +    if test "x" = x; then
 16.1626 +      PROG_NAME=nawk
 16.1627 +    else
 16.1628 +      PROG_NAME=
 16.1629 +    fi
 16.1630 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.1631 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.1632 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.1633 +  fi
 16.1634 +
 16.1635 +
 16.1636 +  # Always force rm.
 16.1637 +  RM="$RM -f"
 16.1638 +
 16.1639 +  # pwd behaves differently on various platforms and some don't support the -L flag.
 16.1640 +  # Always use the bash builtin pwd to get uniform behavior.
 16.1641 +  THEPWDCMD=pwd
 16.1642 +
 16.1643 +  # These are not required on all platforms
 16.1644 +  # Extract the first word of "cygpath", so it can be a program name with args.
 16.1645  set dummy cygpath; ac_word=$2
 16.1646  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.1647  $as_echo_n "checking for $ac_word... " >&6; }
 16.1648 @@ -6450,7 +6450,7 @@
 16.1649  fi
 16.1650  
 16.1651  
 16.1652 -# Extract the first word of "readlink", so it can be a program name with args.
 16.1653 +  # Extract the first word of "readlink", so it can be a program name with args.
 16.1654  set dummy readlink; ac_word=$2
 16.1655  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.1656  $as_echo_n "checking for $ac_word... " >&6; }
 16.1657 @@ -6490,7 +6490,7 @@
 16.1658  fi
 16.1659  
 16.1660  
 16.1661 -# Extract the first word of "df", so it can be a program name with args.
 16.1662 +  # Extract the first word of "df", so it can be a program name with args.
 16.1663  set dummy df; ac_word=$2
 16.1664  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.1665  $as_echo_n "checking for $ac_word... " >&6; }
 16.1666 @@ -6530,7 +6530,7 @@
 16.1667  fi
 16.1668  
 16.1669  
 16.1670 -# Extract the first word of "SetFile", so it can be a program name with args.
 16.1671 +  # Extract the first word of "SetFile", so it can be a program name with args.
 16.1672  set dummy SetFile; ac_word=$2
 16.1673  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.1674  $as_echo_n "checking for $ac_word... " >&6; }
 16.1675 @@ -6685,26 +6685,26 @@
 16.1676      NONENONEs,x,x, &&
 16.1677    program_prefix=${target_alias}-
 16.1678  
 16.1679 -# Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
 16.1680 -# is confusing; it assumes you are cross-compiling a cross-compiler (!)  and "target" is thus the target of the
 16.1681 -# product you're building. The target of this build is called "host". Since this is confusing to most people, we
 16.1682 -# have not adopted that system, but use "target" as the platform we are building for. In some places though we need
 16.1683 -# to use the configure naming style.
 16.1684 -
 16.1685 -
 16.1686 -
 16.1687 -
 16.1688 -
 16.1689 -    # Copy the autoconf trip/quadruplet verbatim to OPENJDK_TARGET_AUTOCONF_NAME
 16.1690 -    # (from the autoconf "host") and OPENJDK_BUILD_AUTOCONF_NAME
 16.1691 -    # Note that we might later on rewrite e.g. OPENJDK_TARGET_CPU due to reduced build,
 16.1692 -    # but this will not change the value of OPENJDK_TARGET_AUTOCONF_NAME.
 16.1693 -    OPENJDK_TARGET_AUTOCONF_NAME="$host"
 16.1694 -    OPENJDK_BUILD_AUTOCONF_NAME="$build"
 16.1695 -
 16.1696 -
 16.1697 -
 16.1698 -    # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
 16.1699 +  # Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
 16.1700 +  # is confusing; it assumes you are cross-compiling a cross-compiler (!)  and "target" is thus the target of the
 16.1701 +  # product you're building. The target of this build is called "host". Since this is confusing to most people, we
 16.1702 +  # have not adopted that system, but use "target" as the platform we are building for. In some places though we need
 16.1703 +  # to use the configure naming style.
 16.1704 +
 16.1705 +
 16.1706 +
 16.1707 +
 16.1708 +
 16.1709 +  # Copy the autoconf trip/quadruplet verbatim to OPENJDK_TARGET_AUTOCONF_NAME
 16.1710 +  # (from the autoconf "host") and OPENJDK_BUILD_AUTOCONF_NAME
 16.1711 +  # Note that we might later on rewrite e.g. OPENJDK_TARGET_CPU due to reduced build,
 16.1712 +  # but this will not change the value of OPENJDK_TARGET_AUTOCONF_NAME.
 16.1713 +  OPENJDK_TARGET_AUTOCONF_NAME="$host"
 16.1714 +  OPENJDK_BUILD_AUTOCONF_NAME="$build"
 16.1715 +
 16.1716 +
 16.1717 +
 16.1718 +  # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
 16.1719  
 16.1720    case "$build_os" in
 16.1721      *linux*)
 16.1722 @@ -6768,63 +6768,63 @@
 16.1723        VAR_CPU_ARCH=ppc
 16.1724        VAR_CPU_BITS=32
 16.1725        VAR_CPU_ENDIAN=big
 16.1726 -       ;;
 16.1727 +      ;;
 16.1728      powerpc64)
 16.1729        VAR_CPU=ppc64
 16.1730        VAR_CPU_ARCH=ppc
 16.1731        VAR_CPU_BITS=64
 16.1732        VAR_CPU_ENDIAN=big
 16.1733 -       ;;
 16.1734 +      ;;
 16.1735      s390)
 16.1736        VAR_CPU=s390
 16.1737        VAR_CPU_ARCH=s390
 16.1738        VAR_CPU_BITS=32
 16.1739        VAR_CPU_ENDIAN=big
 16.1740 -       ;;
 16.1741 +      ;;
 16.1742      s390x)
 16.1743        VAR_CPU=s390x
 16.1744        VAR_CPU_ARCH=s390
 16.1745        VAR_CPU_BITS=64
 16.1746        VAR_CPU_ENDIAN=big
 16.1747 -       ;;
 16.1748 +      ;;
 16.1749      sparc)
 16.1750        VAR_CPU=sparc
 16.1751        VAR_CPU_ARCH=sparc
 16.1752        VAR_CPU_BITS=32
 16.1753        VAR_CPU_ENDIAN=big
 16.1754 -       ;;
 16.1755 +      ;;
 16.1756      sparcv9)
 16.1757        VAR_CPU=sparcv9
 16.1758        VAR_CPU_ARCH=sparc
 16.1759        VAR_CPU_BITS=64
 16.1760        VAR_CPU_ENDIAN=big
 16.1761 -       ;;
 16.1762 +      ;;
 16.1763      *)
 16.1764        as_fn_error $? "unsupported cpu $build_cpu" "$LINENO" 5
 16.1765        ;;
 16.1766    esac
 16.1767  
 16.1768 -    # ..and setup our own variables. (Do this explicitely to facilitate searching)
 16.1769 -    OPENJDK_BUILD_OS="$VAR_OS"
 16.1770 -    OPENJDK_BUILD_OS_API="$VAR_OS_API"
 16.1771 -    OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
 16.1772 -    OPENJDK_BUILD_CPU="$VAR_CPU"
 16.1773 -    OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
 16.1774 -    OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
 16.1775 -    OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
 16.1776 -
 16.1777 -
 16.1778 -
 16.1779 -
 16.1780 -
 16.1781 -
 16.1782 -
 16.1783 -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build os-cpu" >&5
 16.1784 +  # ..and setup our own variables. (Do this explicitely to facilitate searching)
 16.1785 +  OPENJDK_BUILD_OS="$VAR_OS"
 16.1786 +  OPENJDK_BUILD_OS_API="$VAR_OS_API"
 16.1787 +  OPENJDK_BUILD_OS_ENV="$VAR_OS_ENV"
 16.1788 +  OPENJDK_BUILD_CPU="$VAR_CPU"
 16.1789 +  OPENJDK_BUILD_CPU_ARCH="$VAR_CPU_ARCH"
 16.1790 +  OPENJDK_BUILD_CPU_BITS="$VAR_CPU_BITS"
 16.1791 +  OPENJDK_BUILD_CPU_ENDIAN="$VAR_CPU_ENDIAN"
 16.1792 +
 16.1793 +
 16.1794 +
 16.1795 +
 16.1796 +
 16.1797 +
 16.1798 +
 16.1799 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-build os-cpu" >&5
 16.1800  $as_echo_n "checking openjdk-build os-cpu... " >&6; }
 16.1801 -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&5
 16.1802 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&5
 16.1803  $as_echo "$OPENJDK_BUILD_OS-$OPENJDK_BUILD_CPU" >&6; }
 16.1804  
 16.1805 -    # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
 16.1806 +  # Convert the autoconf OS/CPU value to our own data, into the VAR_OS/CPU variables.
 16.1807  
 16.1808    case "$host_os" in
 16.1809      *linux*)
 16.1810 @@ -6888,60 +6888,60 @@
 16.1811        VAR_CPU_ARCH=ppc
 16.1812        VAR_CPU_BITS=32
 16.1813        VAR_CPU_ENDIAN=big
 16.1814 -       ;;
 16.1815 +      ;;
 16.1816      powerpc64)
 16.1817        VAR_CPU=ppc64
 16.1818        VAR_CPU_ARCH=ppc
 16.1819        VAR_CPU_BITS=64
 16.1820        VAR_CPU_ENDIAN=big
 16.1821 -       ;;
 16.1822 +      ;;
 16.1823      s390)
 16.1824        VAR_CPU=s390
 16.1825        VAR_CPU_ARCH=s390
 16.1826        VAR_CPU_BITS=32
 16.1827        VAR_CPU_ENDIAN=big
 16.1828 -       ;;
 16.1829 +      ;;
 16.1830      s390x)
 16.1831        VAR_CPU=s390x
 16.1832        VAR_CPU_ARCH=s390
 16.1833        VAR_CPU_BITS=64
 16.1834        VAR_CPU_ENDIAN=big
 16.1835 -       ;;
 16.1836 +      ;;
 16.1837      sparc)
 16.1838        VAR_CPU=sparc
 16.1839        VAR_CPU_ARCH=sparc
 16.1840        VAR_CPU_BITS=32
 16.1841        VAR_CPU_ENDIAN=big
 16.1842 -       ;;
 16.1843 +      ;;
 16.1844      sparcv9)
 16.1845        VAR_CPU=sparcv9
 16.1846        VAR_CPU_ARCH=sparc
 16.1847        VAR_CPU_BITS=64
 16.1848        VAR_CPU_ENDIAN=big
 16.1849 -       ;;
 16.1850 +      ;;
 16.1851      *)
 16.1852        as_fn_error $? "unsupported cpu $host_cpu" "$LINENO" 5
 16.1853        ;;
 16.1854    esac
 16.1855  
 16.1856 -    # ... and setup our own variables. (Do this explicitely to facilitate searching)
 16.1857 -    OPENJDK_TARGET_OS="$VAR_OS"
 16.1858 -    OPENJDK_TARGET_OS_API="$VAR_OS_API"
 16.1859 -    OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
 16.1860 -    OPENJDK_TARGET_CPU="$VAR_CPU"
 16.1861 -    OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
 16.1862 -    OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
 16.1863 -    OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
 16.1864 -
 16.1865 -
 16.1866 -
 16.1867 -
 16.1868 -
 16.1869 -
 16.1870 -
 16.1871 -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5
 16.1872 +  # ... and setup our own variables. (Do this explicitely to facilitate searching)
 16.1873 +  OPENJDK_TARGET_OS="$VAR_OS"
 16.1874 +  OPENJDK_TARGET_OS_API="$VAR_OS_API"
 16.1875 +  OPENJDK_TARGET_OS_ENV="$VAR_OS_ENV"
 16.1876 +  OPENJDK_TARGET_CPU="$VAR_CPU"
 16.1877 +  OPENJDK_TARGET_CPU_ARCH="$VAR_CPU_ARCH"
 16.1878 +  OPENJDK_TARGET_CPU_BITS="$VAR_CPU_BITS"
 16.1879 +  OPENJDK_TARGET_CPU_ENDIAN="$VAR_CPU_ENDIAN"
 16.1880 +
 16.1881 +
 16.1882 +
 16.1883 +
 16.1884 +
 16.1885 +
 16.1886 +
 16.1887 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking openjdk-target os-cpu" >&5
 16.1888  $as_echo_n "checking openjdk-target os-cpu... " >&6; }
 16.1889 -    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5
 16.1890 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&5
 16.1891  $as_echo "$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" >&6; }
 16.1892  
 16.1893  
 16.1894 @@ -6991,168 +6991,167 @@
 16.1895    fi
 16.1896  
 16.1897  
 16.1898 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compilation type" >&5
 16.1899 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking compilation type" >&5
 16.1900  $as_echo_n "checking compilation type... " >&6; }
 16.1901 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_TYPE" >&5
 16.1902 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPILE_TYPE" >&5
 16.1903  $as_echo "$COMPILE_TYPE" >&6; }
 16.1904  
 16.1905  
 16.1906 -    if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
 16.1907 -       REQUIRED_OS_NAME=SunOS
 16.1908 -       REQUIRED_OS_VERSION=5.10
 16.1909 -    fi
 16.1910 -    if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
 16.1911 -       REQUIRED_OS_NAME=Linux
 16.1912 -       REQUIRED_OS_VERSION=2.6
 16.1913 -    fi
 16.1914 -    if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
 16.1915 -        REQUIRED_OS_NAME=Windows
 16.1916 -        if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
 16.1917 -            REQUIRED_OS_VERSION=5.2
 16.1918 -        else
 16.1919 -            REQUIRED_OS_VERSION=5.1
 16.1920 -        fi
 16.1921 -    fi
 16.1922 -    if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
 16.1923 -        REQUIRED_OS_NAME=Darwin
 16.1924 -        REQUIRED_OS_VERSION=11.2
 16.1925 -    fi
 16.1926 -
 16.1927 -
 16.1928 -
 16.1929 -
 16.1930 -
 16.1931 -    # Also store the legacy naming of the cpu.
 16.1932 -    # Ie i586 and amd64 instead of x86 and x86_64
 16.1933 -    OPENJDK_TARGET_CPU_LEGACY="$OPENJDK_TARGET_CPU"
 16.1934 -    if test "x$OPENJDK_TARGET_CPU" = xx86; then
 16.1935 -      OPENJDK_TARGET_CPU_LEGACY="i586"
 16.1936 -    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
 16.1937 -      # On all platforms except MacOSX replace x86_64 with amd64.
 16.1938 -      OPENJDK_TARGET_CPU_LEGACY="amd64"
 16.1939 -    fi
 16.1940 -
 16.1941 -
 16.1942 -    # And the second legacy naming of the cpu.
 16.1943 -    # Ie i386 and amd64 instead of x86 and x86_64.
 16.1944 -    OPENJDK_TARGET_CPU_LEGACY_LIB="$OPENJDK_TARGET_CPU"
 16.1945 -    if test "x$OPENJDK_TARGET_CPU" = xx86; then
 16.1946 -      OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
 16.1947 -    elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
 16.1948 -      OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
 16.1949 -    fi
 16.1950 -
 16.1951 -
 16.1952 -    # This is the name of the cpu (but using i386 and amd64 instead of
 16.1953 -    # x86 and x86_64, respectively), preceeded by a /, to be used when
 16.1954 -    # locating libraries. On macosx, it's empty, though.
 16.1955 -    OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB"
 16.1956 -    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
 16.1957 -        OPENJDK_TARGET_CPU_LIBDIR=""
 16.1958 -    fi
 16.1959 -
 16.1960 -
 16.1961 -    # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
 16.1962 -    # /amd64 or /sparcv9. This string is appended to some library paths, like this:
 16.1963 -    # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so
 16.1964 -    OPENJDK_TARGET_CPU_ISADIR=""
 16.1965 -    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 16.1966 -      if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
 16.1967 -          OPENJDK_TARGET_CPU_ISADIR="/amd64"
 16.1968 -      elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
 16.1969 -          OPENJDK_TARGET_CPU_ISADIR="/sparcv9"
 16.1970 -      fi
 16.1971 -    fi
 16.1972 -
 16.1973 -
 16.1974 -    # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
 16.1975 -    OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
 16.1976 -    if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then
 16.1977 -      # On linux only, we replace x86 with i386.
 16.1978 -      OPENJDK_TARGET_CPU_OSARCH="i386"
 16.1979 -    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
 16.1980 -      # On all platforms except macosx, we replace x86_64 with amd64.
 16.1981 -      OPENJDK_TARGET_CPU_OSARCH="amd64"
 16.1982 -    fi
 16.1983 -
 16.1984 -
 16.1985 -    OPENJDK_TARGET_CPU_JLI="$OPENJDK_TARGET_CPU"
 16.1986 -    if test "x$OPENJDK_TARGET_CPU" = xx86; then
 16.1987 -      OPENJDK_TARGET_CPU_JLI="i386"
 16.1988 -    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
 16.1989 -      # On all platforms except macosx, we replace x86_64 with amd64.
 16.1990 -      OPENJDK_TARGET_CPU_JLI="amd64"
 16.1991 -    fi
 16.1992 -    # Now setup the -D flags for building libjli.
 16.1993 -    OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
 16.1994 -    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 16.1995 -      if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
 16.1996 -        OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
 16.1997 -      elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
 16.1998 -        OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
 16.1999 -      fi
 16.2000 -    fi
 16.2001 -
 16.2002 -
 16.2003 -    # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
 16.2004 -    if test "x$OPENJDK_TARGET_OS_API" = xposix; then
 16.2005 -        OPENJDK_TARGET_OS_API_DIR="solaris"
 16.2006 -    fi
 16.2007 -    if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
 16.2008 -        OPENJDK_TARGET_OS_API_DIR="windows"
 16.2009 -    fi
 16.2010 -
 16.2011 -
 16.2012 -    if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 16.2013 -        A_LP64="LP64:="
 16.2014 -        # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
 16.2015 -        # unpack200.exe
 16.2016 -        if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
 16.2017 -            ADD_LP64="-D_LP64=1"
 16.2018 -        fi
 16.2019 -    fi
 16.2020 -    LP64=$A_LP64
 16.2021 -
 16.2022 -
 16.2023 -    if test "x$COMPILE_TYPE" = "xcross"; then
 16.2024 -      # FIXME: ... or should this include reduced builds..?
 16.2025 -      DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY"
 16.2026 -    else
 16.2027 -      DEFINE_CROSS_COMPILE_ARCH=""
 16.2028 -    fi
 16.2029 -
 16.2030 -
 16.2031 -    # ZERO_ARCHDEF is used to enable architecture-specific code
 16.2032 -    case "${OPENJDK_TARGET_CPU}" in
 16.2033 -      ppc*)    ZERO_ARCHDEF=PPC   ;;
 16.2034 -      s390*)   ZERO_ARCHDEF=S390  ;;
 16.2035 -      sparc*)  ZERO_ARCHDEF=SPARC ;;
 16.2036 -      x86_64*) ZERO_ARCHDEF=AMD64 ;;
 16.2037 -      x86)     ZERO_ARCHDEF=IA32  ;;
 16.2038 -      *)      ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
 16.2039 -    esac
 16.2040 -
 16.2041 +  if test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
 16.2042 +    REQUIRED_OS_NAME=SunOS
 16.2043 +    REQUIRED_OS_VERSION=5.10
 16.2044 +  fi
 16.2045 +  if test "x$OPENJDK_TARGET_OS" = "xlinux"; then
 16.2046 +    REQUIRED_OS_NAME=Linux
 16.2047 +    REQUIRED_OS_VERSION=2.6
 16.2048 +  fi
 16.2049 +  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
 16.2050 +    REQUIRED_OS_NAME=Windows
 16.2051 +    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
 16.2052 +      REQUIRED_OS_VERSION=5.2
 16.2053 +    else
 16.2054 +      REQUIRED_OS_VERSION=5.1
 16.2055 +    fi
 16.2056 +  fi
 16.2057 +  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
 16.2058 +    REQUIRED_OS_NAME=Darwin
 16.2059 +    REQUIRED_OS_VERSION=11.2
 16.2060 +  fi
 16.2061 +
 16.2062 +
 16.2063 +
 16.2064 +
 16.2065 +
 16.2066 +  # Also store the legacy naming of the cpu.
 16.2067 +  # Ie i586 and amd64 instead of x86 and x86_64
 16.2068 +  OPENJDK_TARGET_CPU_LEGACY="$OPENJDK_TARGET_CPU"
 16.2069 +  if test "x$OPENJDK_TARGET_CPU" = xx86; then
 16.2070 +    OPENJDK_TARGET_CPU_LEGACY="i586"
 16.2071 +  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
 16.2072 +    # On all platforms except MacOSX replace x86_64 with amd64.
 16.2073 +    OPENJDK_TARGET_CPU_LEGACY="amd64"
 16.2074 +  fi
 16.2075 +
 16.2076 +
 16.2077 +  # And the second legacy naming of the cpu.
 16.2078 +  # Ie i386 and amd64 instead of x86 and x86_64.
 16.2079 +  OPENJDK_TARGET_CPU_LEGACY_LIB="$OPENJDK_TARGET_CPU"
 16.2080 +  if test "x$OPENJDK_TARGET_CPU" = xx86; then
 16.2081 +    OPENJDK_TARGET_CPU_LEGACY_LIB="i386"
 16.2082 +  elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
 16.2083 +    OPENJDK_TARGET_CPU_LEGACY_LIB="amd64"
 16.2084 +  fi
 16.2085 +
 16.2086 +
 16.2087 +  # This is the name of the cpu (but using i386 and amd64 instead of
 16.2088 +  # x86 and x86_64, respectively), preceeded by a /, to be used when
 16.2089 +  # locating libraries. On macosx, it's empty, though.
 16.2090 +  OPENJDK_TARGET_CPU_LIBDIR="/$OPENJDK_TARGET_CPU_LEGACY_LIB"
 16.2091 +  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
 16.2092 +    OPENJDK_TARGET_CPU_LIBDIR=""
 16.2093 +  fi
 16.2094 +
 16.2095 +
 16.2096 +  # OPENJDK_TARGET_CPU_ISADIR is normally empty. On 64-bit Solaris systems, it is set to
 16.2097 +  # /amd64 or /sparcv9. This string is appended to some library paths, like this:
 16.2098 +  # /usr/lib${OPENJDK_TARGET_CPU_ISADIR}/libexample.so
 16.2099 +  OPENJDK_TARGET_CPU_ISADIR=""
 16.2100 +  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 16.2101 +    if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
 16.2102 +      OPENJDK_TARGET_CPU_ISADIR="/amd64"
 16.2103 +    elif test "x$OPENJDK_TARGET_CPU" = xsparcv9; then
 16.2104 +      OPENJDK_TARGET_CPU_ISADIR="/sparcv9"
 16.2105 +    fi
 16.2106 +  fi
 16.2107 +
 16.2108 +
 16.2109 +  # Setup OPENJDK_TARGET_CPU_OSARCH, which is used to set the os.arch Java system property
 16.2110 +  OPENJDK_TARGET_CPU_OSARCH="$OPENJDK_TARGET_CPU"
 16.2111 +  if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xx86; then
 16.2112 +    # On linux only, we replace x86 with i386.
 16.2113 +    OPENJDK_TARGET_CPU_OSARCH="i386"
 16.2114 +  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
 16.2115 +    # On all platforms except macosx, we replace x86_64 with amd64.
 16.2116 +    OPENJDK_TARGET_CPU_OSARCH="amd64"
 16.2117 +  fi
 16.2118 +
 16.2119 +
 16.2120 +  OPENJDK_TARGET_CPU_JLI="$OPENJDK_TARGET_CPU"
 16.2121 +  if test "x$OPENJDK_TARGET_CPU" = xx86; then
 16.2122 +    OPENJDK_TARGET_CPU_JLI="i386"
 16.2123 +  elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
 16.2124 +    # On all platforms except macosx, we replace x86_64 with amd64.
 16.2125 +    OPENJDK_TARGET_CPU_JLI="amd64"
 16.2126 +  fi
 16.2127 +  # Now setup the -D flags for building libjli.
 16.2128 +  OPENJDK_TARGET_CPU_JLI_CFLAGS="-DLIBARCHNAME='\"$OPENJDK_TARGET_CPU_JLI\"'"
 16.2129 +  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 16.2130 +    if test "x$OPENJDK_TARGET_CPU_ARCH" = xsparc; then
 16.2131 +      OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"sparc\"' -DLIBARCH64NAME='\"sparcv9\"'"
 16.2132 +    elif test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
 16.2133 +      OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
 16.2134 +    fi
 16.2135 +  fi
 16.2136 +
 16.2137 +
 16.2138 +  # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
 16.2139 +  if test "x$OPENJDK_TARGET_OS_API" = xposix; then
 16.2140 +    OPENJDK_TARGET_OS_API_DIR="solaris"
 16.2141 +  fi
 16.2142 +  if test "x$OPENJDK_TARGET_OS_API" = xwinapi; then
 16.2143 +    OPENJDK_TARGET_OS_API_DIR="windows"
 16.2144 +  fi
 16.2145 +
 16.2146 +
 16.2147 +  if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 16.2148 +    A_LP64="LP64:="
 16.2149 +    # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
 16.2150 +    # unpack200.exe
 16.2151 +    if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xmacosx; then
 16.2152 +      ADD_LP64="-D_LP64=1"
 16.2153 +    fi
 16.2154 +  fi
 16.2155 +  LP64=$A_LP64
 16.2156 +
 16.2157 +
 16.2158 +  if test "x$COMPILE_TYPE" = "xcross"; then
 16.2159 +    # FIXME: ... or should this include reduced builds..?
 16.2160 +    DEFINE_CROSS_COMPILE_ARCH="CROSS_COMPILE_ARCH:=$OPENJDK_TARGET_CPU_LEGACY"
 16.2161 +  else
 16.2162 +    DEFINE_CROSS_COMPILE_ARCH=""
 16.2163 +  fi
 16.2164 +
 16.2165 +
 16.2166 +  # ZERO_ARCHDEF is used to enable architecture-specific code
 16.2167 +  case "${OPENJDK_TARGET_CPU}" in
 16.2168 +    ppc*)    ZERO_ARCHDEF=PPC   ;;
 16.2169 +    s390*)   ZERO_ARCHDEF=S390  ;;
 16.2170 +    sparc*)  ZERO_ARCHDEF=SPARC ;;
 16.2171 +    x86_64*) ZERO_ARCHDEF=AMD64 ;;
 16.2172 +    x86)     ZERO_ARCHDEF=IA32  ;;
 16.2173 +    *)      ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
 16.2174 +  esac
 16.2175  
 16.2176  
 16.2177  
 16.2178  
 16.2179  # Continue setting up basic stuff. Most remaining code require fundamental tools.
 16.2180  
 16.2181 -# Locate the directory of this script.
 16.2182 -SCRIPT="$0"
 16.2183 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
 16.2184 -
 16.2185 -# Where is the source? It is located two levels above the configure script.
 16.2186 -CURDIR="$PWD"
 16.2187 -cd "$AUTOCONF_DIR/../.."
 16.2188 -SRC_ROOT="`$THEPWDCMD -L`"
 16.2189 -
 16.2190 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
 16.2191 -  PATH_SEP=";"
 16.2192 +  # Locate the directory of this script.
 16.2193 +  SCRIPT="$0"
 16.2194 +  AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
 16.2195 +
 16.2196 +  # Where is the source? It is located two levels above the configure script.
 16.2197 +  CURDIR="$PWD"
 16.2198 +  cd "$AUTOCONF_DIR/../.."
 16.2199 +  SRC_ROOT="`$THEPWDCMD -L`"
 16.2200 +
 16.2201 +  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
 16.2202 +    PATH_SEP=";"
 16.2203  
 16.2204    SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
 16.2205    if test $SRC_ROOT_LENGTH -gt 100; then
 16.2206 -      as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
 16.2207 +    as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
 16.2208    fi
 16.2209  
 16.2210    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 16.2211 @@ -7171,7 +7170,7 @@
 16.2212        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.2213      fi
 16.2214      if test "x$CYGPATH" = x; then
 16.2215 -        as_fn_error $? "Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path" "$LINENO" 5
 16.2216 +      as_fn_error $? "Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path" "$LINENO" 5
 16.2217      fi
 16.2218      { $as_echo "$as_me:${as_lineno-$LINENO}: checking cygwin root directory as unix-style path" >&5
 16.2219  $as_echo_n "checking cygwin root directory as unix-style path... " >&6; }
 16.2220 @@ -7184,7 +7183,7 @@
 16.2221      WINDOWS_ENV_ROOT_PATH="$CYGWIN_ROOT_PATH"
 16.2222      test_cygdrive_prefix=`$ECHO $CYGWIN_ROOT_PATH | $GREP ^/cygdrive/`
 16.2223      if test "x$test_cygdrive_prefix" = x; then
 16.2224 -        as_fn_error $? "Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c." "$LINENO" 5
 16.2225 +      as_fn_error $? "Your cygdrive prefix is not /cygdrive. This is currently not supported. Change with mount -c." "$LINENO" 5
 16.2226      fi
 16.2227    elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
 16.2228      { $as_echo "$as_me:${as_lineno-$LINENO}: checking msys release" >&5
 16.2229 @@ -7239,13 +7238,13 @@
 16.2230  $as_echo "$as_me: WARNING: It seems that your find utility is non-standard." >&2;}
 16.2231    fi
 16.2232  
 16.2233 -else
 16.2234 -  PATH_SEP=":"
 16.2235 -fi
 16.2236 -
 16.2237 -
 16.2238 -
 16.2239 -cd "$CURDIR"
 16.2240 +  else
 16.2241 +    PATH_SEP=":"
 16.2242 +  fi
 16.2243 +
 16.2244 +
 16.2245 +
 16.2246 +  cd "$CURDIR"
 16.2247  
 16.2248  
 16.2249    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 16.2250 @@ -7492,13 +7491,13 @@
 16.2251    fi
 16.2252  
 16.2253  
 16.2254 -if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
 16.2255 +  if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
 16.2256      # Add extra search paths on solaris for utilities like ar and as etc...
 16.2257      PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
 16.2258 -fi
 16.2259 -
 16.2260 -# You can force the sys-root if the sys-root encoded into the cross compiler tools
 16.2261 -# is not correct.
 16.2262 +  fi
 16.2263 +
 16.2264 +  # You can force the sys-root if the sys-root encoded into the cross compiler tools
 16.2265 +  # is not correct.
 16.2266  
 16.2267  # Check whether --with-sys-root was given.
 16.2268  if test "${with_sys_root+set}" = set; then :
 16.2269 @@ -7506,11 +7505,11 @@
 16.2270  fi
 16.2271  
 16.2272  
 16.2273 -if test "x$with_sys_root" != x; then
 16.2274 -  SYS_ROOT=$with_sys_root
 16.2275 -else
 16.2276 -  SYS_ROOT=/
 16.2277 -fi
 16.2278 +  if test "x$with_sys_root" != x; then
 16.2279 +    SYS_ROOT=$with_sys_root
 16.2280 +  else
 16.2281 +    SYS_ROOT=/
 16.2282 +  fi
 16.2283  
 16.2284  
 16.2285  
 16.2286 @@ -7525,9 +7524,9 @@
 16.2287  # Check whether --with-devkit was given.
 16.2288  if test "${with_devkit+set}" = set; then :
 16.2289    withval=$with_devkit;
 16.2290 -    if test "x$with_sys_root" != x; then
 16.2291 -      as_fn_error $? "Cannot specify both --with-devkit and --with-sys-root at the same time" "$LINENO" 5
 16.2292 -    fi
 16.2293 +        if test "x$with_sys_root" != x; then
 16.2294 +          as_fn_error $? "Cannot specify both --with-devkit and --with-sys-root at the same time" "$LINENO" 5
 16.2295 +        fi
 16.2296  
 16.2297    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 16.2298  
 16.2299 @@ -7657,20 +7656,20 @@
 16.2300      TOOLS_DIR="$TOOLS_DIR:$with_devkit/bin"
 16.2301    fi
 16.2302  
 16.2303 -    if test -d "$with_devkit/$host_alias/libc"; then
 16.2304 -      SYS_ROOT=$with_devkit/$host_alias/libc
 16.2305 -    elif test -d "$with_devkit/$host/sys-root"; then
 16.2306 -      SYS_ROOT=$with_devkit/$host/sys-root
 16.2307 -    fi
 16.2308 -
 16.2309 -fi
 16.2310 -
 16.2311 -
 16.2312 -
 16.2313 -# Setup default logging of stdout and stderr to build.log in the output root.
 16.2314 -BUILD_LOG='$(OUTPUT_ROOT)/build.log'
 16.2315 -BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
 16.2316 -BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
 16.2317 +        if test -d "$with_devkit/$host_alias/libc"; then
 16.2318 +          SYS_ROOT=$with_devkit/$host_alias/libc
 16.2319 +        elif test -d "$with_devkit/$host/sys-root"; then
 16.2320 +          SYS_ROOT=$with_devkit/$host/sys-root
 16.2321 +        fi
 16.2322 +
 16.2323 +fi
 16.2324 +
 16.2325 +
 16.2326 +
 16.2327 +  # Setup default logging of stdout and stderr to build.log in the output root.
 16.2328 +  BUILD_LOG='$(OUTPUT_ROOT)/build.log'
 16.2329 +  BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
 16.2330 +  BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
 16.2331  
 16.2332  
 16.2333  
 16.2334 @@ -7725,18 +7724,18 @@
 16.2335  
 16.2336  # These are needed to be able to create a configuration name (and thus the output directory)
 16.2337  
 16.2338 -###############################################################################
 16.2339 -#
 16.2340 -# Check which variant of the JDK that we want to build.
 16.2341 -# Currently we have:
 16.2342 -#    normal:   standard edition
 16.2343 -# but the custom make system may add other variants
 16.2344 -#
 16.2345 -# Effectively the JDK variant gives a name to a specific set of
 16.2346 -# modules to compile into the JDK. In the future, these modules
 16.2347 -# might even be Jigsaw modules.
 16.2348 -#
 16.2349 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of the JDK to build" >&5
 16.2350 +  ###############################################################################
 16.2351 +  #
 16.2352 +  # Check which variant of the JDK that we want to build.
 16.2353 +  # Currently we have:
 16.2354 +  #    normal:   standard edition
 16.2355 +  # but the custom make system may add other variants
 16.2356 +  #
 16.2357 +  # Effectively the JDK variant gives a name to a specific set of
 16.2358 +  # modules to compile into the JDK. In the future, these modules
 16.2359 +  # might even be Jigsaw modules.
 16.2360 +  #
 16.2361 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of the JDK to build" >&5
 16.2362  $as_echo_n "checking which variant of the JDK to build... " >&6; }
 16.2363  
 16.2364  # Check whether --with-jdk-variant was given.
 16.2365 @@ -7745,31 +7744,31 @@
 16.2366  fi
 16.2367  
 16.2368  
 16.2369 -if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
 16.2370 +  if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
 16.2371      JDK_VARIANT="normal"
 16.2372 -else
 16.2373 +  else
 16.2374      as_fn_error $? "The available JDK variants are: normal" "$LINENO" 5
 16.2375 -fi
 16.2376 -
 16.2377 -
 16.2378 -
 16.2379 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JDK_VARIANT" >&5
 16.2380 +  fi
 16.2381 +
 16.2382 +
 16.2383 +
 16.2384 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JDK_VARIANT" >&5
 16.2385  $as_echo "$JDK_VARIANT" >&6; }
 16.2386  
 16.2387  
 16.2388  
 16.2389 -###############################################################################
 16.2390 -#
 16.2391 -# Check which variants of the JVM that we want to build.
 16.2392 -# Currently we have:
 16.2393 -#    server: normal interpreter and a tiered C1/C2 compiler
 16.2394 -#    client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
 16.2395 -#    minimal1: reduced form of client with optional VM services and features stripped out
 16.2396 -#    kernel: kernel footprint JVM that passes the TCK without major performance problems,
 16.2397 -#             ie normal interpreter and C1, only the serial GC, kernel jvmti etc
 16.2398 -#    zero: no machine code interpreter, no compiler
 16.2399 -#    zeroshark: zero interpreter and shark/llvm compiler backend
 16.2400 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which variants of the JVM to build" >&5
 16.2401 +  ###############################################################################
 16.2402 +  #
 16.2403 +  # Check which variants of the JVM that we want to build.
 16.2404 +  # Currently we have:
 16.2405 +  #    server: normal interpreter and a tiered C1/C2 compiler
 16.2406 +  #    client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms)
 16.2407 +  #    minimal1: reduced form of client with optional VM services and features stripped out
 16.2408 +  #    kernel: kernel footprint JVM that passes the TCK without major performance problems,
 16.2409 +  #             ie normal interpreter and C1, only the serial GC, kernel jvmti etc
 16.2410 +  #    zero: no machine code interpreter, no compiler
 16.2411 +  #    zeroshark: zero interpreter and shark/llvm compiler backend
 16.2412 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variants of the JVM to build" >&5
 16.2413  $as_echo_n "checking which variants of the JVM to build... " >&6; }
 16.2414  
 16.2415  # Check whether --with-jvm-variants was given.
 16.2416 @@ -7778,87 +7777,86 @@
 16.2417  fi
 16.2418  
 16.2419  
 16.2420 -if test "x$with_jvm_variants" = x; then
 16.2421 -     with_jvm_variants="server"
 16.2422 -fi
 16.2423 -
 16.2424 -JVM_VARIANTS=",$with_jvm_variants,"
 16.2425 -TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//'  -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'`
 16.2426 -
 16.2427 -if test "x$TEST_VARIANTS" != "x,"; then
 16.2428 -   as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark" "$LINENO" 5
 16.2429 -fi
 16.2430 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_variants" >&5
 16.2431 +  if test "x$with_jvm_variants" = x; then
 16.2432 +    with_jvm_variants="server"
 16.2433 +  fi
 16.2434 +
 16.2435 +  JVM_VARIANTS=",$with_jvm_variants,"
 16.2436 +  TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//'  -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'`
 16.2437 +
 16.2438 +  if test "x$TEST_VARIANTS" != "x,"; then
 16.2439 +    as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark" "$LINENO" 5
 16.2440 +  fi
 16.2441 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_variants" >&5
 16.2442  $as_echo "$with_jvm_variants" >&6; }
 16.2443  
 16.2444 -JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
 16.2445 -JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
 16.2446 -JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
 16.2447 -JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
 16.2448 -JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
 16.2449 -JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
 16.2450 -
 16.2451 -if test "x$JVM_VARIANT_CLIENT" = xtrue; then
 16.2452 +  JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'`
 16.2453 +  JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'`
 16.2454 +  JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'`
 16.2455 +  JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'`
 16.2456 +  JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'`
 16.2457 +  JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
 16.2458 +
 16.2459 +  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
 16.2460      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 16.2461 -        as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5
 16.2462 -    fi
 16.2463 -fi
 16.2464 -if test "x$JVM_VARIANT_KERNEL" = xtrue; then
 16.2465 +      as_fn_error $? "You cannot build a client JVM for a 64-bit machine." "$LINENO" 5
 16.2466 +    fi
 16.2467 +  fi
 16.2468 +  if test "x$JVM_VARIANT_KERNEL" = xtrue; then
 16.2469      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 16.2470 -        as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5
 16.2471 -    fi
 16.2472 -fi
 16.2473 -if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
 16.2474 +      as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5
 16.2475 +    fi
 16.2476 +  fi
 16.2477 +  if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
 16.2478      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 16.2479 -        as_fn_error $? "You cannot build a minimal JVM for a 64-bit machine." "$LINENO" 5
 16.2480 -    fi
 16.2481 -fi
 16.2482 -
 16.2483 -# Replace the commas with AND for use in the build directory name.
 16.2484 -ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
 16.2485 -COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'`
 16.2486 -if test "x$COUNT_VARIANTS" != "x,1"; then
 16.2487 +      as_fn_error $? "You cannot build a minimal JVM for a 64-bit machine." "$LINENO" 5
 16.2488 +    fi
 16.2489 +  fi
 16.2490 +
 16.2491 +  # Replace the commas with AND for use in the build directory name.
 16.2492 +  ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
 16.2493 +  COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'`
 16.2494 +  if test "x$COUNT_VARIANTS" != "x,1"; then
 16.2495      BUILDING_MULTIPLE_JVM_VARIANTS=yes
 16.2496 -else
 16.2497 +  else
 16.2498      BUILDING_MULTIPLE_JVM_VARIANTS=no
 16.2499 -fi
 16.2500 -
 16.2501 -
 16.2502 -
 16.2503 -
 16.2504 -
 16.2505 -
 16.2506 -
 16.2507 -
 16.2508 -
 16.2509 -INCLUDE_SA=true
 16.2510 -if test "x$JVM_VARIANT_ZERO" = xtrue ; then
 16.2511 +  fi
 16.2512 +
 16.2513 +
 16.2514 +
 16.2515 +
 16.2516 +
 16.2517 +
 16.2518 +
 16.2519 +
 16.2520 +
 16.2521 +  INCLUDE_SA=true
 16.2522 +  if test "x$JVM_VARIANT_ZERO" = xtrue ; then
 16.2523      INCLUDE_SA=false
 16.2524 -fi
 16.2525 -if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
 16.2526 +  fi
 16.2527 +  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
 16.2528      INCLUDE_SA=false
 16.2529 -fi
 16.2530 -
 16.2531 -
 16.2532 -if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
 16.2533 -   MACOSX_UNIVERSAL="true"
 16.2534 -fi
 16.2535 -
 16.2536 -
 16.2537 -
 16.2538 -
 16.2539 -
 16.2540 -###############################################################################
 16.2541 -#
 16.2542 -# Set the debug level
 16.2543 -#    release: no debug information, all optimizations, no asserts.
 16.2544 -#    fastdebug: debug information (-g), all optimizations, all asserts
 16.2545 -#    slowdebug: debug information (-g), no optimizations, all asserts
 16.2546 -#
 16.2547 -DEBUG_LEVEL="release"
 16.2548 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which debug level to use" >&5
 16.2549 +  fi
 16.2550 +
 16.2551 +
 16.2552 +  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
 16.2553 +    MACOSX_UNIVERSAL="true"
 16.2554 +  fi
 16.2555 +
 16.2556 +
 16.2557 +
 16.2558 +
 16.2559 +  ###############################################################################
 16.2560 +  #
 16.2561 +  # Set the debug level
 16.2562 +  #    release: no debug information, all optimizations, no asserts.
 16.2563 +  #    fastdebug: debug information (-g), all optimizations, all asserts
 16.2564 +  #    slowdebug: debug information (-g), no optimizations, all asserts
 16.2565 +  #
 16.2566 +  DEBUG_LEVEL="release"
 16.2567 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking which debug level to use" >&5
 16.2568  $as_echo_n "checking which debug level to use... " >&6; }
 16.2569 -# Check whether --enable-debug was given.
 16.2570 +  # Check whether --enable-debug was given.
 16.2571  if test "${enable_debug+set}" = set; then :
 16.2572    enableval=$enable_debug;
 16.2573          ENABLE_DEBUG="${enableval}"
 16.2574 @@ -7875,96 +7873,96 @@
 16.2575    withval=$with_debug_level;
 16.2576          DEBUG_LEVEL="${withval}"
 16.2577          if test "x$ENABLE_DEBUG" = xyes; then
 16.2578 -			as_fn_error $? "You cannot use both --enable-debug and --with-debug-level at the same time." "$LINENO" 5
 16.2579 -        fi
 16.2580 -
 16.2581 -fi
 16.2582 -
 16.2583 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG_LEVEL" >&5
 16.2584 +          as_fn_error $? "You cannot use both --enable-debug and --with-debug-level at the same time." "$LINENO" 5
 16.2585 +        fi
 16.2586 +
 16.2587 +fi
 16.2588 +
 16.2589 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG_LEVEL" >&5
 16.2590  $as_echo "$DEBUG_LEVEL" >&6; }
 16.2591  
 16.2592 -if test "x$DEBUG_LEVEL" != xrelease && \
 16.2593 -   test "x$DEBUG_LEVEL" != xfastdebug && \
 16.2594 -   test "x$DEBUG_LEVEL" != xslowdebug; then
 16.2595 -   as_fn_error $? "Allowed debug levels are: release, fastdebug and slowdebug" "$LINENO" 5
 16.2596 -fi
 16.2597 -
 16.2598 -
 16.2599 -###############################################################################
 16.2600 -#
 16.2601 -# Setup legacy vars/targets and new vars to deal with different debug levels.
 16.2602 -#
 16.2603 -
 16.2604 -case $DEBUG_LEVEL in
 16.2605 -      release )
 16.2606 -          VARIANT="OPT"
 16.2607 -          FASTDEBUG="false"
 16.2608 -          DEBUG_CLASSFILES="false"
 16.2609 -          BUILD_VARIANT_RELEASE=""
 16.2610 -          HOTSPOT_DEBUG_LEVEL="product"
 16.2611 -          HOTSPOT_EXPORT="product"
 16.2612 -           ;;
 16.2613 -      fastdebug )
 16.2614 -          VARIANT="DBG"
 16.2615 -          FASTDEBUG="true"
 16.2616 -          DEBUG_CLASSFILES="true"
 16.2617 -          BUILD_VARIANT_RELEASE="-fastdebug"
 16.2618 -          HOTSPOT_DEBUG_LEVEL="fastdebug"
 16.2619 -          HOTSPOT_EXPORT="fastdebug"
 16.2620 -           ;;
 16.2621 -      slowdebug )
 16.2622 -          VARIANT="DBG"
 16.2623 -          FASTDEBUG="false"
 16.2624 -          DEBUG_CLASSFILES="true"
 16.2625 -          BUILD_VARIANT_RELEASE="-debug"
 16.2626 -          HOTSPOT_DEBUG_LEVEL="jvmg"
 16.2627 -          HOTSPOT_EXPORT="debug"
 16.2628 -           ;;
 16.2629 -esac
 16.2630 -
 16.2631 -#####
 16.2632 -# Generate the legacy makefile targets for hotspot.
 16.2633 -# The hotspot api for selecting the build artifacts, really, needs to be improved.
 16.2634 -# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
 16.2635 -# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
 16.2636 -# But until then ...
 16.2637 -HOTSPOT_TARGET=""
 16.2638 -
 16.2639 -if test "x$JVM_VARIANT_SERVER" = xtrue; then
 16.2640 +  if test "x$DEBUG_LEVEL" != xrelease && \
 16.2641 +      test "x$DEBUG_LEVEL" != xfastdebug && \
 16.2642 +      test "x$DEBUG_LEVEL" != xslowdebug; then
 16.2643 +    as_fn_error $? "Allowed debug levels are: release, fastdebug and slowdebug" "$LINENO" 5
 16.2644 +  fi
 16.2645 +
 16.2646 +
 16.2647 +  ###############################################################################
 16.2648 +  #
 16.2649 +  # Setup legacy vars/targets and new vars to deal with different debug levels.
 16.2650 +  #
 16.2651 +
 16.2652 +  case $DEBUG_LEVEL in
 16.2653 +    release )
 16.2654 +      VARIANT="OPT"
 16.2655 +      FASTDEBUG="false"
 16.2656 +      DEBUG_CLASSFILES="false"
 16.2657 +      BUILD_VARIANT_RELEASE=""
 16.2658 +      HOTSPOT_DEBUG_LEVEL="product"
 16.2659 +      HOTSPOT_EXPORT="product"
 16.2660 +      ;;
 16.2661 +    fastdebug )
 16.2662 +      VARIANT="DBG"
 16.2663 +      FASTDEBUG="true"
 16.2664 +      DEBUG_CLASSFILES="true"
 16.2665 +      BUILD_VARIANT_RELEASE="-fastdebug"
 16.2666 +      HOTSPOT_DEBUG_LEVEL="fastdebug"
 16.2667 +      HOTSPOT_EXPORT="fastdebug"
 16.2668 +      ;;
 16.2669 +    slowdebug )
 16.2670 +      VARIANT="DBG"
 16.2671 +      FASTDEBUG="false"
 16.2672 +      DEBUG_CLASSFILES="true"
 16.2673 +      BUILD_VARIANT_RELEASE="-debug"
 16.2674 +      HOTSPOT_DEBUG_LEVEL="jvmg"
 16.2675 +      HOTSPOT_EXPORT="debug"
 16.2676 +      ;;
 16.2677 +  esac
 16.2678 +
 16.2679 +  #####
 16.2680 +  # Generate the legacy makefile targets for hotspot.
 16.2681 +  # The hotspot api for selecting the build artifacts, really, needs to be improved.
 16.2682 +  # JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
 16.2683 +  # determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
 16.2684 +  # But until then ...
 16.2685 +  HOTSPOT_TARGET=""
 16.2686 +
 16.2687 +  if test "x$JVM_VARIANT_SERVER" = xtrue; then
 16.2688      HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
 16.2689 -fi
 16.2690 -
 16.2691 -if test "x$JVM_VARIANT_CLIENT" = xtrue; then
 16.2692 +  fi
 16.2693 +
 16.2694 +  if test "x$JVM_VARIANT_CLIENT" = xtrue; then
 16.2695      HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
 16.2696 -fi
 16.2697 -
 16.2698 -if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
 16.2699 +  fi
 16.2700 +
 16.2701 +  if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
 16.2702      HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
 16.2703 -fi
 16.2704 -
 16.2705 -if test "x$JVM_VARIANT_KERNEL" = xtrue; then
 16.2706 +  fi
 16.2707 +
 16.2708 +  if test "x$JVM_VARIANT_KERNEL" = xtrue; then
 16.2709      HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
 16.2710 -fi
 16.2711 -
 16.2712 -if test "x$JVM_VARIANT_ZERO" = xtrue; then
 16.2713 +  fi
 16.2714 +
 16.2715 +  if test "x$JVM_VARIANT_ZERO" = xtrue; then
 16.2716      HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
 16.2717 -fi
 16.2718 -
 16.2719 -if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
 16.2720 +  fi
 16.2721 +
 16.2722 +  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
 16.2723      HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
 16.2724 -fi
 16.2725 -
 16.2726 -HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
 16.2727 -
 16.2728 -# On Macosx universal binaries are produced, but they only contain
 16.2729 -# 64 bit intel. This invalidates control of which jvms are built
 16.2730 -# from configure, but only server is valid anyway. Fix this
 16.2731 -# when hotspot makefiles are rewritten.
 16.2732 -if test "x$MACOSX_UNIVERSAL" = xtrue; then
 16.2733 +  fi
 16.2734 +
 16.2735 +  HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
 16.2736 +
 16.2737 +  # On Macosx universal binaries are produced, but they only contain
 16.2738 +  # 64 bit intel. This invalidates control of which jvms are built
 16.2739 +  # from configure, but only server is valid anyway. Fix this
 16.2740 +  # when hotspot makefiles are rewritten.
 16.2741 +  if test "x$MACOSX_UNIVERSAL" = xtrue; then
 16.2742      HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
 16.2743 -fi
 16.2744 -
 16.2745 -#####
 16.2746 +  fi
 16.2747 +
 16.2748 +  #####
 16.2749  
 16.2750  
 16.2751  
 16.2752 @@ -7987,27 +7985,27 @@
 16.2753  fi
 16.2754  
 16.2755  
 16.2756 -# Test from where we are running configure, in or outside of src root.
 16.2757 -if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
 16.2758 -        || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
 16.2759 -        || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
 16.2760 +  # Test from where we are running configure, in or outside of src root.
 16.2761 +  if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
 16.2762 +      || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
 16.2763 +      || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
 16.2764      # We are running configure from the src root.
 16.2765      # Create a default ./build/target-variant-debuglevel output root.
 16.2766      if test "x${CONF_NAME}" = x; then
 16.2767 -        CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
 16.2768 +      CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
 16.2769      fi
 16.2770      OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
 16.2771      $MKDIR -p "$OUTPUT_ROOT"
 16.2772      if test ! -d "$OUTPUT_ROOT"; then
 16.2773 -        as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
 16.2774 -    fi
 16.2775 -else
 16.2776 +      as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
 16.2777 +    fi
 16.2778 +  else
 16.2779      # We are running configure from outside of the src dir.
 16.2780      # Then use the current directory as output dir!
 16.2781      # If configuration is situated in normal build directory, just use the build
 16.2782      # directory name as configuration name, otherwise use the complete path.
 16.2783      if test "x${CONF_NAME}" = x; then
 16.2784 -        CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
 16.2785 +      CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
 16.2786      fi
 16.2787      OUTPUT_ROOT="$CURDIR"
 16.2788  
 16.2789 @@ -8021,7 +8019,7 @@
 16.2790        # Configure has already touched config.log and confdefs.h in the current dir when this check
 16.2791        # is performed.
 16.2792        filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \
 16.2793 -                                             | $TR -d '\n'`
 16.2794 +      | $TR -d '\n'`
 16.2795        if test "x$filtered_files" != x; then
 16.2796          { $as_echo "$as_me:${as_lineno-$LINENO}: Current directory is $CURDIR." >&5
 16.2797  $as_echo "$as_me: Current directory is $CURDIR." >&6;}
 16.2798 @@ -8040,10 +8038,10 @@
 16.2799          as_fn_error $? "Will not continue creating configuration in $CURDIR" "$LINENO" 5
 16.2800        fi
 16.2801      fi
 16.2802 -fi
 16.2803 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5
 16.2804 +  fi
 16.2805 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking what configuration name to use" >&5
 16.2806  $as_echo_n "checking what configuration name to use... " >&6; }
 16.2807 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_NAME" >&5
 16.2808 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_NAME" >&5
 16.2809  $as_echo "$CONF_NAME" >&6; }
 16.2810  
 16.2811  
 16.2812 @@ -8169,44 +8167,44 @@
 16.2813    fi
 16.2814  
 16.2815  
 16.2816 -SPEC=$OUTPUT_ROOT/spec.gmk
 16.2817 -
 16.2818 -CONF_NAME=$CONF_NAME
 16.2819 -
 16.2820 -OUTPUT_ROOT=$OUTPUT_ROOT
 16.2821 -
 16.2822 -
 16.2823 -# Most of the probed defines are put into config.h
 16.2824 -ac_config_headers="$ac_config_headers $OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in"
 16.2825 -
 16.2826 -# The spec.gmk file contains all variables for the make system.
 16.2827 -ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in"
 16.2828 -
 16.2829 -# The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
 16.2830 -ac_config_files="$ac_config_files $OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in"
 16.2831 -
 16.2832 -# The bootcycle-spec.gmk file contains support for boot cycle builds.
 16.2833 -ac_config_files="$ac_config_files $OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in"
 16.2834 -
 16.2835 -# The compare.sh is used to compare the build output to other builds.
 16.2836 -ac_config_files="$ac_config_files $OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in"
 16.2837 -
 16.2838 -# Spec.sh is currently used by compare-objects.sh
 16.2839 -ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in"
 16.2840 -
 16.2841 -# The generated Makefile knows where the spec.gmk is and where the source is.
 16.2842 -# You can run make from the OUTPUT_ROOT, or from the top-level Makefile
 16.2843 -# which will look for generated configurations
 16.2844 -ac_config_files="$ac_config_files $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in"
 16.2845 -
 16.2846 -
 16.2847 -# Save the arguments given to us
 16.2848 -echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
 16.2849 +  SPEC=$OUTPUT_ROOT/spec.gmk
 16.2850 +
 16.2851 +  CONF_NAME=$CONF_NAME
 16.2852 +
 16.2853 +  OUTPUT_ROOT=$OUTPUT_ROOT
 16.2854 +
 16.2855 +
 16.2856 +  # Most of the probed defines are put into config.h
 16.2857 +  ac_config_headers="$ac_config_headers $OUTPUT_ROOT/config.h:$AUTOCONF_DIR/config.h.in"
 16.2858 +
 16.2859 +  # The spec.gmk file contains all variables for the make system.
 16.2860 +  ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in"
 16.2861 +
 16.2862 +  # The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
 16.2863 +  ac_config_files="$ac_config_files $OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in"
 16.2864 +
 16.2865 +  # The bootcycle-spec.gmk file contains support for boot cycle builds.
 16.2866 +  ac_config_files="$ac_config_files $OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in"
 16.2867 +
 16.2868 +  # The compare.sh is used to compare the build output to other builds.
 16.2869 +  ac_config_files="$ac_config_files $OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in"
 16.2870 +
 16.2871 +  # Spec.sh is currently used by compare-objects.sh
 16.2872 +  ac_config_files="$ac_config_files $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in"
 16.2873 +
 16.2874 +  # The generated Makefile knows where the spec.gmk is and where the source is.
 16.2875 +  # You can run make from the OUTPUT_ROOT, or from the top-level Makefile
 16.2876 +  # which will look for generated configurations
 16.2877 +  ac_config_files="$ac_config_files $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in"
 16.2878 +
 16.2879 +
 16.2880 +  # Save the arguments given to us
 16.2881 +  echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
 16.2882  
 16.2883  
 16.2884  # Must be done before we can call HELP_MSG_MISSING_DEPENDENCY.
 16.2885  
 16.2886 -    for ac_prog in apt-get yum port pkgutil pkgadd
 16.2887 +  for ac_prog in apt-get yum port pkgutil pkgadd
 16.2888  do
 16.2889    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.2890  set dummy $ac_prog; ac_word=$2
 16.2891 @@ -8314,8 +8312,8 @@
 16.2892    # bat and cmd files are not always considered executable in cygwin causing which
 16.2893    # to not find them
 16.2894    if test "x$new_path" = x \
 16.2895 -           && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.2896 -           && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.2897 +      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.2898 +      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.2899      new_path=`$CYGPATH -u "$path"`
 16.2900    fi
 16.2901    if test "x$new_path" = x; then
 16.2902 @@ -8330,8 +8328,8 @@
 16.2903      # bat and cmd files are not always considered executable in cygwin causing which
 16.2904      # to not find them
 16.2905      if test "x$new_path" = x \
 16.2906 -             && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.2907 -             && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.2908 +        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.2909 +        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.2910        new_path=`$CYGPATH -u "$path"`
 16.2911      fi
 16.2912      if test "x$new_path" = x; then
 16.2913 @@ -8359,9 +8357,9 @@
 16.2914      # Short path failed, file does not exist as specified.
 16.2915      # Try adding .exe or .cmd
 16.2916      if test -f "${new_path}.exe"; then
 16.2917 -       input_to_shortpath="${new_path}.exe"
 16.2918 +      input_to_shortpath="${new_path}.exe"
 16.2919      elif test -f "${new_path}.cmd"; then
 16.2920 -       input_to_shortpath="${new_path}.cmd"
 16.2921 +      input_to_shortpath="${new_path}.cmd"
 16.2922      else
 16.2923        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
 16.2924  $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
 16.2925 @@ -8537,29 +8535,29 @@
 16.2926      fi
 16.2927  
 16.2928      if test "x$new_path" = x; then
 16.2929 -        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
 16.2930 +      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
 16.2931  $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
 16.2932 -        has_space=`$ECHO "$complete" | $GREP " "`
 16.2933 -        if test "x$has_space" != x; then
 16.2934 -          { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
 16.2935 +      has_space=`$ECHO "$complete" | $GREP " "`
 16.2936 +      if test "x$has_space" != x; then
 16.2937 +        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
 16.2938  $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
 16.2939 -        fi
 16.2940 -        as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
 16.2941 -      fi
 16.2942 -  fi
 16.2943 -
 16.2944 -      # Now join together the path and the arguments once again
 16.2945 -      if test "x$arguments" != xEOL; then
 16.2946 -        new_complete="$new_path ${arguments% *}"
 16.2947 -      else
 16.2948 -        new_complete="$new_path"
 16.2949 -      fi
 16.2950 +      fi
 16.2951 +      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
 16.2952 +    fi
 16.2953 +  fi
 16.2954 +
 16.2955 +  # Now join together the path and the arguments once again
 16.2956 +  if test "x$arguments" != xEOL; then
 16.2957 +    new_complete="$new_path ${arguments% *}"
 16.2958 +  else
 16.2959 +    new_complete="$new_path"
 16.2960 +  fi
 16.2961  
 16.2962    if test "x$complete" != "x$new_complete"; then
 16.2963 -      FOUND_MAKE="$new_complete"
 16.2964 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
 16.2965 +    FOUND_MAKE="$new_complete"
 16.2966 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
 16.2967  $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
 16.2968 -    fi
 16.2969 +  fi
 16.2970  
 16.2971          fi
 16.2972        fi
 16.2973 @@ -8671,8 +8669,8 @@
 16.2974    # bat and cmd files are not always considered executable in cygwin causing which
 16.2975    # to not find them
 16.2976    if test "x$new_path" = x \
 16.2977 -           && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.2978 -           && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.2979 +      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.2980 +      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.2981      new_path=`$CYGPATH -u "$path"`
 16.2982    fi
 16.2983    if test "x$new_path" = x; then
 16.2984 @@ -8687,8 +8685,8 @@
 16.2985      # bat and cmd files are not always considered executable in cygwin causing which
 16.2986      # to not find them
 16.2987      if test "x$new_path" = x \
 16.2988 -             && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.2989 -             && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.2990 +        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.2991 +        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.2992        new_path=`$CYGPATH -u "$path"`
 16.2993      fi
 16.2994      if test "x$new_path" = x; then
 16.2995 @@ -8716,9 +8714,9 @@
 16.2996      # Short path failed, file does not exist as specified.
 16.2997      # Try adding .exe or .cmd
 16.2998      if test -f "${new_path}.exe"; then
 16.2999 -       input_to_shortpath="${new_path}.exe"
 16.3000 +      input_to_shortpath="${new_path}.exe"
 16.3001      elif test -f "${new_path}.cmd"; then
 16.3002 -       input_to_shortpath="${new_path}.cmd"
 16.3003 +      input_to_shortpath="${new_path}.cmd"
 16.3004      else
 16.3005        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
 16.3006  $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
 16.3007 @@ -8894,29 +8892,29 @@
 16.3008      fi
 16.3009  
 16.3010      if test "x$new_path" = x; then
 16.3011 -        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
 16.3012 +      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
 16.3013  $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
 16.3014 -        has_space=`$ECHO "$complete" | $GREP " "`
 16.3015 -        if test "x$has_space" != x; then
 16.3016 -          { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
 16.3017 +      has_space=`$ECHO "$complete" | $GREP " "`
 16.3018 +      if test "x$has_space" != x; then
 16.3019 +        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
 16.3020  $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
 16.3021 -        fi
 16.3022 -        as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
 16.3023 -      fi
 16.3024 -  fi
 16.3025 -
 16.3026 -      # Now join together the path and the arguments once again
 16.3027 -      if test "x$arguments" != xEOL; then
 16.3028 -        new_complete="$new_path ${arguments% *}"
 16.3029 -      else
 16.3030 -        new_complete="$new_path"
 16.3031 -      fi
 16.3032 +      fi
 16.3033 +      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
 16.3034 +    fi
 16.3035 +  fi
 16.3036 +
 16.3037 +  # Now join together the path and the arguments once again
 16.3038 +  if test "x$arguments" != xEOL; then
 16.3039 +    new_complete="$new_path ${arguments% *}"
 16.3040 +  else
 16.3041 +    new_complete="$new_path"
 16.3042 +  fi
 16.3043  
 16.3044    if test "x$complete" != "x$new_complete"; then
 16.3045 -      FOUND_MAKE="$new_complete"
 16.3046 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
 16.3047 +    FOUND_MAKE="$new_complete"
 16.3048 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
 16.3049  $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
 16.3050 -    fi
 16.3051 +  fi
 16.3052  
 16.3053          fi
 16.3054        fi
 16.3055 @@ -9025,8 +9023,8 @@
 16.3056    # bat and cmd files are not always considered executable in cygwin causing which
 16.3057    # to not find them
 16.3058    if test "x$new_path" = x \
 16.3059 -           && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3060 -           && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3061 +      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3062 +      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3063      new_path=`$CYGPATH -u "$path"`
 16.3064    fi
 16.3065    if test "x$new_path" = x; then
 16.3066 @@ -9041,8 +9039,8 @@
 16.3067      # bat and cmd files are not always considered executable in cygwin causing which
 16.3068      # to not find them
 16.3069      if test "x$new_path" = x \
 16.3070 -             && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3071 -             && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3072 +        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3073 +        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3074        new_path=`$CYGPATH -u "$path"`
 16.3075      fi
 16.3076      if test "x$new_path" = x; then
 16.3077 @@ -9070,9 +9068,9 @@
 16.3078      # Short path failed, file does not exist as specified.
 16.3079      # Try adding .exe or .cmd
 16.3080      if test -f "${new_path}.exe"; then
 16.3081 -       input_to_shortpath="${new_path}.exe"
 16.3082 +      input_to_shortpath="${new_path}.exe"
 16.3083      elif test -f "${new_path}.cmd"; then
 16.3084 -       input_to_shortpath="${new_path}.cmd"
 16.3085 +      input_to_shortpath="${new_path}.cmd"
 16.3086      else
 16.3087        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
 16.3088  $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
 16.3089 @@ -9248,29 +9246,29 @@
 16.3090      fi
 16.3091  
 16.3092      if test "x$new_path" = x; then
 16.3093 -        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
 16.3094 +      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
 16.3095  $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
 16.3096 -        has_space=`$ECHO "$complete" | $GREP " "`
 16.3097 -        if test "x$has_space" != x; then
 16.3098 -          { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
 16.3099 +      has_space=`$ECHO "$complete" | $GREP " "`
 16.3100 +      if test "x$has_space" != x; then
 16.3101 +        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
 16.3102  $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
 16.3103 -        fi
 16.3104 -        as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
 16.3105 -      fi
 16.3106 -  fi
 16.3107 -
 16.3108 -      # Now join together the path and the arguments once again
 16.3109 -      if test "x$arguments" != xEOL; then
 16.3110 -        new_complete="$new_path ${arguments% *}"
 16.3111 -      else
 16.3112 -        new_complete="$new_path"
 16.3113 -      fi
 16.3114 +      fi
 16.3115 +      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
 16.3116 +    fi
 16.3117 +  fi
 16.3118 +
 16.3119 +  # Now join together the path and the arguments once again
 16.3120 +  if test "x$arguments" != xEOL; then
 16.3121 +    new_complete="$new_path ${arguments% *}"
 16.3122 +  else
 16.3123 +    new_complete="$new_path"
 16.3124 +  fi
 16.3125  
 16.3126    if test "x$complete" != "x$new_complete"; then
 16.3127 -      FOUND_MAKE="$new_complete"
 16.3128 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
 16.3129 +    FOUND_MAKE="$new_complete"
 16.3130 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
 16.3131  $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
 16.3132 -    fi
 16.3133 +  fi
 16.3134  
 16.3135          fi
 16.3136        fi
 16.3137 @@ -9384,8 +9382,8 @@
 16.3138    # bat and cmd files are not always considered executable in cygwin causing which
 16.3139    # to not find them
 16.3140    if test "x$new_path" = x \
 16.3141 -           && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3142 -           && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3143 +      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3144 +      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3145      new_path=`$CYGPATH -u "$path"`
 16.3146    fi
 16.3147    if test "x$new_path" = x; then
 16.3148 @@ -9400,8 +9398,8 @@
 16.3149      # bat and cmd files are not always considered executable in cygwin causing which
 16.3150      # to not find them
 16.3151      if test "x$new_path" = x \
 16.3152 -             && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3153 -             && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3154 +        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3155 +        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3156        new_path=`$CYGPATH -u "$path"`
 16.3157      fi
 16.3158      if test "x$new_path" = x; then
 16.3159 @@ -9429,9 +9427,9 @@
 16.3160      # Short path failed, file does not exist as specified.
 16.3161      # Try adding .exe or .cmd
 16.3162      if test -f "${new_path}.exe"; then
 16.3163 -       input_to_shortpath="${new_path}.exe"
 16.3164 +      input_to_shortpath="${new_path}.exe"
 16.3165      elif test -f "${new_path}.cmd"; then
 16.3166 -       input_to_shortpath="${new_path}.cmd"
 16.3167 +      input_to_shortpath="${new_path}.cmd"
 16.3168      else
 16.3169        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
 16.3170  $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
 16.3171 @@ -9607,29 +9605,29 @@
 16.3172      fi
 16.3173  
 16.3174      if test "x$new_path" = x; then
 16.3175 -        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
 16.3176 +      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
 16.3177  $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
 16.3178 -        has_space=`$ECHO "$complete" | $GREP " "`
 16.3179 -        if test "x$has_space" != x; then
 16.3180 -          { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
 16.3181 +      has_space=`$ECHO "$complete" | $GREP " "`
 16.3182 +      if test "x$has_space" != x; then
 16.3183 +        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
 16.3184  $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
 16.3185 -        fi
 16.3186 -        as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
 16.3187 -      fi
 16.3188 -  fi
 16.3189 -
 16.3190 -      # Now join together the path and the arguments once again
 16.3191 -      if test "x$arguments" != xEOL; then
 16.3192 -        new_complete="$new_path ${arguments% *}"
 16.3193 -      else
 16.3194 -        new_complete="$new_path"
 16.3195 -      fi
 16.3196 +      fi
 16.3197 +      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
 16.3198 +    fi
 16.3199 +  fi
 16.3200 +
 16.3201 +  # Now join together the path and the arguments once again
 16.3202 +  if test "x$arguments" != xEOL; then
 16.3203 +    new_complete="$new_path ${arguments% *}"
 16.3204 +  else
 16.3205 +    new_complete="$new_path"
 16.3206 +  fi
 16.3207  
 16.3208    if test "x$complete" != "x$new_complete"; then
 16.3209 -      FOUND_MAKE="$new_complete"
 16.3210 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
 16.3211 +    FOUND_MAKE="$new_complete"
 16.3212 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
 16.3213  $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
 16.3214 -    fi
 16.3215 +  fi
 16.3216  
 16.3217          fi
 16.3218        fi
 16.3219 @@ -9737,8 +9735,8 @@
 16.3220    # bat and cmd files are not always considered executable in cygwin causing which
 16.3221    # to not find them
 16.3222    if test "x$new_path" = x \
 16.3223 -           && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3224 -           && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3225 +      && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3226 +      && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3227      new_path=`$CYGPATH -u "$path"`
 16.3228    fi
 16.3229    if test "x$new_path" = x; then
 16.3230 @@ -9753,8 +9751,8 @@
 16.3231      # bat and cmd files are not always considered executable in cygwin causing which
 16.3232      # to not find them
 16.3233      if test "x$new_path" = x \
 16.3234 -             && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3235 -             && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3236 +        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
 16.3237 +        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
 16.3238        new_path=`$CYGPATH -u "$path"`
 16.3239      fi
 16.3240      if test "x$new_path" = x; then
 16.3241 @@ -9782,9 +9780,9 @@
 16.3242      # Short path failed, file does not exist as specified.
 16.3243      # Try adding .exe or .cmd
 16.3244      if test -f "${new_path}.exe"; then
 16.3245 -       input_to_shortpath="${new_path}.exe"
 16.3246 +      input_to_shortpath="${new_path}.exe"
 16.3247      elif test -f "${new_path}.cmd"; then
 16.3248 -       input_to_shortpath="${new_path}.cmd"
 16.3249 +      input_to_shortpath="${new_path}.cmd"
 16.3250      else
 16.3251        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&5
 16.3252  $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$new_path\", is invalid." >&6;}
 16.3253 @@ -9960,29 +9958,29 @@
 16.3254      fi
 16.3255  
 16.3256      if test "x$new_path" = x; then
 16.3257 -        { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
 16.3258 +      { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
 16.3259  $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
 16.3260 -        has_space=`$ECHO "$complete" | $GREP " "`
 16.3261 -        if test "x$has_space" != x; then
 16.3262 -          { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
 16.3263 +      has_space=`$ECHO "$complete" | $GREP " "`
 16.3264 +      if test "x$has_space" != x; then
 16.3265 +        { $as_echo "$as_me:${as_lineno-$LINENO}: This might be caused by spaces in the path, which is not allowed." >&5
 16.3266  $as_echo "$as_me: This might be caused by spaces in the path, which is not allowed." >&6;}
 16.3267 -        fi
 16.3268 -        as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
 16.3269 -      fi
 16.3270 -  fi
 16.3271 -
 16.3272 -      # Now join together the path and the arguments once again
 16.3273 -      if test "x$arguments" != xEOL; then
 16.3274 -        new_complete="$new_path ${arguments% *}"
 16.3275 -      else
 16.3276 -        new_complete="$new_path"
 16.3277 -      fi
 16.3278 +      fi
 16.3279 +      as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
 16.3280 +    fi
 16.3281 +  fi
 16.3282 +
 16.3283 +  # Now join together the path and the arguments once again
 16.3284 +  if test "x$arguments" != xEOL; then
 16.3285 +    new_complete="$new_path ${arguments% *}"
 16.3286 +  else
 16.3287 +    new_complete="$new_path"
 16.3288 +  fi
 16.3289  
 16.3290    if test "x$complete" != "x$new_complete"; then
 16.3291 -      FOUND_MAKE="$new_complete"
 16.3292 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
 16.3293 +    FOUND_MAKE="$new_complete"
 16.3294 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
 16.3295  $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
 16.3296 -    fi
 16.3297 +  fi
 16.3298  
 16.3299          fi
 16.3300        fi
 16.3301 @@ -10006,34 +10004,34 @@
 16.3302  
 16.3303  
 16.3304  
 16.3305 -    # Test if find supports -delete
 16.3306 -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5
 16.3307 +  # Test if find supports -delete
 16.3308 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if find supports -delete" >&5
 16.3309  $as_echo_n "checking if find supports -delete... " >&6; }
 16.3310 -    FIND_DELETE="-delete"
 16.3311 -
 16.3312 -    DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
 16.3313 -
 16.3314 -    echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
 16.3315 -
 16.3316 -    TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
 16.3317 -    if test -f $DELETEDIR/TestIfFindSupportsDelete; then
 16.3318 -        # No, it does not.
 16.3319 -        rm $DELETEDIR/TestIfFindSupportsDelete
 16.3320 -        FIND_DELETE="-exec rm \{\} \+"
 16.3321 -        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 16.3322 -$as_echo "no" >&6; }
 16.3323 -    else
 16.3324 -        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 16.3325 +  FIND_DELETE="-delete"
 16.3326 +
 16.3327 +  DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
 16.3328 +
 16.3329 +  echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
 16.3330 +
 16.3331 +  TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
 16.3332 +  if test -f $DELETEDIR/TestIfFindSupportsDelete; then
 16.3333 +    # No, it does not.
 16.3334 +    rm $DELETEDIR/TestIfFindSupportsDelete
 16.3335 +    FIND_DELETE="-exec rm \{\} \+"
 16.3336 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 16.3337 +$as_echo "no" >&6; }
 16.3338 +  else
 16.3339 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 16.3340  $as_echo "yes" >&6; }
 16.3341 -    fi
 16.3342 -    rmdir $DELETEDIR
 16.3343 -
 16.3344 -
 16.3345 -
 16.3346 -# These tools might not be installed by default,
 16.3347 -# need hint on how to install them.
 16.3348 -
 16.3349 -    for ac_prog in unzip
 16.3350 +  fi
 16.3351 +  rmdir $DELETEDIR
 16.3352 +
 16.3353 +
 16.3354 +
 16.3355 +  # These tools might not be installed by default,
 16.3356 +  # need hint on how to install them.
 16.3357 +
 16.3358 +  for ac_prog in unzip
 16.3359  do
 16.3360    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.3361  set dummy $ac_prog; ac_word=$2
 16.3362 @@ -10079,20 +10077,20 @@
 16.3363  done
 16.3364  
 16.3365  
 16.3366 -    if test "x$UNZIP" = x; then
 16.3367 -        if test "xunzip" = x; then
 16.3368 -          PROG_NAME=unzip
 16.3369 -        else
 16.3370 -          PROG_NAME=unzip
 16.3371 -        fi
 16.3372 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.3373 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.3374 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.3375 -    fi
 16.3376 -
 16.3377 -
 16.3378 -
 16.3379 -    for ac_prog in zip
 16.3380 +  if test "x$UNZIP" = x; then
 16.3381 +    if test "xunzip" = x; then
 16.3382 +      PROG_NAME=unzip
 16.3383 +    else
 16.3384 +      PROG_NAME=unzip
 16.3385 +    fi
 16.3386 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.3387 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.3388 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.3389 +  fi
 16.3390 +
 16.3391 +
 16.3392 +
 16.3393 +  for ac_prog in zip
 16.3394  do
 16.3395    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.3396  set dummy $ac_prog; ac_word=$2
 16.3397 @@ -10138,22 +10136,22 @@
 16.3398  done
 16.3399  
 16.3400  
 16.3401 -    if test "x$ZIP" = x; then
 16.3402 -        if test "xzip" = x; then
 16.3403 -          PROG_NAME=zip
 16.3404 -        else
 16.3405 -          PROG_NAME=zip
 16.3406 -        fi
 16.3407 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.3408 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.3409 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.3410 -    fi
 16.3411 -
 16.3412 -
 16.3413 -
 16.3414 -# Non-required basic tools
 16.3415 -
 16.3416 -# Extract the first word of "ldd", so it can be a program name with args.
 16.3417 +  if test "x$ZIP" = x; then
 16.3418 +    if test "xzip" = x; then
 16.3419 +      PROG_NAME=zip
 16.3420 +    else
 16.3421 +      PROG_NAME=zip
 16.3422 +    fi
 16.3423 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.3424 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.3425 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.3426 +  fi
 16.3427 +
 16.3428 +
 16.3429 +
 16.3430 +  # Non-required basic tools
 16.3431 +
 16.3432 +  # Extract the first word of "ldd", so it can be a program name with args.
 16.3433  set dummy ldd; ac_word=$2
 16.3434  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.3435  $as_echo_n "checking for $ac_word... " >&6; }
 16.3436 @@ -10193,13 +10191,13 @@
 16.3437  fi
 16.3438  
 16.3439  
 16.3440 -if test "x$LDD" = "x"; then
 16.3441 +  if test "x$LDD" = "x"; then
 16.3442      # List shared lib dependencies is used for
 16.3443      # debug output and checking for forbidden dependencies.
 16.3444      # We can build without it.
 16.3445      LDD="true"
 16.3446 -fi
 16.3447 -# Extract the first word of "otool", so it can be a program name with args.
 16.3448 +  fi
 16.3449 +  # Extract the first word of "otool", so it can be a program name with args.
 16.3450  set dummy otool; ac_word=$2
 16.3451  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.3452  $as_echo_n "checking for $ac_word... " >&6; }
 16.3453 @@ -10239,10 +10237,10 @@
 16.3454  fi
 16.3455  
 16.3456  
 16.3457 -if test "x$OTOOL" = "x"; then
 16.3458 -   OTOOL="true"
 16.3459 -fi
 16.3460 -for ac_prog in readelf greadelf
 16.3461 +  if test "x$OTOOL" = "x"; then
 16.3462 +    OTOOL="true"
 16.3463 +  fi
 16.3464 +  for ac_prog in readelf greadelf
 16.3465  do
 16.3466    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.3467  set dummy $ac_prog; ac_word=$2
 16.3468 @@ -10287,7 +10285,7 @@
 16.3469    test -n "$READELF" && break
 16.3470  done
 16.3471  
 16.3472 -# Extract the first word of "hg", so it can be a program name with args.
 16.3473 +  # Extract the first word of "hg", so it can be a program name with args.
 16.3474  set dummy hg; ac_word=$2
 16.3475  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.3476  $as_echo_n "checking for $ac_word... " >&6; }
 16.3477 @@ -10327,7 +10325,7 @@
 16.3478  fi
 16.3479  
 16.3480  
 16.3481 -# Extract the first word of "stat", so it can be a program name with args.
 16.3482 +  # Extract the first word of "stat", so it can be a program name with args.
 16.3483  set dummy stat; ac_word=$2
 16.3484  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.3485  $as_echo_n "checking for $ac_word... " >&6; }
 16.3486 @@ -10367,7 +10365,7 @@
 16.3487  fi
 16.3488  
 16.3489  
 16.3490 -# Extract the first word of "time", so it can be a program name with args.
 16.3491 +  # Extract the first word of "time", so it can be a program name with args.
 16.3492  set dummy time; ac_word=$2
 16.3493  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.3494  $as_echo_n "checking for $ac_word... " >&6; }
 16.3495 @@ -10407,18 +10405,18 @@
 16.3496  fi
 16.3497  
 16.3498  
 16.3499 -# Check if it's GNU time
 16.3500 -IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
 16.3501 -if test "x$IS_GNU_TIME" != x; then
 16.3502 -  IS_GNU_TIME=yes
 16.3503 -else
 16.3504 -  IS_GNU_TIME=no
 16.3505 -fi
 16.3506 -
 16.3507 -
 16.3508 -if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
 16.3509 -
 16.3510 -    for ac_prog in comm
 16.3511 +  # Check if it's GNU time
 16.3512 +  IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
 16.3513 +  if test "x$IS_GNU_TIME" != x; then
 16.3514 +    IS_GNU_TIME=yes
 16.3515 +  else
 16.3516 +    IS_GNU_TIME=no
 16.3517 +  fi
 16.3518 +
 16.3519 +
 16.3520 +  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
 16.3521 +
 16.3522 +  for ac_prog in comm
 16.3523  do
 16.3524    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.3525  set dummy $ac_prog; ac_word=$2
 16.3526 @@ -10464,23 +10462,23 @@
 16.3527  done
 16.3528  
 16.3529  
 16.3530 -    if test "x$COMM" = x; then
 16.3531 -        if test "xcomm" = x; then
 16.3532 -          PROG_NAME=comm
 16.3533 -        else
 16.3534 -          PROG_NAME=comm
 16.3535 -        fi
 16.3536 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.3537 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.3538 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.3539 -    fi
 16.3540 -
 16.3541 -
 16.3542 -fi
 16.3543 -
 16.3544 -if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
 16.3545 -
 16.3546 -    for ac_prog in xattr
 16.3547 +  if test "x$COMM" = x; then
 16.3548 +    if test "xcomm" = x; then
 16.3549 +      PROG_NAME=comm
 16.3550 +    else
 16.3551 +      PROG_NAME=comm
 16.3552 +    fi
 16.3553 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.3554 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.3555 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.3556 +  fi
 16.3557 +
 16.3558 +
 16.3559 +  fi
 16.3560 +
 16.3561 +  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
 16.3562 +
 16.3563 +  for ac_prog in xattr
 16.3564  do
 16.3565    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.3566  set dummy $ac_prog; ac_word=$2
 16.3567 @@ -10526,19 +10524,19 @@
 16.3568  done
 16.3569  
 16.3570  
 16.3571 -    if test "x$XATTR" = x; then
 16.3572 -        if test "xxattr" = x; then
 16.3573 -          PROG_NAME=xattr
 16.3574 -        else
 16.3575 -          PROG_NAME=xattr
 16.3576 -        fi
 16.3577 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.3578 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.3579 -        as_fn_error $? "Cannot continue" "$LINENO" 5
 16.3580 -    fi
 16.3581 -
 16.3582 -
 16.3583 -  # Extract the first word of "codesign", so it can be a program name with args.
 16.3584 +  if test "x$XATTR" = x; then
 16.3585 +    if test "xxattr" = x; then
 16.3586 +      PROG_NAME=xattr
 16.3587 +    else
 16.3588 +      PROG_NAME=xattr
 16.3589 +    fi
 16.3590 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 16.3591 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 16.3592 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.3593 +  fi
 16.3594 +
 16.3595 +
 16.3596 +    # Extract the first word of "codesign", so it can be a program name with args.
 16.3597  set dummy codesign; ac_word=$2
 16.3598  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.3599  $as_echo_n "checking for $ac_word... " >&6; }
 16.3600 @@ -10578,23 +10576,23 @@
 16.3601  fi
 16.3602  
 16.3603  
 16.3604 -  if test "x$CODESIGN" != "x"; then
 16.3605 -    # Verify that the openjdk_codesign certificate is present
 16.3606 -    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5
 16.3607 +    if test "x$CODESIGN" != "x"; then
 16.3608 +      # Verify that the openjdk_codesign certificate is present
 16.3609 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5
 16.3610  $as_echo_n "checking if openjdk_codesign certificate is present... " >&6; }
 16.3611 -    rm -f codesign-testfile
 16.3612 -    touch codesign-testfile
 16.3613 -    codesign -s openjdk_codesign codesign-testfile 2>&5 >&5 || CODESIGN=
 16.3614 -    rm -f codesign-testfile
 16.3615 -    if test "x$CODESIGN" = x; then
 16.3616 -      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 16.3617 -$as_echo "no" >&6; }
 16.3618 -    else
 16.3619 -      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 16.3620 +      rm -f codesign-testfile
 16.3621 +      touch codesign-testfile
 16.3622 +      codesign -s openjdk_codesign codesign-testfile 2>&5 >&5 || CODESIGN=
 16.3623 +      rm -f codesign-testfile
 16.3624 +      if test "x$CODESIGN" = x; then
 16.3625 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 16.3626 +$as_echo "no" >&6; }
 16.3627 +      else
 16.3628 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 16.3629  $as_echo "yes" >&6; }
 16.3630 -    fi
 16.3631 -  fi
 16.3632 -fi
 16.3633 +      fi
 16.3634 +    fi
 16.3635 +  fi
 16.3636  
 16.3637  
 16.3638  # Check if pkg-config is available.
 16.3639 @@ -10717,14 +10715,14 @@
 16.3640  
 16.3641  # After basic tools have been setup, we can check build os specific details.
 16.3642  
 16.3643 -###############################################################################
 16.3644 -
 16.3645 -# Note that this is the build platform OS version!
 16.3646 -
 16.3647 -OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`"
 16.3648 -OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`"
 16.3649 -OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`"
 16.3650 -OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`"
 16.3651 +  ###############################################################################
 16.3652 +
 16.3653 +  # Note that this is the build platform OS version!
 16.3654 +
 16.3655 +  OS_VERSION="`uname -r | ${SED} 's!\.! !g' | ${SED} 's!-! !g'`"
 16.3656 +  OS_VERSION_MAJOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 1 -d ' '`"
 16.3657 +  OS_VERSION_MINOR="`${ECHO} ${OS_VERSION} | ${CUT} -f 2 -d ' '`"
 16.3658 +  OS_VERSION_MICRO="`${ECHO} ${OS_VERSION} | ${CUT} -f 3 -d ' '`"
 16.3659  
 16.3660  
 16.3661  
 16.3662 @@ -10766,57 +10764,57 @@
 16.3663  
 16.3664  
 16.3665  
 16.3666 -    if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
 16.3667 -        if test "x$with_builddeps_conf" != x; then
 16.3668 -            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supplied builddeps configuration file" >&5
 16.3669 +  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
 16.3670 +    if test "x$with_builddeps_conf" != x; then
 16.3671 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supplied builddeps configuration file" >&5
 16.3672  $as_echo_n "checking for supplied builddeps configuration file... " >&6; }
 16.3673 -            builddepsfile=$with_builddeps_conf
 16.3674 -            if test -s $builddepsfile; then
 16.3675 -                . $builddepsfile
 16.3676 -                { $as_echo "$as_me:${as_lineno-$LINENO}: result: loaded!" >&5
 16.3677 +      builddepsfile=$with_builddeps_conf
 16.3678 +      if test -s $builddepsfile; then
 16.3679 +        . $builddepsfile
 16.3680 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loaded!" >&5
 16.3681  $as_echo "loaded!" >&6; }
 16.3682 -            else
 16.3683 -               as_fn_error $? "The given builddeps conf file $with_builddeps_conf could not be loaded!" "$LINENO" 5
 16.3684 -           fi
 16.3685 -        else
 16.3686 -            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builddeps.conf files in sources..." >&5
 16.3687 +      else
 16.3688 +        as_fn_error $? "The given builddeps conf file $with_builddeps_conf could not be loaded!" "$LINENO" 5
 16.3689 +      fi
 16.3690 +    else
 16.3691 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builddeps.conf files in sources..." >&5
 16.3692  $as_echo_n "checking for builddeps.conf files in sources...... " >&6; }
 16.3693 -            builddepsfile=`mktemp`
 16.3694 -            touch $builddepsfile
 16.3695 -            # Put all found confs into a single file.
 16.3696 -            find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile
 16.3697 -            # Source the file to acquire the variables
 16.3698 -            if test -s $builddepsfile; then
 16.3699 -                . $builddepsfile
 16.3700 -                { $as_echo "$as_me:${as_lineno-$LINENO}: result: found at least one!" >&5
 16.3701 +      builddepsfile=`mktemp`
 16.3702 +      touch $builddepsfile
 16.3703 +      # Put all found confs into a single file.
 16.3704 +      find ${SRC_ROOT} -name builddeps.conf -exec cat \{\} \; >> $builddepsfile
 16.3705 +      # Source the file to acquire the variables
 16.3706 +      if test -s $builddepsfile; then
 16.3707 +        . $builddepsfile
 16.3708 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found at least one!" >&5
 16.3709  $as_echo "found at least one!" >&6; }
 16.3710 -            else
 16.3711 -               as_fn_error $? "Could not find any builddeps.conf at all!" "$LINENO" 5
 16.3712 -           fi
 16.3713 -        fi
 16.3714 -        # Create build and target names that use _ instead of "-" and ".".
 16.3715 -        # This is necessary to use them in variable names.
 16.3716 -        build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
 16.3717 -        target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
 16.3718 -        # Extract rewrite information for build and target
 16.3719 -        eval rewritten_build=\${REWRITE_${build_var}}
 16.3720 -        if test "x$rewritten_build" = x; then
 16.3721 -            rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
 16.3722 -            echo Build stays the same $rewritten_build
 16.3723 -        else
 16.3724 -            echo Rewriting build for builddeps into $rewritten_build
 16.3725 -        fi
 16.3726 -        eval rewritten_target=\${REWRITE_${target_var}}
 16.3727 -        if test "x$rewritten_target" = x; then
 16.3728 -            rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
 16.3729 -            echo Target stays the same $rewritten_target
 16.3730 -        else
 16.3731 -            echo Rewriting target for builddeps into $rewritten_target
 16.3732 -        fi
 16.3733 -        rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'`
 16.3734 -        rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'`
 16.3735 -    fi
 16.3736 -    for ac_prog in 7z unzip
 16.3737 +      else
 16.3738 +        as_fn_error $? "Could not find any builddeps.conf at all!" "$LINENO" 5
 16.3739 +      fi
 16.3740 +    fi
 16.3741 +    # Create build and target names that use _ instead of "-" and ".".
 16.3742 +    # This is necessary to use them in variable names.
 16.3743 +    build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
 16.3744 +    target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
 16.3745 +    # Extract rewrite information for build and target
 16.3746 +    eval rewritten_build=\${REWRITE_${build_var}}
 16.3747 +    if test "x$rewritten_build" = x; then
 16.3748 +      rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
 16.3749 +      echo Build stays the same $rewritten_build
 16.3750 +    else
 16.3751 +      echo Rewriting build for builddeps into $rewritten_build
 16.3752 +    fi
 16.3753 +    eval rewritten_target=\${REWRITE_${target_var}}
 16.3754 +    if test "x$rewritten_target" = x; then
 16.3755 +      rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
 16.3756 +      echo Target stays the same $rewritten_target
 16.3757 +    else
 16.3758 +      echo Rewriting target for builddeps into $rewritten_target
 16.3759 +    fi
 16.3760 +    rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'`
 16.3761 +    rewritten_target_var=`echo ${rewritten_target} | tr '-' '_' | tr '.' '_'`
 16.3762 +  fi
 16.3763 +  for ac_prog in 7z unzip
 16.3764  do
 16.3765    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.3766  set dummy $ac_prog; ac_word=$2
 16.3767 @@ -10858,11 +10856,11 @@
 16.3768    test -n "$BDEPS_UNZIP" && break
 16.3769  done
 16.3770  
 16.3771 -    if test "x$BDEPS_UNZIP" = x7z; then
 16.3772 -        BDEPS_UNZIP="7z x"
 16.3773 -    fi
 16.3774 -
 16.3775 -    for ac_prog in wget lftp ftp
 16.3776 +  if test "x$BDEPS_UNZIP" = x7z; then
 16.3777 +    BDEPS_UNZIP="7z x"
 16.3778 +  fi
 16.3779 +
 16.3780 +  for ac_prog in wget lftp ftp
 16.3781  do
 16.3782    # Extract the first word of "$ac_prog", so it can be a program name with args.
 16.3783  set dummy $ac_prog; ac_word=$2
 16.3784 @@ -10915,14 +10913,14 @@
 16.3785  # We need build & target for this.
 16.3786  
 16.3787  
 16.3788 -###############################################################################
 16.3789 -#
 16.3790 -# Should we build a JDK/JVM with headful support (ie a graphical ui)?
 16.3791 -# We always build headless support.
 16.3792 -#
 16.3793 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking headful support" >&5
 16.3794 +  ###############################################################################
 16.3795 +  #
 16.3796 +  # Should we build a JDK/JVM with headful support (ie a graphical ui)?
 16.3797 +  # We always build headless support.
 16.3798 +  #
 16.3799 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking headful support" >&5
 16.3800  $as_echo_n "checking headful support... " >&6; }
 16.3801 -# Check whether --enable-headful was given.
 16.3802 +  # Check whether --enable-headful was given.
 16.3803  if test "${enable_headful+set}" = set; then :
 16.3804    enableval=$enable_headful; SUPPORT_HEADFUL=${enable_headful}
 16.3805  else
 16.3806 @@ -10930,110 +10928,110 @@
 16.3807  fi
 16.3808  
 16.3809  
 16.3810 -SUPPORT_HEADLESS=yes
 16.3811 -BUILD_HEADLESS="BUILD_HEADLESS:=true"
 16.3812 -
 16.3813 -if test "x$SUPPORT_HEADFUL" = xyes; then
 16.3814 +  SUPPORT_HEADLESS=yes
 16.3815 +  BUILD_HEADLESS="BUILD_HEADLESS:=true"
 16.3816 +
 16.3817 +  if test "x$SUPPORT_HEADFUL" = xyes; then
 16.3818      # We are building both headful and headless.
 16.3819      headful_msg="include support for both headful and headless"
 16.3820 -fi
 16.3821 -
 16.3822 -if test "x$SUPPORT_HEADFUL" = xno; then
 16.3823 +  fi
 16.3824 +
 16.3825 +  if test "x$SUPPORT_HEADFUL" = xno; then
 16.3826      # Thus we are building headless only.
 16.3827      BUILD_HEADLESS="BUILD_HEADLESS:=true"
 16.3828      headful_msg="headless only"
 16.3829 -fi
 16.3830 -
 16.3831 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $headful_msg" >&5
 16.3832 +  fi
 16.3833 +
 16.3834 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $headful_msg" >&5
 16.3835  $as_echo "$headful_msg" >&6; }
 16.3836  
 16.3837  
 16.3838  
 16.3839  
 16.3840  
 16.3841 -# Control wether Hotspot runs Queens test after build.
 16.3842 -# Check whether --enable-hotspot-test-in-build was given.
 16.3843 +  # Control wether Hotspot runs Queens test after build.
 16.3844 +  # Check whether --enable-hotspot-test-in-build was given.
 16.3845  if test "${enable_hotspot_test_in_build+set}" = set; then :
 16.3846    enableval=$enable_hotspot_test_in_build;
 16.3847  else
 16.3848    enable_hotspot_test_in_build=no
 16.3849  fi
 16.3850  
 16.3851 -if test "x$enable_hotspot_test_in_build" = "xyes"; then
 16.3852 +  if test "x$enable_hotspot_test_in_build" = "xyes"; then
 16.3853      TEST_IN_BUILD=true
 16.3854 -else
 16.3855 +  else
 16.3856      TEST_IN_BUILD=false
 16.3857 -fi
 16.3858 -
 16.3859 -
 16.3860 -###############################################################################
 16.3861 -#
 16.3862 -# Choose cacerts source file
 16.3863 -#
 16.3864 +  fi
 16.3865 +
 16.3866 +
 16.3867 +  ###############################################################################
 16.3868 +  #
 16.3869 +  # Choose cacerts source file
 16.3870 +  #
 16.3871  
 16.3872  # Check whether --with-cacerts-file was given.
 16.3873  if test "${with_cacerts_file+set}" = set; then :
 16.3874    withval=$with_cacerts_file;
 16.3875  fi
 16.3876  
 16.3877 -if test "x$with_cacerts_file" != x; then
 16.3878 +  if test "x$with_cacerts_file" != x; then
 16.3879      CACERTS_FILE=$with_cacerts_file
 16.3880 -else
 16.3881 +  else
 16.3882      CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
 16.3883 -fi
 16.3884 -
 16.3885 -
 16.3886 -###############################################################################
 16.3887 -#
 16.3888 -# Enable or disable unlimited crypto
 16.3889 -#
 16.3890 -# Check whether --enable-unlimited-crypto was given.
 16.3891 +  fi
 16.3892 +
 16.3893 +
 16.3894 +  ###############################################################################
 16.3895 +  #
 16.3896 +  # Enable or disable unlimited crypto
 16.3897 +  #
 16.3898 +  # Check whether --enable-unlimited-crypto was given.
 16.3899  if test "${enable_unlimited_crypto+set}" = set; then :
 16.3900    enableval=$enable_unlimited_crypto;
 16.3901  else
 16.3902    enable_unlimited_crypto=no
 16.3903  fi
 16.3904  
 16.3905 -if test "x$enable_unlimited_crypto" = "xyes"; then
 16.3906 +  if test "x$enable_unlimited_crypto" = "xyes"; then
 16.3907      UNLIMITED_CRYPTO=true
 16.3908 -else
 16.3909 +  else
 16.3910      UNLIMITED_CRYPTO=false
 16.3911 -fi
 16.3912 -
 16.3913 -
 16.3914 -###############################################################################
 16.3915 -#
 16.3916 -# Enable or disable the elliptic curve crypto implementation
 16.3917 -#
 16.3918 -
 16.3919 -
 16.3920 -###############################################################################
 16.3921 -#
 16.3922 -# Compress jars
 16.3923 -#
 16.3924 -COMPRESS_JARS=false
 16.3925 -
 16.3926 -
 16.3927 -
 16.3928 -
 16.3929 -# Source the version numbers
 16.3930 -. $AUTOCONF_DIR/version-numbers
 16.3931 -
 16.3932 -# Get the settings from parameters
 16.3933 +  fi
 16.3934 +
 16.3935 +
 16.3936 +  ###############################################################################
 16.3937 +  #
 16.3938 +  # Enable or disable the elliptic curve crypto implementation
 16.3939 +  #
 16.3940 +
 16.3941 +
 16.3942 +  ###############################################################################
 16.3943 +  #
 16.3944 +  # Compress jars
 16.3945 +  #
 16.3946 +  COMPRESS_JARS=false
 16.3947 +
 16.3948 +
 16.3949 +
 16.3950 +
 16.3951 +  # Source the version numbers
 16.3952 +  . $AUTOCONF_DIR/version-numbers
 16.3953 +
 16.3954 +  # Get the settings from parameters
 16.3955  
 16.3956  # Check whether --with-milestone was given.
 16.3957  if test "${with_milestone+set}" = set; then :
 16.3958    withval=$with_milestone;
 16.3959  fi
 16.3960  
 16.3961 -if test "x$with_milestone" = xyes; then
 16.3962 -  as_fn_error $? "Milestone must have a value" "$LINENO" 5
 16.3963 -elif test "x$with_milestone" != x; then
 16.3964 +  if test "x$with_milestone" = xyes; then
 16.3965 +    as_fn_error $? "Milestone must have a value" "$LINENO" 5
 16.3966 +  elif test "x$with_milestone" != x; then
 16.3967      MILESTONE="$with_milestone"
 16.3968 -fi
 16.3969 -if test "x$MILESTONE" = x; then
 16.3970 -  MILESTONE=internal
 16.3971 -fi
 16.3972 +  fi
 16.3973 +  if test "x$MILESTONE" = x; then
 16.3974 +    MILESTONE=internal
 16.3975 +  fi
 16.3976  
 16.3977  
 16.3978  # Check whether --with-update-version was given.
 16.3979 @@ -11041,11 +11039,11 @@
 16.3980    withval=$with_update_version;
 16.3981  fi
 16.3982  
 16.3983 -if test "x$with_update_version" = xyes; then
 16.3984 -  as_fn_error $? "Update version must have a value" "$LINENO" 5
 16.3985 -elif test "x$with_update_version" != x; then
 16.3986 -  JDK_UPDATE_VERSION="$with_update_version"
 16.3987 -fi
 16.3988 +  if test "x$with_update_version" = xyes; then
 16.3989 +    as_fn_error $? "Update version must have a value" "$LINENO" 5
 16.3990 +  elif test "x$with_update_version" != x; then
 16.3991 +    JDK_UPDATE_VERSION="$with_update_version"
 16.3992 +  fi
 16.3993  
 16.3994  
 16.3995  # Check whether --with-user-release-suffix was given.
 16.3996 @@ -11053,11 +11051,11 @@
 16.3997    withval=$with_user_release_suffix;
 16.3998  fi
 16.3999  
 16.4000 -if test "x$with_user_release_suffix" = xyes; then
 16.4001 -  as_fn_error $? "Release suffix must have a value" "$LINENO" 5
 16.4002 -elif test "x$with_user_release_suffix" != x; then
 16.4003 -  USER_RELEASE_SUFFIX="$with_user_release_suffix"
 16.4004 -fi
 16.4005 +  if test "x$with_user_release_suffix" = xyes; then
 16.4006 +    as_fn_error $? "Release suffix must have a value" "$LINENO" 5
 16.4007 +  elif test "x$with_user_release_suffix" != x; then
 16.4008 +    USER_RELEASE_SUFFIX="$with_user_release_suffix"
 16.4009 +  fi
 16.4010  
 16.4011  
 16.4012  # Check whether --with-build-number was given.
 16.4013 @@ -11065,49 +11063,49 @@
 16.4014    withval=$with_build_number;
 16.4015  fi
 16.4016  
 16.4017 -if test "x$with_build_number" = xyes; then
 16.4018 -  as_fn_error $? "Build number must have a value" "$LINENO" 5
 16.4019 -elif test "x$with_build_number" != x; then
 16.4020 -  JDK_BUILD_NUMBER="$with_build_number"
 16.4021 -fi
 16.4022 -# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
 16.4023 -if test "x$JDK_BUILD_NUMBER" = x; then
 16.4024 -  JDK_BUILD_NUMBER=b00
 16.4025 -  if test "x$USER_RELEASE_SUFFIX" = x; then
 16.4026 -    BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
 16.4027 -    # Avoid [:alnum:] since it depends on the locale.
 16.4028 -    CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
 16.4029 -    USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 16.4030 -  fi
 16.4031 -fi
 16.4032 -
 16.4033 -# Now set the JDK version, milestone, build number etc.
 16.4034 -
 16.4035 -
 16.4036 -
 16.4037 -
 16.4038 -
 16.4039 -
 16.4040 -
 16.4041 -
 16.4042 -
 16.4043 -
 16.4044 -
 16.4045 -
 16.4046 -
 16.4047 -
 16.4048 -
 16.4049 -COPYRIGHT_YEAR=`date +'%Y'`
 16.4050 -
 16.4051 -
 16.4052 -if test "x$JDK_UPDATE_VERSION" != x; then
 16.4053 -  JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
 16.4054 -else
 16.4055 -  JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
 16.4056 -fi
 16.4057 -
 16.4058 -
 16.4059 -COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
 16.4060 +  if test "x$with_build_number" = xyes; then
 16.4061 +    as_fn_error $? "Build number must have a value" "$LINENO" 5
 16.4062 +  elif test "x$with_build_number" != x; then
 16.4063 +    JDK_BUILD_NUMBER="$with_build_number"
 16.4064 +  fi
 16.4065 +  # Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
 16.4066 +  if test "x$JDK_BUILD_NUMBER" = x; then
 16.4067 +    JDK_BUILD_NUMBER=b00
 16.4068 +    if test "x$USER_RELEASE_SUFFIX" = x; then
 16.4069 +      BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
 16.4070 +      # Avoid [:alnum:] since it depends on the locale.
 16.4071 +      CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
 16.4072 +      USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 16.4073 +    fi
 16.4074 +  fi
 16.4075 +
 16.4076 +  # Now set the JDK version, milestone, build number etc.
 16.4077 +
 16.4078 +
 16.4079 +
 16.4080 +
 16.4081 +
 16.4082 +
 16.4083 +
 16.4084 +
 16.4085 +
 16.4086 +
 16.4087 +
 16.4088 +
 16.4089 +
 16.4090 +
 16.4091 +
 16.4092 +  COPYRIGHT_YEAR=`date +'%Y'`
 16.4093 +
 16.4094 +
 16.4095 +  if test "x$JDK_UPDATE_VERSION" != x; then
 16.4096 +    JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
 16.4097 +  else
 16.4098 +    JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
 16.4099 +  fi
 16.4100 +
 16.4101 +
 16.4102 +  COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
 16.4103  
 16.4104  
 16.4105  
 16.4106 @@ -11118,7 +11116,7 @@
 16.4107  ###############################################################################
 16.4108  
 16.4109  
 16.4110 -BOOT_JDK_FOUND=no
 16.4111 +  BOOT_JDK_FOUND=no
 16.4112  
 16.4113  # Check whether --with-boot-jdk was given.
 16.4114  if test "${with_boot_jdk+set}" = set; then :
 16.4115 @@ -11126,22 +11124,22 @@
 16.4116  fi
 16.4117  
 16.4118  
 16.4119 -# We look for the Boot JDK through various means, going from more certain to
 16.4120 -# more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if
 16.4121 -# we detected something (if so, the path to the jdk is in BOOT_JDK). But we
 16.4122 -# must check if this is indeed valid; otherwise we'll continue looking.
 16.4123 -
 16.4124 -# Test: Is bootjdk explicitely set by command line arguments?
 16.4125 +  # We look for the Boot JDK through various means, going from more certain to
 16.4126 +  # more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if
 16.4127 +  # we detected something (if so, the path to the jdk is in BOOT_JDK). But we
 16.4128 +  # must check if this is indeed valid; otherwise we'll continue looking.
 16.4129 +
 16.4130 +  # Test: Is bootjdk explicitely set by command line arguments?
 16.4131  
 16.4132    if test "x$BOOT_JDK_FOUND" = xno; then
 16.4133      # Now execute the test
 16.4134  
 16.4135 -if test "x$with_boot_jdk" != x; then
 16.4136 +  if test "x$with_boot_jdk" != x; then
 16.4137      BOOT_JDK=$with_boot_jdk
 16.4138      BOOT_JDK_FOUND=maybe
 16.4139      { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using configure arguments" >&5
 16.4140  $as_echo "$as_me: Found potential Boot JDK using configure arguments" >&6;}
 16.4141 -fi
 16.4142 +  fi
 16.4143  
 16.4144  
 16.4145      # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
 16.4146 @@ -11318,161 +11316,161 @@
 16.4147      fi # end check boot jdk found
 16.4148    fi
 16.4149  
 16.4150 -if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then
 16.4151 -  # Having specified an argument which is incorrect will produce an instant failure;
 16.4152 -  # we should not go on looking
 16.4153 -  as_fn_error $? "The path given by --with-boot-jdk does not contain a valid Boot JDK" "$LINENO" 5
 16.4154 -fi
 16.4155 -
 16.4156 -# Test: Is bootjdk available from builddeps?
 16.4157 +  if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then
 16.4158 +    # Having specified an argument which is incorrect will produce an instant failure;
 16.4159 +    # we should not go on looking
 16.4160 +    as_fn_error $? "The path given by --with-boot-jdk does not contain a valid Boot JDK" "$LINENO" 5
 16.4161 +  fi
 16.4162 +
 16.4163 +  # Test: Is bootjdk available from builddeps?
 16.4164  
 16.4165    if test "x$BOOT_JDK_FOUND" = xno; then
 16.4166      # Now execute the test
 16.4167  
 16.4168  
 16.4169  
 16.4170 -    if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
 16.4171 -        # Source the builddeps file again, to make sure it uses the latest variables!
 16.4172 -        . $builddepsfile
 16.4173 -        # Look for a target and build machine specific resource!
 16.4174 -        eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
 16.4175 -        if test "x$resource" = x; then
 16.4176 -            # Ok, lets instead look for a target specific resource
 16.4177 -            eval resource=\${builddep_bootjdk_TARGET_${rewritten_target_var}}
 16.4178 -        fi
 16.4179 -        if test "x$resource" = x; then
 16.4180 -            # Ok, lets instead look for a build specific resource
 16.4181 -            eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}}
 16.4182 -        fi
 16.4183 -        if test "x$resource" = x; then
 16.4184 -            # Ok, lets instead look for a generic resource
 16.4185 -            # (The bootjdk comes from M4 and not the shell, thus no need for eval here.)
 16.4186 -            resource=${builddep_bootjdk}
 16.4187 -        fi
 16.4188 -        if test "x$resource" != x; then
 16.4189 -            { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for bootjdk" >&5
 16.4190 +  if test "x$with_builddeps_server" != x || test "x$with_builddeps_conf" != x; then
 16.4191 +    # Source the builddeps file again, to make sure it uses the latest variables!
 16.4192 +    . $builddepsfile
 16.4193 +    # Look for a target and build machine specific resource!
 16.4194 +    eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}_TARGET_${rewritten_target_var}}
 16.4195 +    if test "x$resource" = x; then
 16.4196 +      # Ok, lets instead look for a target specific resource
 16.4197 +      eval resource=\${builddep_bootjdk_TARGET_${rewritten_target_var}}
 16.4198 +    fi
 16.4199 +    if test "x$resource" = x; then
 16.4200 +      # Ok, lets instead look for a build specific resource
 16.4201 +      eval resource=\${builddep_bootjdk_BUILD_${rewritten_build_var}}
 16.4202 +    fi
 16.4203 +    if test "x$resource" = x; then
 16.4204 +      # Ok, lets instead look for a generic resource
 16.4205 +      # (The bootjdk comes from M4 and not the shell, thus no need for eval here.)
 16.4206 +      resource=${builddep_bootjdk}
 16.4207 +    fi
 16.4208 +    if test "x$resource" != x; then
 16.4209 +      { $as_echo "$as_me:${as_lineno-$LINENO}: Using builddeps $resource for bootjdk" >&5
 16.4210  $as_echo "$as_me: Using builddeps $resource for bootjdk" >&6;}
 16.4211 -	    # If the resource in the builddeps.conf file is an existing directory,
 16.4212 -	    # for example /java/linux/cups
 16.4213 -	    if test -d ${resource}; then
 16.4214 -	       depdir=${resource}
 16.4215 -	    else
 16.4216 -
 16.4217 -# bootjdk is for example mymodule
 16.4218 -# $resource is for example libs/general/libmymod_1_2_3.zip
 16.4219 -# $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
 16.4220 -# $with_builddeps_dir is for example /localhome/builddeps
 16.4221 -# depdir is the name of the variable into which we store the depdir, eg MYMOD
 16.4222 -# Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
 16.4223 -# unzip into the directory: /localhome/builddeps/libmymod_1_2_3
 16.4224 -    filename=`basename $resource`
 16.4225 -    filebase=`echo $filename | sed 's/\.[^\.]*$//'`
 16.4226 -    filebase=${filename%%.*}
 16.4227 -    extension=${filename#*.}
 16.4228 -    installdir=$with_builddeps_dir/$filebase
 16.4229 -    if test ! -f $installdir/$filename.unpacked; then
 16.4230 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&5
 16.4231 +      # If the resource in the builddeps.conf file is an existing directory,
 16.4232 +      # for example /java/linux/cups
 16.4233 +      if test -d ${resource}; then
 16.4234 +        depdir=${resource}
 16.4235 +      else
 16.4236 +
 16.4237 +  # bootjdk is for example mymodule
 16.4238 +  # $resource is for example libs/general/libmymod_1_2_3.zip
 16.4239 +  # $with_builddeps_server is for example ftp://mybuilddeps.myserver.com/builddeps
 16.4240 +  # $with_builddeps_dir is for example /localhome/builddeps
 16.4241 +  # depdir is the name of the variable into which we store the depdir, eg MYMOD
 16.4242 +  # Will download ftp://mybuilddeps.myserver.com/builddeps/libs/general/libmymod_1_2_3.zip and
 16.4243 +  # unzip into the directory: /localhome/builddeps/libmymod_1_2_3
 16.4244 +  filename=`basename $resource`
 16.4245 +  filebase=`echo $filename | sed 's/\.[^\.]*$//'`
 16.4246 +  filebase=${filename%%.*}
 16.4247 +  extension=${filename#*.}
 16.4248 +  installdir=$with_builddeps_dir/$filebase
 16.4249 +  if test ! -f $installdir/$filename.unpacked; then
 16.4250 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&5
 16.4251  $as_echo "$as_me: Downloading build dependency bootjdk from $with_builddeps_server/$resource and installing into $installdir" >&6;}
 16.4252 -        if test ! -d $installdir; then
 16.4253 -            mkdir -p $installdir
 16.4254 -        fi
 16.4255 -        if test ! -d $installdir; then
 16.4256 -            as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
 16.4257 -        fi
 16.4258 -        tmpfile=`mktemp $installdir/bootjdk.XXXXXXXXX`
 16.4259 -        touch $tmpfile
 16.4260 -        if test ! -f $tmpfile; then
 16.4261 -            as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
 16.4262 -        fi
 16.4263 -
 16.4264 -    # $with_builddeps_server/$resource  is the ftp://abuilddeps.server.com/libs/cups.zip
 16.4265 -    # $tmpfile is the local file name for the downloaded file.
 16.4266 -    VALID_TOOL=no
 16.4267 -    if test "x$BDEPS_FTP" = xwget; then
 16.4268 -       VALID_TOOL=yes
 16.4269 -       wget -O $tmpfile $with_builddeps_server/$resource
 16.4270 -    fi
 16.4271 -    if test "x$BDEPS_FTP" = xlftp; then
 16.4272 -       VALID_TOOL=yes
 16.4273 -       lftp -c "get $with_builddeps_server/$resource  -o $tmpfile"
 16.4274 -    fi
 16.4275 -    if test "x$BDEPS_FTP" = xftp; then
 16.4276 -        VALID_TOOL=yes
 16.4277 -        FTPSERVER=`echo $with_builddeps_server/$resource  | cut -f 3 -d '/'`
 16.4278 -        FTPPATH=`echo $with_builddeps_server/$resource  | cut -f 4- -d '/'`
 16.4279 -        FTPUSERPWD=${FTPSERVER%%@*}
 16.4280 -        if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
 16.4281 -            FTPUSER=${userpwd%%:*}
 16.4282 -            FTPPWD=${userpwd#*@}
 16.4283 -            FTPSERVER=${FTPSERVER#*@}
 16.4284 -        else
 16.4285 -            FTPUSER=ftp
 16.4286 -            FTPPWD=ftp
 16.4287 -        fi
 16.4288 -        # the "pass" command does not work on some
 16.4289 -        # ftp clients (read ftp.exe) but if it works,
 16.4290 -        # passive mode is better!
 16.4291 -        (\
 16.4292 -            echo "user $FTPUSER $FTPPWD"        ;\
 16.4293 -            echo "pass"                         ;\
 16.4294 -            echo "bin"                          ;\
 16.4295 -            echo "get $FTPPATH $tmpfile"              ;\
 16.4296 -        ) | ftp -in $FTPSERVER
 16.4297 -    fi
 16.4298 -    if test "x$VALID_TOOL" != xyes; then
 16.4299 -       as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
 16.4300 -    fi
 16.4301 -
 16.4302 -        mv $tmpfile $installdir/$filename
 16.4303 -        if test ! -s $installdir/$filename; then
 16.4304 -            as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
 16.4305 -        fi
 16.4306 -        case "$extension" in
 16.4307 -            zip)  echo "Unzipping $installdir/$filename..."
 16.4308 -               (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
 16.4309 -            ;;
 16.4310 -            tar.gz) echo "Untaring $installdir/$filename..."
 16.4311 -               (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
 16.4312 -            ;;
 16.4313 -            tgz) echo "Untaring $installdir/$filename..."
 16.4314 -               (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
 16.4315 -            ;;
 16.4316 -            *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
 16.4317 -            ;;
 16.4318 -        esac
 16.4319 -    fi
 16.4320 -    if test -f $installdir/$filename.unpacked; then
 16.4321 -        depdir=$installdir
 16.4322 -    fi
 16.4323 -
 16.4324 -	    fi
 16.4325 -            # Source the builddeps file again, because in the previous command, the depdir
 16.4326 -            # was updated to point at the current build dependency install directory.
 16.4327 -            . $builddepsfile
 16.4328 -            # Now extract variables from the builddeps.conf files.
 16.4329 -            theroot=${builddep_bootjdk_ROOT}
 16.4330 -            thecflags=${builddep_bootjdk_CFLAGS}
 16.4331 -            thelibs=${builddep_bootjdk_LIBS}
 16.4332 -            if test "x$depdir" = x; then
 16.4333 -                as_fn_error $? "Could not download build dependency bootjdk" "$LINENO" 5
 16.4334 -            fi
 16.4335 -            BOOT_JDK=$depdir
 16.4336 -            if test "x$theroot" != x; then
 16.4337 -               BOOT_JDK="$theroot"
 16.4338 -            fi
 16.4339 -            if test "x$thecflags" != x; then
 16.4340 -               BOOT_JDK_CFLAGS="$thecflags"
 16.4341 -            fi
 16.4342 -            if test "x$thelibs" != x; then
 16.4343 -               BOOT_JDK_LIBS="$thelibs"
 16.4344 -            fi
 16.4345 -            BOOT_JDK_FOUND=maybe
 16.4346 -            else BOOT_JDK_FOUND=no
 16.4347 -
 16.4348 -        fi
 16.4349 -        else BOOT_JDK_FOUND=no
 16.4350 -
 16.4351 -    fi
 16.4352 +    if test ! -d $installdir; then
 16.4353 +      mkdir -p $installdir
 16.4354 +    fi
 16.4355 +    if test ! -d $installdir; then
 16.4356 +      as_fn_error $? "Could not create directory $installdir" "$LINENO" 5
 16.4357 +    fi
 16.4358 +    tmpfile=`mktemp $installdir/bootjdk.XXXXXXXXX`
 16.4359 +    touch $tmpfile
 16.4360 +    if test ! -f $tmpfile; then
 16.4361 +      as_fn_error $? "Could not create files in directory $installdir" "$LINENO" 5
 16.4362 +    fi
 16.4363 +
 16.4364 +  # $with_builddeps_server/$resource  is the ftp://abuilddeps.server.com/libs/cups.zip
 16.4365 +  # $tmpfile is the local file name for the downloaded file.
 16.4366 +  VALID_TOOL=no
 16.4367 +  if test "x$BDEPS_FTP" = xwget; then
 16.4368 +    VALID_TOOL=yes
 16.4369 +    wget -O $tmpfile $with_builddeps_server/$resource
 16.4370 +  fi
 16.4371 +  if test "x$BDEPS_FTP" = xlftp; then
 16.4372 +    VALID_TOOL=yes
 16.4373 +    lftp -c "get $with_builddeps_server/$resource  -o $tmpfile"
 16.4374 +  fi
 16.4375 +  if test "x$BDEPS_FTP" = xftp; then
 16.4376 +    VALID_TOOL=yes
 16.4377 +    FTPSERVER=`echo $with_builddeps_server/$resource  | cut -f 3 -d '/'`
 16.4378 +    FTPPATH=`echo $with_builddeps_server/$resource  | cut -f 4- -d '/'`
 16.4379 +    FTPUSERPWD=${FTPSERVER%%@*}
 16.4380 +    if test "x$FTPSERVER" != "x$FTPUSERPWD"; then
 16.4381 +      FTPUSER=${userpwd%%:*}
 16.4382 +      FTPPWD=${userpwd#*@}
 16.4383 +      FTPSERVER=${FTPSERVER#*@}
 16.4384 +    else
 16.4385 +      FTPUSER=ftp
 16.4386 +      FTPPWD=ftp
 16.4387 +    fi
 16.4388 +    # the "pass" command does not work on some
 16.4389 +    # ftp clients (read ftp.exe) but if it works,
 16.4390 +    # passive mode is better!
 16.4391 +    ( \
 16.4392 +        echo "user $FTPUSER $FTPPWD"        ; \
 16.4393 +        echo "pass"                         ; \
 16.4394 +        echo "bin"                          ; \
 16.4395 +        echo "get $FTPPATH $tmpfile"              ; \
 16.4396 +    ) | ftp -in $FTPSERVER
 16.4397 +  fi
 16.4398 +  if test "x$VALID_TOOL" != xyes; then
 16.4399 +    as_fn_error $? "I do not know how to use the tool: $BDEPS_FTP" "$LINENO" 5
 16.4400 +  fi
 16.4401 +
 16.4402 +    mv $tmpfile $installdir/$filename
 16.4403 +    if test ! -s $installdir/$filename; then
 16.4404 +      as_fn_error $? "Could not download $with_builddeps_server/$resource" "$LINENO" 5
 16.4405 +    fi
 16.4406 +    case "$extension" in
 16.4407 +      zip)  echo "Unzipping $installdir/$filename..."
 16.4408 +        (cd $installdir ; rm -f $installdir/$filename.unpacked ; $BDEPS_UNZIP $installdir/$filename > /dev/null && touch $installdir/$filename.unpacked)
 16.4409 +        ;;
 16.4410 +      tar.gz) echo "Untaring $installdir/$filename..."
 16.4411 +        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
 16.4412 +        ;;
 16.4413 +      tgz) echo "Untaring $installdir/$filename..."
 16.4414 +        (cd $installdir ; rm -f $installdir/$filename.unpacked ; tar xzf $installdir/$filename && touch $installdir/$filename.unpacked)
 16.4415 +        ;;
 16.4416 +      *) as_fn_error $? "Cannot handle build depency archive with extension $extension" "$LINENO" 5
 16.4417 +        ;;
 16.4418 +    esac
 16.4419 +  fi
 16.4420 +  if test -f $installdir/$filename.unpacked; then
 16.4421 +    depdir=$installdir
 16.4422 +  fi
 16.4423 +
 16.4424 +      fi
 16.4425 +      # Source the builddeps file again, because in the previous command, the depdir
 16.4426 +      # was updated to point at the current build dependency install directory.
 16.4427 +      . $builddepsfile
 16.4428 +      # Now extract variables from the builddeps.conf files.
 16.4429 +      theroot=${builddep_bootjdk_ROOT}
 16.4430 +      thecflags=${builddep_bootjdk_CFLAGS}
 16.4431 +      thelibs=${builddep_bootjdk_LIBS}
 16.4432 +      if test "x$depdir" = x; then
 16.4433 +        as_fn_error $? "Could not download build dependency bootjdk" "$LINENO" 5
 16.4434 +      fi
 16.4435 +      BOOT_JDK=$depdir
 16.4436 +      if test "x$theroot" != x; then
 16.4437 +        BOOT_JDK="$theroot"
 16.4438 +      fi
 16.4439 +      if test "x$thecflags" != x; then
 16.4440 +        BOOT_JDK_CFLAGS="$thecflags"
 16.4441 +      fi
 16.4442 +      if test "x$thelibs" != x; then
 16.4443 +        BOOT_JDK_LIBS="$thelibs"
 16.4444 +      fi
 16.4445 +      BOOT_JDK_FOUND=maybe
 16.4446 +      else BOOT_JDK_FOUND=no
 16.4447 +
 16.4448 +    fi
 16.4449 +    else BOOT_JDK_FOUND=no
 16.4450 +
 16.4451 +  fi
 16.4452  
 16.4453  
 16.4454  
 16.4455 @@ -11651,13 +11649,13 @@
 16.4456    fi
 16.4457  
 16.4458  
 16.4459 -# Test: Is $JAVA_HOME set?
 16.4460 +  # Test: Is $JAVA_HOME set?
 16.4461  
 16.4462    if test "x$BOOT_JDK_FOUND" = xno; then
 16.4463      # Now execute the test
 16.4464  
 16.4465 -    if test "x$JAVA_HOME" != x; then
 16.4466 -        JAVA_HOME_PROCESSED="$JAVA_HOME"
 16.4467 +  if test "x$JAVA_HOME" != x; then
 16.4468 +    JAVA_HOME_PROCESSED="$JAVA_HOME"
 16.4469  
 16.4470    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 16.4471  
 16.4472 @@ -11780,18 +11778,18 @@
 16.4473      JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`"
 16.4474    fi
 16.4475  
 16.4476 -        if test ! -d "$JAVA_HOME_PROCESSED"; then
 16.4477 -            { $as_echo "$as_me:${as_lineno-$LINENO}: Your JAVA_HOME points to a non-existing directory!" >&5
 16.4478 +    if test ! -d "$JAVA_HOME_PROCESSED"; then
 16.4479 +      { $as_echo "$as_me:${as_lineno-$LINENO}: Your JAVA_HOME points to a non-existing directory!" >&5
 16.4480  $as_echo "$as_me: Your JAVA_HOME points to a non-existing directory!" >&6;}
 16.4481 -        else
 16.4482 -          # Aha, the user has set a JAVA_HOME
 16.4483 -          # let us use that as the Boot JDK.
 16.4484 -          BOOT_JDK="$JAVA_HOME_PROCESSED"
 16.4485 -          BOOT_JDK_FOUND=maybe
 16.4486 -          { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using JAVA_HOME" >&5
 16.4487 +    else
 16.4488 +      # Aha, the user has set a JAVA_HOME
 16.4489 +      # let us use that as the Boot JDK.
 16.4490 +      BOOT_JDK="$JAVA_HOME_PROCESSED"
 16.4491 +      BOOT_JDK_FOUND=maybe
 16.4492 +      { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using JAVA_HOME" >&5
 16.4493  $as_echo "$as_me: Found potential Boot JDK using JAVA_HOME" >&6;}
 16.4494 -        fi
 16.4495 -    fi
 16.4496 +    fi
 16.4497 +  fi
 16.4498  
 16.4499  
 16.4500      # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
 16.4501 @@ -11969,17 +11967,17 @@
 16.4502    fi
 16.4503  
 16.4504  
 16.4505 -# Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
 16.4506 +  # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
 16.4507  
 16.4508    if test "x$BOOT_JDK_FOUND" = xno; then
 16.4509      # Now execute the test
 16.4510  
 16.4511 -    if test -x /usr/libexec/java_home; then
 16.4512 -        BOOT_JDK=`/usr/libexec/java_home`
 16.4513 -        BOOT_JDK_FOUND=maybe
 16.4514 -        { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using /usr/libexec/java_home" >&5
 16.4515 +  if test -x /usr/libexec/java_home; then
 16.4516 +    BOOT_JDK=`/usr/libexec/java_home`
 16.4517 +    BOOT_JDK_FOUND=maybe
 16.4518 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using /usr/libexec/java_home" >&5
 16.4519  $as_echo "$as_me: Found potential Boot JDK using /usr/libexec/java_home" >&6;}
 16.4520 -    fi
 16.4521 +  fi
 16.4522  
 16.4523  
 16.4524      # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
 16.4525 @@ -12157,12 +12155,12 @@
 16.4526    fi
 16.4527  
 16.4528  
 16.4529 -# Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
 16.4530 +  # Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
 16.4531  
 16.4532    if test "x$BOOT_JDK_FOUND" = xno; then
 16.4533      # Now execute the test
 16.4534  
 16.4535 -    # Extract the first word of "javac", so it can be a program name with args.
 16.4536 +  # Extract the first word of "javac", so it can be a program name with args.
 16.4537  set dummy javac; ac_word=$2
 16.4538  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.4539  $as_echo_n "checking for $ac_word... " >&6; }
 16.4540 @@ -12202,7 +12200,7 @@
 16.4541  fi
 16.4542  
 16.4543  
 16.4544 -    # Extract the first word of "java", so it can be a program name with args.
 16.4545 +  # Extract the first word of "java", so it can be a program name with args.
 16.4546  set dummy java; ac_word=$2
 16.4547  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 16.4548  $as_echo_n "checking for $ac_word... " >&6; }
 16.4549 @@ -12242,72 +12240,72 @@
 16.4550  fi
 16.4551  
 16.4552  
 16.4553 -    BINARY="$JAVAC_CHECK"
 16.4554 -    if test "x$JAVAC_CHECK" = x; then
 16.4555 -        BINARY="$JAVA_CHECK"
 16.4556 -    fi
 16.4557 -    if test "x$BINARY" != x; then
 16.4558 -        # So there is a java(c) binary, it might be part of a JDK.
 16.4559 -        # Lets find the JDK/JRE directory by following symbolic links.
 16.4560 -        # Linux/GNU systems often have links from /usr/bin/java to
 16.4561 -        # /etc/alternatives/java to the real JDK binary.
 16.4562 -
 16.4563 -    if test "x$OPENJDK_BUILD_OS" != xwindows; then
 16.4564 -        # Follow a chain of symbolic links. Use readlink
 16.4565 -        # where it exists, else fall back to horribly
 16.4566 -        # complicated shell code.
 16.4567 -        if test "x$READLINK_TESTED" != yes; then
 16.4568 -            # On MacOSX there is a readlink tool with a different
 16.4569 -            # purpose than the GNU readlink tool. Check the found readlink.
 16.4570 -            ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
 16.4571 -            if test "x$ISGNU" = x; then
 16.4572 -                 # A readlink that we do not know how to use.
 16.4573 -                 # Are there other non-GNU readlinks out there?
 16.4574 -                 READLINK_TESTED=yes
 16.4575 -                 READLINK=
 16.4576 -            fi
 16.4577 -        fi
 16.4578 -
 16.4579 -        if test "x$READLINK" != x; then
 16.4580 -            BINARY=`$READLINK -f $BINARY`
 16.4581 -        else
 16.4582 -            # Save the current directory for restoring afterwards
 16.4583 -            STARTDIR=$PWD
 16.4584 -            COUNTER=0
 16.4585 -            sym_link_dir=`$DIRNAME $BINARY`
 16.4586 -            sym_link_file=`$BASENAME $BINARY`
 16.4587 -            cd $sym_link_dir
 16.4588 -            # Use -P flag to resolve symlinks in directories.
 16.4589 -            cd `$THEPWDCMD -P`
 16.4590 -            sym_link_dir=`$THEPWDCMD -P`
 16.4591 -            # Resolve file symlinks
 16.4592 -            while test $COUNTER -lt 20; do
 16.4593 -                ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 16.4594 -                if test "x$ISLINK" == x; then
 16.4595 -                    # This is not a symbolic link! We are done!
 16.4596 -                    break
 16.4597 -                fi
 16.4598 -                # Again resolve directory symlinks since the target of the just found
 16.4599 -                # link could be in a different directory
 16.4600 -                cd `$DIRNAME $ISLINK`
 16.4601 -                sym_link_dir=`$THEPWDCMD -P`
 16.4602 -                sym_link_file=`$BASENAME $ISLINK`
 16.4603 -                let COUNTER=COUNTER+1
 16.4604 -            done
 16.4605 -            cd $STARTDIR
 16.4606 -            BINARY=$sym_link_dir/$sym_link_file
 16.4607 -        fi
 16.4608 -    fi
 16.4609 -
 16.4610 -        BOOT_JDK=`dirname "$BINARY"`
 16.4611 -        BOOT_JDK=`cd "$BOOT_JDK/.."; pwd`
 16.4612 -        if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then
 16.4613 -            # Looks like we found ourselves an JDK
 16.4614 -            BOOT_JDK_FOUND=maybe
 16.4615 -            { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using java(c) in PATH" >&5
 16.4616 +  BINARY="$JAVAC_CHECK"
 16.4617 +  if test "x$JAVAC_CHECK" = x; then
 16.4618 +    BINARY="$JAVA_CHECK"
 16.4619 +  fi
 16.4620 +  if test "x$BINARY" != x; then
 16.4621 +    # So there is a java(c) binary, it might be part of a JDK.
 16.4622 +    # Lets find the JDK/JRE directory by following symbolic links.
 16.4623 +    # Linux/GNU systems often have links from /usr/bin/java to
 16.4624 +    # /etc/alternatives/java to the real JDK binary.
 16.4625 +
 16.4626 +  if test "x$OPENJDK_BUILD_OS" != xwindows; then
 16.4627 +    # Follow a chain of symbolic links. Use readlink
 16.4628 +    # where it exists, else fall back to horribly
 16.4629 +    # complicated shell code.
 16.4630 +    if test "x$READLINK_TESTED" != yes; then
 16.4631 +      # On MacOSX there is a readlink tool with a different
 16.4632 +      # purpose than the GNU readlink tool. Check the found readlink.
 16.4633 +      ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
 16.4634 +      if test "x$ISGNU" = x; then
 16.4635 +        # A readlink that we do not know how to use.
 16.4636 +        # Are there other non-GNU readlinks out there?
 16.4637 +        READLINK_TESTED=yes
 16.4638 +        READLINK=
 16.4639 +      fi
 16.4640 +    fi
 16.4641 +
 16.4642 +    if test "x$READLINK" != x; then
 16.4643 +      BINARY=`$READLINK -f $BINARY`
 16.4644 +    else
 16.4645 +      # Save the current directory for restoring afterwards
 16.4646 +      STARTDIR=$PWD
 16.4647 +      COUNTER=0
 16.4648 +      sym_link_dir=`$DIRNAME $BINARY`
 16.4649 +      sym_link_file=`$BASENAME $BINARY`
 16.4650 +      cd $sym_link_dir
 16.4651 +      # Use -P flag to resolve symlinks in directories.
 16.4652 +      cd `$THEPWDCMD -P`
 16.4653 +      sym_link_dir=`$THEPWDCMD -P`
 16.4654 +      # Resolve file symlinks
 16.4655 +      while test $COUNTER -lt 20; do
 16.4656 +        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
 16.4657 +        if test "x$ISLINK" == x; then
 16.4658 +          # This is not a symbolic link! We are done!
 16.4659 +          break
 16.4660 +        fi
 16.4661 +        # Again resolve directory symlinks since the target of the just found
 16.4662 +        # link could be in a different directory
 16.4663 +        cd `$DIRNAME $ISLINK`
 16.4664 +        sym_link_dir=`$THEPWDCMD -P`
 16.4665 +        sym_link_file=`$BASENAME $ISLINK`
 16.4666 +        let COUNTER=COUNTER+1
 16.4667 +      done
 16.4668 +      cd $STARTDIR
 16.4669 +      BINARY=$sym_link_dir/$sym_link_file
 16.4670 +    fi
 16.4671 +  fi
 16.4672 +
 16.4673 +    BOOT_JDK=`dirname "$BINARY"`
 16.4674 +    BOOT_JDK=`cd "$BOOT_JDK/.."; pwd`
 16.4675 +    if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then
 16.4676 +      # Looks like we found ourselves an JDK
 16.4677 +      BOOT_JDK_FOUND=maybe
 16.4678 +      { $as_echo "$as_me:${as_lineno-$LINENO}: Found potential Boot JDK using java(c) in PATH" >&5
 16.4679  $as_echo "$as_me: Found potential Boot JDK using java(c) in PATH" >&6;}
 16.4680 -        fi
 16.4681 -    fi
 16.4682 +    fi
 16.4683 +  fi
 16.4684  
 16.4685  
 16.4686      # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
 16.4687 @@ -12485,7 +12483,7 @@
 16.4688    fi
 16.4689  
 16.4690  
 16.4691 -# Test: Is there a JDK installed in default, well-known locations?
 16.4692 +  # Test: Is there a JDK installed in default, well-known locations?
 16.4693  
 16.4694    if test "x$BOOT_JDK_FOUND" = xno; then
 16.4695      # Now execute the test
 16.4696 @@ -15715,67 +15713,67 @@
 16.4697    fi
 16.4698  
 16.4699  
 16.4700 -# If we haven't found anything yet, we've truly lost. Give up.
 16.4701 -if test "x$BOOT_JDK_FOUND" = xno; then
 16.4702 -
 16.4703 -    # Print a helpful message on how to acquire the necessary build dependency.
 16.4704 -    # openjdk is the help tag: freetyp2, cups, pulse, alsa etc
 16.4705 -    MISSING_DEPENDENCY=openjdk
 16.4706 -    PKGHANDLER_COMMAND=
 16.4707 -
 16.4708 -    case $PKGHANDLER in
 16.4709 -	apt-get)
 16.4710 -                apt_help     $MISSING_DEPENDENCY ;;
 16.4711 +  # If we haven't found anything yet, we've truly lost. Give up.
 16.4712 +  if test "x$BOOT_JDK_FOUND" = xno; then
 16.4713 +
 16.4714 +  # Print a helpful message on how to acquire the necessary build dependency.
 16.4715 +  # openjdk is the help tag: freetyp2, cups, pulse, alsa etc
 16.4716 +  MISSING_DEPENDENCY=openjdk
 16.4717 +  PKGHANDLER_COMMAND=
 16.4718 +
 16.4719 +  case $PKGHANDLER in
 16.4720 +    apt-get)
 16.4721 +      apt_help     $MISSING_DEPENDENCY ;;
 16.4722      yum)
 16.4723 -                yum_help     $MISSING_DEPENDENCY ;;
 16.4724 -	port)
 16.4725 -                port_help    $MISSING_DEPENDENCY ;;
 16.4726 -	pkgutil)
 16.4727 -                pkgutil_help $MISSING_DEPENDENCY ;;
 16.4728 -	pkgadd)
 16.4729 -                pkgadd_help  $MISSING_DEPENDENCY ;;
 16.4730 +      yum_help     $MISSING_DEPENDENCY ;;
 16.4731 +    port)
 16.4732 +      port_help    $MISSING_DEPENDENCY ;;
 16.4733 +    pkgutil)
 16.4734 +      pkgutil_help $MISSING_DEPENDENCY ;;
 16.4735 +    pkgadd)
 16.4736 +      pkgadd_help  $MISSING_DEPENDENCY ;;
 16.4737      * )
 16.4738        break ;;
 16.4739 -    esac
 16.4740 -
 16.4741 -    if test "x$PKGHANDLER_COMMAND" != x; then
 16.4742 -        HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
 16.4743 -    fi
 16.4744 -
 16.4745 -  { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find a valid Boot JDK. $HELP_MSG" >&5
 16.4746 +  esac
 16.4747 +
 16.4748 +  if test "x$PKGHANDLER_COMMAND" != x; then
 16.4749 +    HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
 16.4750 +  fi
 16.4751 +
 16.4752 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find a valid Boot JDK. $HELP_MSG" >&5
 16.4753  $as_echo "$as_me: Could not find a valid Boot JDK. $HELP_MSG" >&6;}
 16.4754 -  { $as_echo "$as_me:${as_lineno-$LINENO}: This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4755 +    { $as_echo "$as_me:${as_lineno-$LINENO}: This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4756  $as_echo "$as_me: This might be fixed by explicitely setting --with-boot-jdk" >&6;}
 16.4757 -  as_fn_error $? "Cannot continue" "$LINENO" 5
 16.4758 -fi
 16.4759 -
 16.4760 -# Setup proper paths for what we found
 16.4761 -BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
 16.4762 -if test ! -f "$BOOT_RTJAR"; then
 16.4763 +    as_fn_error $? "Cannot continue" "$LINENO" 5
 16.4764 +  fi
 16.4765 +
 16.4766 +  # Setup proper paths for what we found
 16.4767 +  BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
 16.4768 +  if test ! -f "$BOOT_RTJAR"; then
 16.4769      # On MacOSX it is called classes.jar
 16.4770      BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar"
 16.4771      if test -f "$BOOT_RTJAR"; then
 16.4772        # Remove the ..
 16.4773        BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}"
 16.4774      fi
 16.4775 -fi
 16.4776 -BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
 16.4777 -BOOT_JDK="$BOOT_JDK"
 16.4778 -
 16.4779 -
 16.4780 -
 16.4781 -
 16.4782 -# Setup tools from the Boot JDK.
 16.4783 +  fi
 16.4784 +  BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
 16.4785 +  BOOT_JDK="$BOOT_JDK"
 16.4786 +
 16.4787 +
 16.4788 +
 16.4789 +
 16.4790 +  # Setup tools from the Boot JDK.
 16.4791  
 16.4792    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for java in Boot JDK" >&5
 16.4793  $as_echo_n "checking for java in Boot JDK... " >&6; }
 16.4794    JAVA=$BOOT_JDK/bin/java
 16.4795    if test ! -x $JAVA; then
 16.4796 -      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4797 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4798  $as_echo "not found" >&6; }
 16.4799 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4800 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4801  $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
 16.4802 -      as_fn_error $? "Could not find java in the Boot JDK" "$LINENO" 5
 16.4803 +    as_fn_error $? "Could not find java in the Boot JDK" "$LINENO" 5
 16.4804    fi
 16.4805    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 16.4806  $as_echo "ok" >&6; }
 16.4807 @@ -15785,11 +15783,11 @@
 16.4808  $as_echo_n "checking for javac in Boot JDK... " >&6; }
 16.4809    JAVAC=$BOOT_JDK/bin/javac
 16.4810    if test ! -x $JAVAC; then
 16.4811 -      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4812 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4813  $as_echo "not found" >&6; }
 16.4814 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4815 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4816  $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
 16.4817 -      as_fn_error $? "Could not find javac in the Boot JDK" "$LINENO" 5
 16.4818 +    as_fn_error $? "Could not find javac in the Boot JDK" "$LINENO" 5
 16.4819    fi
 16.4820    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 16.4821  $as_echo "ok" >&6; }
 16.4822 @@ -15799,11 +15797,11 @@
 16.4823  $as_echo_n "checking for javah in Boot JDK... " >&6; }
 16.4824    JAVAH=$BOOT_JDK/bin/javah
 16.4825    if test ! -x $JAVAH; then
 16.4826 -      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4827 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4828  $as_echo "not found" >&6; }
 16.4829 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4830 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4831  $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
 16.4832 -      as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
 16.4833 +    as_fn_error $? "Could not find javah in the Boot JDK" "$LINENO" 5
 16.4834    fi
 16.4835    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 16.4836  $as_echo "ok" >&6; }
 16.4837 @@ -15813,11 +15811,11 @@
 16.4838  $as_echo_n "checking for javap in Boot JDK... " >&6; }
 16.4839    JAVAP=$BOOT_JDK/bin/javap
 16.4840    if test ! -x $JAVAP; then
 16.4841 -      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4842 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4843  $as_echo "not found" >&6; }
 16.4844 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4845 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4846  $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
 16.4847 -      as_fn_error $? "Could not find javap in the Boot JDK" "$LINENO" 5
 16.4848 +    as_fn_error $? "Could not find javap in the Boot JDK" "$LINENO" 5
 16.4849    fi
 16.4850    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 16.4851  $as_echo "ok" >&6; }
 16.4852 @@ -15827,11 +15825,11 @@
 16.4853  $as_echo_n "checking for jar in Boot JDK... " >&6; }
 16.4854    JAR=$BOOT_JDK/bin/jar
 16.4855    if test ! -x $JAR; then
 16.4856 -      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4857 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4858  $as_echo "not found" >&6; }
 16.4859 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4860 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4861  $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
 16.4862 -      as_fn_error $? "Could not find jar in the Boot JDK" "$LINENO" 5
 16.4863 +    as_fn_error $? "Could not find jar in the Boot JDK" "$LINENO" 5
 16.4864    fi
 16.4865    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 16.4866  $as_echo "ok" >&6; }
 16.4867 @@ -15841,11 +15839,11 @@
 16.4868  $as_echo_n "checking for rmic in Boot JDK... " >&6; }
 16.4869    RMIC=$BOOT_JDK/bin/rmic
 16.4870    if test ! -x $RMIC; then
 16.4871 -      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4872 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4873  $as_echo "not found" >&6; }
 16.4874 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4875 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4876  $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
 16.4877 -      as_fn_error $? "Could not find rmic in the Boot JDK" "$LINENO" 5
 16.4878 +    as_fn_error $? "Could not find rmic in the Boot JDK" "$LINENO" 5
 16.4879    fi
 16.4880    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 16.4881  $as_echo "ok" >&6; }
 16.4882 @@ -15855,28 +15853,28 @@
 16.4883  $as_echo_n "checking for native2ascii in Boot JDK... " >&6; }
 16.4884    NATIVE2ASCII=$BOOT_JDK/bin/native2ascii
 16.4885    if test ! -x $NATIVE2ASCII; then
 16.4886 -      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4887 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 16.4888  $as_echo "not found" >&6; }
 16.4889 -      { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4890 +    { $as_echo "$as_me:${as_lineno-$LINENO}: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&5
 16.4891  $as_echo "$as_me: Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk" >&6;}
 16.4892 -      as_fn_error $? "Could not find native2ascii in the Boot JDK" "$LINENO" 5
 16.4893 +    as_fn_error $? "Could not find native2ascii in the Boot JDK" "$LINENO" 5
 16.4894    fi
 16.4895    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 16.4896  $as_echo "ok" >&6; }
 16.4897  
 16.4898  
 16.4899 -# Finally, set some other options...
 16.4900 -
 16.4901 -# When compiling code to be executed by the Boot JDK, force jdk7 compatibility.
 16.4902 -BOOT_JDK_SOURCETARGET="-source 7 -target 7"
 16.4903 -
 16.4904 -
 16.4905 -
 16.4906 -
 16.4907 -##############################################################################
 16.4908 -#
 16.4909 -# Specify options for anything that is run with the Boot JDK.
 16.4910 -#
 16.4911 +  # Finally, set some other options...
 16.4912 +
 16.4913 +  # When compiling code to be executed by the Boot JDK, force jdk7 compatibility.
 16.4914 +  BOOT_JDK_SOURCETARGET="-source 7 -target 7"
 16.4915 +
 16.4916 +
 16.4917 +
 16.4918 +
 16.4919 +  ##############################################################################
 16.4920 +  #
 16.4921 +  # Specify options for anything that is run with the Boot JDK.
 16.4922 +  #
 16.4923  
 16.4924  # Check whether --with-boot-jdk-jvmargs was given.
 16.4925  if test "${with_boot_jdk_jvmargs+set}" = set; then :
 16.4926 @@ -15884,135 +15882,135 @@
 16.4927  fi
 16.4928  
 16.4929  
 16.4930 -if test "x$with_boot_jdk_jvmargs" = x; then
 16.4931 +  if test "x$with_boot_jdk_jvmargs" = x; then
 16.4932      # Not all JVM:s accept the same arguments on the command line.
 16.4933      # OpenJDK specific increase in thread stack for JDK build,
 16.4934      # well more specifically, when running javac.
 16.4935      if test "x$BUILD_NUM_BITS" = x32; then
 16.4936 -       STACK_SIZE=768
 16.4937 -    else
 16.4938 -       # Running Javac on a JVM on a 64-bit machine, the stack takes more space
 16.4939 -       # since 64-bit pointers are pushed on the stach. Apparently, we need
 16.4940 -       # to increase the stack space when javacing the JDK....
 16.4941 -       STACK_SIZE=1536
 16.4942 +      STACK_SIZE=768
 16.4943 +    else
 16.4944 +      # Running Javac on a JVM on a 64-bit machine, the stack takes more space
 16.4945 +      # since 64-bit pointers are pushed on the stach. Apparently, we need
 16.4946 +      # to increase the stack space when javacing the JDK....
 16.4947 +      STACK_SIZE=1536
 16.4948      fi
 16.4949  
 16.4950      # Minimum amount of heap memory.
 16.4951  
 16.4952 -    $ECHO "Check if jvm arg is ok: -Xms64M" >&5
 16.4953 -    $ECHO "Command: $JAVA -Xms64M -version" >&5
 16.4954 -    OUTPUT=`$JAVA -Xms64M -version 2>&1`
 16.4955 -    FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.4956 -    FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.4957 -    if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.4958 -        boot_jdk_jvmargs="$boot_jdk_jvmargs -Xms64M"
 16.4959 -	JVM_ARG_OK=true
 16.4960 -    else
 16.4961 -	$ECHO "Arg failed:" >&5
 16.4962 -	$ECHO "$OUTPUT" >&5
 16.4963 -	JVM_ARG_OK=false
 16.4964 -    fi
 16.4965 +  $ECHO "Check if jvm arg is ok: -Xms64M" >&5
 16.4966 +  $ECHO "Command: $JAVA -Xms64M -version" >&5
 16.4967 +  OUTPUT=`$JAVA -Xms64M -version 2>&1`
 16.4968 +  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.4969 +  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.4970 +  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.4971 +    boot_jdk_jvmargs="$boot_jdk_jvmargs -Xms64M"
 16.4972 +    JVM_ARG_OK=true
 16.4973 +  else
 16.4974 +    $ECHO "Arg failed:" >&5
 16.4975 +    $ECHO "$OUTPUT" >&5
 16.4976 +    JVM_ARG_OK=false
 16.4977 +  fi
 16.4978  
 16.4979      if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
 16.4980 -        # Why does macosx need more heap? Its the huge JDK batch.
 16.4981 -
 16.4982 -    $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5
 16.4983 -    $ECHO "Command: $JAVA -Xmx1600M -version" >&5
 16.4984 -    OUTPUT=`$JAVA -Xmx1600M -version 2>&1`
 16.4985 -    FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.4986 -    FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.4987 -    if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.4988 -        boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1600M"
 16.4989 -	JVM_ARG_OK=true
 16.4990 -    else
 16.4991 -	$ECHO "Arg failed:" >&5
 16.4992 -	$ECHO "$OUTPUT" >&5
 16.4993 -	JVM_ARG_OK=false
 16.4994 -    fi
 16.4995 -
 16.4996 -    else
 16.4997 -
 16.4998 -    $ECHO "Check if jvm arg is ok: -Xmx1100M" >&5
 16.4999 -    $ECHO "Command: $JAVA -Xmx1100M -version" >&5
 16.5000 -    OUTPUT=`$JAVA -Xmx1100M -version 2>&1`
 16.5001 -    FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.5002 -    FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.5003 -    if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.5004 -        boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1100M"
 16.5005 -	JVM_ARG_OK=true
 16.5006 -    else
 16.5007 -	$ECHO "Arg failed:" >&5
 16.5008 -	$ECHO "$OUTPUT" >&5
 16.5009 -	JVM_ARG_OK=false
 16.5010 -    fi
 16.5011 +      # Why does macosx need more heap? Its the huge JDK batch.
 16.5012 +
 16.5013 +  $ECHO "Check if jvm arg is ok: -Xmx1600M" >&5
 16.5014 +  $ECHO "Command: $JAVA -Xmx1600M -version" >&5
 16.5015 +  OUTPUT=`$JAVA -Xmx1600M -version 2>&1`
 16.5016 +  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.5017 +  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.5018 +  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.5019 +    boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1600M"
 16.5020 +    JVM_ARG_OK=true
 16.5021 +  else
 16.5022 +    $ECHO "Arg failed:" >&5
 16.5023 +    $ECHO "$OUTPUT" >&5
 16.5024 +    JVM_ARG_OK=false
 16.5025 +  fi
 16.5026 +
 16.5027 +    else
 16.5028 +
 16.5029 +  $ECHO "Check if jvm arg is ok: -Xmx1100M" >&5
 16.5030 +  $ECHO "Command: $JAVA -Xmx1100M -version" >&5
 16.5031 +  OUTPUT=`$JAVA -Xmx1100M -version 2>&1`
 16.5032 +  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.5033 +  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.5034 +  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.5035 +    boot_jdk_jvmargs="$boot_jdk_jvmargs -Xmx1100M"
 16.5036 +    JVM_ARG_OK=true
 16.5037 +  else
 16.5038 +    $ECHO "Arg failed:" >&5
 16.5039 +    $ECHO "$OUTPUT" >&5
 16.5040 +    JVM_ARG_OK=false
 16.5041 +  fi
 16.5042  
 16.5043      fi
 16.5044      # When is adding -client something that speeds up the JVM?
 16.5045      # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA])
 16.5046  
 16.5047 -    $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5
 16.5048 -    $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5
 16.5049 -    OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1`
 16.5050 -    FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.5051 -    FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.5052 -    if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.5053 -        boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:PermSize=32m"
 16.5054 -	JVM_ARG_OK=true
 16.5055 -    else
 16.5056 -	$ECHO "Arg failed:" >&5
 16.5057 -	$ECHO "$OUTPUT" >&5
 16.5058 -	JVM_ARG_OK=false
 16.5059 -    fi
 16.5060 -
 16.5061 -
 16.5062 -    $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5
 16.5063 -    $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5
 16.5064 -    OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1`
 16.5065 -    FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.5066 -    FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.5067 -    if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.5068 -        boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:MaxPermSize=160m"
 16.5069 -	JVM_ARG_OK=true
 16.5070 -    else
 16.5071 -	$ECHO "Arg failed:" >&5
 16.5072 -	$ECHO "$OUTPUT" >&5
 16.5073 -	JVM_ARG_OK=false
 16.5074 -    fi
 16.5075 -
 16.5076 -
 16.5077 -    $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5
 16.5078 -    $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5
 16.5079 -    OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1`
 16.5080 -    FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.5081 -    FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.5082 -    if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.5083 -        boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:ThreadStackSize=$STACK_SIZE"
 16.5084 -	JVM_ARG_OK=true
 16.5085 -    else
 16.5086 -	$ECHO "Arg failed:" >&5
 16.5087 -	$ECHO "$OUTPUT" >&5
 16.5088 -	JVM_ARG_OK=false
 16.5089 -    fi
 16.5090 +  $ECHO "Check if jvm arg is ok: -XX:PermSize=32m" >&5
 16.5091 +  $ECHO "Command: $JAVA -XX:PermSize=32m -version" >&5
 16.5092 +  OUTPUT=`$JAVA -XX:PermSize=32m -version 2>&1`
 16.5093 +  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.5094 +  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.5095 +  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.5096 +    boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:PermSize=32m"
 16.5097 +    JVM_ARG_OK=true
 16.5098 +  else
 16.5099 +    $ECHO "Arg failed:" >&5
 16.5100 +    $ECHO "$OUTPUT" >&5
 16.5101 +    JVM_ARG_OK=false
 16.5102 +  fi
 16.5103 +
 16.5104 +
 16.5105 +  $ECHO "Check if jvm arg is ok: -XX:MaxPermSize=160m" >&5
 16.5106 +  $ECHO "Command: $JAVA -XX:MaxPermSize=160m -version" >&5
 16.5107 +  OUTPUT=`$JAVA -XX:MaxPermSize=160m -version 2>&1`
 16.5108 +  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.5109 +  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.5110 +  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.5111 +    boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:MaxPermSize=160m"
 16.5112 +    JVM_ARG_OK=true
 16.5113 +  else
 16.5114 +    $ECHO "Arg failed:" >&5
 16.5115 +    $ECHO "$OUTPUT" >&5
 16.5116 +    JVM_ARG_OK=false
 16.5117 +  fi
 16.5118 +
 16.5119 +
 16.5120 +  $ECHO "Check if jvm arg is ok: -XX:ThreadStackSize=$STACK_SIZE" >&5
 16.5121 +  $ECHO "Command: $JAVA -XX:ThreadStackSize=$STACK_SIZE -version" >&5
 16.5122 +  OUTPUT=`$JAVA -XX:ThreadStackSize=$STACK_SIZE -version 2>&1`
 16.5123 +  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.5124 +  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.5125 +  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.5126 +    boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:ThreadStackSize=$STACK_SIZE"
 16.5127 +    JVM_ARG_OK=true
 16.5128 +  else
 16.5129 +    $ECHO "Arg failed:" >&5
 16.5130 +    $ECHO "$OUTPUT" >&5
 16.5131 +    JVM_ARG_OK=false
 16.5132 +  fi
 16.5133  
 16.5134      # Disable special log output when a debug build is used as Boot JDK...
 16.5135  
 16.5136 -    $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5
 16.5137 -    $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5
 16.5138 -    OUTPUT=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1`
 16.5139 -    FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.5140 -    FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.5141 -    if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.5142 -        boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput"
 16.5143 -	JVM_ARG_OK=true
 16.5144 -    else
 16.5145 -	$ECHO "Arg failed:" >&5
 16.5146 -	$ECHO "$OUTPUT" >&5
 16.5147 -	JVM_ARG_OK=false
 16.5148 -    fi
 16.5149 -
 16.5150 -fi
 16.5151 -
 16.5152 -BOOT_JDK_JVMARGS=$boot_jdk_jvmargs
 16.5153 +  $ECHO "Check if jvm arg is ok: -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput" >&5
 16.5154 +  $ECHO "Command: $JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version" >&5
 16.5155 +  OUTPUT=`$JAVA -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput -version 2>&1`
 16.5156 +  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
 16.5157 +  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
 16.5158 +  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
 16.5159 +    boot_jdk_jvmargs="$boot_jdk_jvmargs -XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput"
 16.5160 +    JVM_ARG_OK=true
 16.5161 +  else
 16.5162 +    $ECHO "Arg failed:" >&5
 16.5163 +    $ECHO "$OUTPUT" >&5
 16.5164 +    JVM_ARG_OK=false
 16.5165 +  fi
 16.5166 +
 16.5167 +  fi
 16.5168 +
 16.5169 +  BOOT_JDK_JVMARGS=$boot_jdk_jvmargs
 16.5170  
 16.5171  
 16.5172  
 16.5173 @@ -16023,31 +16021,30 @@
 16.5174  ###############################################################################
 16.5175  
 16.5176  
 16.5177 -
 16.5178 -# Where are the sources. Any of these can be overridden
 16.5179 -# using --with-override-corba and the likes.
 16.5180 -LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
 16.5181 -CORBA_TOPDIR="$SRC_ROOT/corba"
 16.5182 -JAXP_TOPDIR="$SRC_ROOT/jaxp"
 16.5183 -JAXWS_TOPDIR="$SRC_ROOT/jaxws"
 16.5184 -HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
 16.5185 -NASHORN_TOPDIR="$SRC_ROOT/nashorn"
 16.5186 -JDK_TOPDIR="$SRC_ROOT/jdk"
 16.5187 -
 16.5188 -
 16.5189 -
 16.5190 -
 16.5191 -
 16.5192 -
 16.5193 -
 16.5194 -
 16.5195 -
 16.5196 -
 16.5197 -###############################################################################
 16.5198 -#
 16.5199 -# Pickup additional source for a component from outside of the source root
 16.5200 -# or override source for a component.
 16.5201 -#
 16.5202 +  # Where are the sources. Any of these can be overridden
 16.5203 +  # using --with-override-corba and the likes.
 16.5204 +  LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
 16.5205 +  CORBA_TOPDIR="$SRC_ROOT/corba"
 16.5206 +  JAXP_TOPDIR="$SRC_ROOT/jaxp"
 16.5207 +  JAXWS_TOPDIR="$SRC_ROOT/jaxws"
 16.5208 +  HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
 16.5209 +  NASHORN_TOPDIR="$SRC_ROOT/nashorn"
 16.5210 +  JDK_TOPDIR="$SRC_ROOT/jdk"
 16.5211 +
 16.5212 +
 16.5213 +
 16.5214 +
 16.5215 +
 16.5216 +
 16.5217 +
 16.5218 +
 16.5219 +
 16.5220 +
 16.5221 +  ###############################################################################
 16.5222 +  #
 16.5223 +  # Pickup additional source for a component from outside of the source root
 16.5224 +  # or override source for a component.
 16.5225 +  #
 16.5226  
 16.5227  # Check whether --with-add-source-root was given.
 16.5228  if test "${with_add_source_root+set}" = set; then :
 16.5229 @@ -16069,14 +16066,14 @@
 16.5230  fi
 16.5231  
 16.5232  
 16.5233 -if test "x$with_adds_and_overrides" != x; then
 16.5234 +  if test "x$with_adds_and_overrides" != x; then
 16.5235      with_add_source_root="$with_adds_and_overrides/adds"
 16.5236      with_override_source_root="$with_adds_and_overrides/overrides"
 16.5237 -fi
 16.5238 -
 16.5239 -if test "x$with_add_source_root" != x; then
 16.5240 +  fi
 16.5241 +
 16.5242 +  if test "x$with_add_source_root" != x; then
 16.5243      if ! test -d $with_add_source_root; then
 16.5244 -       as_fn_error $? "Trying to use a non-existant add-source-root $with_add_source_root" "$LINENO" 5
 16.5245 +      as_fn_error $? "Trying to use a non-existant add-source-root $with_add_source_root" "$LINENO" 5
 16.5246      fi
 16.5247      CURDIR="$PWD"
 16.5248      cd "$with_add_source_root"
 16.5249 @@ -16085,93 +16082,93 @@
 16.5250      # Verify that the addon source root does not have any root makefiles.
 16.5251      # If it does, then it is usually an error, prevent this.
 16.5252      if test -f $with_add_source_root/langtools/makefiles/Makefile || \
 16.5253 -       test -f $with_add_source_root/langtools/make/Makefile; then
 16.5254 -        as_fn_error $? "Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5255 +      test -f $with_add_source_root/langtools/make/Makefile; then
 16.5256 +      as_fn_error $? "Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5257      fi
 16.5258      if test -f $with_add_source_root/corba/makefiles/Makefile || \
 16.5259 -       test -f $with_add_source_root/corba/make/Makefile; then
 16.5260 -        as_fn_error $? "Your add source root seems to contain a full corba repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5261 +      test -f $with_add_source_root/corba/make/Makefile; then
 16.5262 +      as_fn_error $? "Your add source root seems to contain a full corba repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5263      fi
 16.5264      if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
 16.5265 -       test -f $with_add_source_root/jaxp/make/Makefile; then
 16.5266 -        as_fn_error $? "Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5267 +      test -f $with_add_source_root/jaxp/make/Makefile; then
 16.5268 +      as_fn_error $? "Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5269      fi
 16.5270      if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
 16.5271 -       test -f $with_add_source_root/jaxws/make/Makefile; then
 16.5272 -        as_fn_error $? "Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5273 +      test -f $with_add_source_root/jaxws/make/Makefile; then
 16.5274 +      as_fn_error $? "Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5275      fi
 16.5276      if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
 16.5277 -       test -f $with_add_source_root/hotspot/make/Makefile; then
 16.5278 -        as_fn_error $? "Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5279 +      test -f $with_add_source_root/hotspot/make/Makefile; then
 16.5280 +      as_fn_error $? "Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5281      fi
 16.5282      if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
 16.5283 -       test -f $with_add_source_root/nashorn/make/Makefile; then
 16.5284 -        as_fn_error $? "Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5285 +      test -f $with_add_source_root/nashorn/make/Makefile; then
 16.5286 +      as_fn_error $? "Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5287      fi
 16.5288      if test -f $with_add_source_root/jdk/makefiles/Makefile || \
 16.5289 -       test -f $with_add_source_root/jdk/make/Makefile; then
 16.5290 -        as_fn_error $? "Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5291 -    fi
 16.5292 -fi
 16.5293 -
 16.5294 -
 16.5295 -if test "x$with_override_source_root" != x; then
 16.5296 +      test -f $with_add_source_root/jdk/make/Makefile; then
 16.5297 +      as_fn_error $? "Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources." "$LINENO" 5
 16.5298 +    fi
 16.5299 +  fi
 16.5300 +
 16.5301 +
 16.5302 +  if test "x$with_override_source_root" != x; then
 16.5303      if ! test -d $with_override_source_root; then
 16.5304 -       as_fn_error $? "Trying to use a non-existant override-source-root $with_override_source_root" "$LINENO" 5
 16.5305 +      as_fn_error $? "Trying to use a non-existant override-source-root $with_override_source_root" "$LINENO" 5
 16.5306      fi
 16.5307      CURDIR="$PWD"
 16.5308      cd "$with_override_source_root"
 16.5309      OVERRIDE_SRC_ROOT="`pwd`"
 16.5310      cd "$CURDIR"
 16.5311      if test -f $with_override_source_root/langtools/makefiles/Makefile || \
 16.5312 -       test -f $with_override_source_root/langtools/make/Makefile; then
 16.5313 -        as_fn_error $? "Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5314 +      test -f $with_override_source_root/langtools/make/Makefile; then
 16.5315 +      as_fn_error $? "Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5316      fi
 16.5317      if test -f $with_override_source_root/corba/makefiles/Makefile || \
 16.5318 -       test -f $with_override_source_root/corba/make/Makefile; then
 16.5319 -        as_fn_error $? "Your override source root seems to contain a full corba repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5320 +      test -f $with_override_source_root/corba/make/Makefile; then
 16.5321 +      as_fn_error $? "Your override source root seems to contain a full corba repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5322      fi
 16.5323      if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
 16.5324 -       test -f $with_override_source_root/jaxp/make/Makefile; then
 16.5325 -        as_fn_error $? "Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5326 +      test -f $with_override_source_root/jaxp/make/Makefile; then
 16.5327 +      as_fn_error $? "Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5328      fi
 16.5329      if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
 16.5330 -       test -f $with_override_source_root/jaxws/make/Makefile; then
 16.5331 -        as_fn_error $? "Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5332 +      test -f $with_override_source_root/jaxws/make/Makefile; then
 16.5333 +      as_fn_error $? "Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5334      fi
 16.5335      if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
 16.5336 -       test -f $with_override_source_root/hotspot/make/Makefile; then
 16.5337 -        as_fn_error $? "Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5338 +      test -f $with_override_source_root/hotspot/make/Makefile; then
 16.5339 +      as_fn_error $? "Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5340      fi
 16.5341      if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
 16.5342 -       test -f $with_override_source_root/nashorn/make/Makefile; then
 16.5343 -        as_fn_error $? "Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5344 +      test -f $with_override_source_root/nashorn/make/Makefile; then
 16.5345 +      as_fn_error $? "Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5346      fi
 16.5347      if test -f $with_override_source_root/jdk/makefiles/Makefile || \
 16.5348 -       test -f $with_override_source_root/jdk/make/Makefile; then
 16.5349 -        as_fn_error $? "Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5350 -    fi
 16.5351 -fi
 16.5352 -
 16.5353 -
 16.5354 -###############################################################################
 16.5355 -#
 16.5356 -# Override a repo completely, this is used for example when you have 3 small
 16.5357 -# development sandboxes of the langtools sources and want to avoid having 3 full
 16.5358 -# OpenJDK sources checked out on disk.
 16.5359 -#
 16.5360 -# Assuming that the 3 langtools sandboxes are located here:
 16.5361 -# /home/fredrik/sandbox1/langtools
 16.5362 -# /home/fredrik/sandbox2/langtools
 16.5363 -# /home/fredrik/sandbox3/langtools
 16.5364 -#
 16.5365 -# From the source root you create build subdirs manually:
 16.5366 -#     mkdir -p build1 build2 build3
 16.5367 -# in each build directory run:
 16.5368 -#     (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make)
 16.5369 -#     (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make)
 16.5370 -#     (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make)
 16.5371 -#
 16.5372 +      test -f $with_override_source_root/jdk/make/Makefile; then
 16.5373 +      as_fn_error $? "Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override." "$LINENO" 5
 16.5374 +    fi
 16.5375 +  fi
 16.5376 +
 16.5377 +
 16.5378 +  ###############################################################################
 16.5379 +  #
 16.5380 +  # Override a repo completely, this is used for example when you have 3 small
 16.5381 +  # development sandboxes of the langtools sources and want to avoid having 3 full
 16.5382 +  # OpenJDK sources checked out on disk.
 16.5383 +  #
 16.5384 +  # Assuming that the 3 langtools sandboxes are located here:
 16.5385 +  # /home/fredrik/sandbox1/langtools
 16.5386 +  # /home/fredrik/sandbox2/langtools
 16.5387 +  # /home/fredrik/sandbox3/langtools
 16.5388 +  #
 16.5389 +  # From the source root you create build subdirs manually:
 16.5390 +  #     mkdir -p build1 build2 build3
 16.5391 +  # in each build directory run:
 16.5392 +  #     (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make)
 16.5393 +  #     (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make)
 16.5394 +  #     (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make)
 16.5395 +  #
 16.5396  
 16.5397  
 16.5398  # Check whether --with-override-langtools was given.
 16.5399 @@ -16222,106 +16219,105 @@
 16.5400  fi
 16.5401  
 16.5402  
 16.5403 -if test "x$with_override_langtools" != x; then
 16.5404 +  if test "x$with_override_langtools" != x; then
 16.5405      CURDIR="$PWD"
 16.5406      cd "$with_override_langtools"
 16.5407      LANGTOOLS_TOPDIR="`pwd`"
 16.5408      cd "$CURDIR"
 16.5409      if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
 16.5410 -        as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5
 16.5411 +      as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5
 16.5412      fi
 16.5413      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if langtools should be overridden" >&5
 16.5414  $as_echo_n "checking if langtools should be overridden... " >&6; }
 16.5415      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $LANGTOOLS_TOPDIR" >&5
 16.5416  $as_echo "yes with $LANGTOOLS_TOPDIR" >&6; }
 16.5417 -fi
 16.5418 -if test "x$with_override_corba" != x; then
 16.5419 +  fi
 16.5420 +  if test "x$with_override_corba" != x; then
 16.5421      CURDIR="$PWD"
 16.5422      cd "$with_override_corba"
 16.5423      CORBA_TOPDIR="`pwd`"
 16.5424      cd "$CURDIR"
 16.5425      if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
 16.5426 -        as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5
 16.5427 +      as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5
 16.5428      fi
 16.5429      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if corba should be overridden" >&5
 16.5430  $as_echo_n "checking if corba should be overridden... " >&6; }
 16.5431      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $CORBA_TOPDIR" >&5
 16.5432  $as_echo "yes with $CORBA_TOPDIR" >&6; }
 16.5433 -fi
 16.5434 -if test "x$with_override_jaxp" != x; then
 16.5435 +  fi
 16.5436 +  if test "x$with_override_jaxp" != x; then
 16.5437      CURDIR="$PWD"
 16.5438      cd "$with_override_jaxp"
 16.5439      JAXP_TOPDIR="`pwd`"
 16.5440      cd "$CURDIR"
 16.5441      if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
 16.5442 -        as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5
 16.5443 +      as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5
 16.5444      fi
 16.5445      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxp should be overridden" >&5
 16.5446  $as_echo_n "checking if jaxp should be overridden... " >&6; }
 16.5447      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $JAXP_TOPDIR" >&5
 16.5448  $as_echo "yes with $JAXP_TOPDIR" >&6; }
 16.5449 -fi
 16.5450 -if test "x$with_override_jaxws" != x; then
 16.5451 +  fi
 16.5452 +  if test "x$with_override_jaxws" != x; then
 16.5453      CURDIR="$PWD"
 16.5454      cd "$with_override_jaxws"
 16.5455      JAXWS_TOPDIR="`pwd`"
 16.5456      cd "$CURDIR"
 16.5457      if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
 16.5458 -        as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5
 16.5459 +      as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5
 16.5460      fi
 16.5461      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxws should be overridden" >&5