Merge

Sat, 04 Aug 2018 12:52:41 +0100

author
aefimov
date
Sat, 04 Aug 2018 12:52:41 +0100
changeset 2338
ecf6f15f5d5d
parent 2337
d6a70178d360
parent 2285
8ea6a32042c6
child 2339
49178e2b8f4d

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Fri Jul 27 11:46:51 2018 +0100
     1.2 +++ b/.hgtags	Sat Aug 04 12:52:41 2018 +0100
     1.3 @@ -882,3 +882,10 @@
     1.4  d6007fa4ffae140f4c4ad551a1ee290a0704a094 jdk8u201-b00
     1.5  d6007fa4ffae140f4c4ad551a1ee290a0704a094 jdk8u191-b02
     1.6  99395ddbb670d9621c9755afa330c579a57dfd9b jdk8u191-b03
     1.7 +25e7fdd40996864b76cce08ba688f6e8281097a6 jdk8u191-b04
     1.8 +3b5b53db61f2aaa5a94fd9ca51162d83565faabe jdk8u182-b00
     1.9 +dcfe85bcd9017741198b4e4a2045fdaaab212c74 jdk8u192-b00
    1.10 +7abd14dd301d8a927450a7623c2e5913a5bfa891 jdk8u192-b01
    1.11 +1380ce862bbd0b65c619bfcea454d612b240e332 jdk8u192-b02
    1.12 +6d8d269ee313fb1420375c2a81dd71c0b660a65f jdk8u192-b03
    1.13 +866ed739fa56f9c9d807c70078d28e2e5f52bdcb jdk8u192-b04
     2.1 --- a/common/autoconf/Makefile.in	Fri Jul 27 11:46:51 2018 +0100
     2.2 +++ b/common/autoconf/Makefile.in	Sat Aug 04 12:52:41 2018 +0100
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10 @@ -24,4 +24,4 @@
    2.11  # This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
    2.12  # GENERATED FILE, DO NOT EDIT
    2.13  SPEC:=@OUTPUT_ROOT@/spec.gmk
    2.14 -include @SRC_ROOT@/Makefile
    2.15 +include @TOPDIR@/Makefile
     3.1 --- a/common/autoconf/autogen.sh	Fri Jul 27 11:46:51 2018 +0100
     3.2 +++ b/common/autoconf/autogen.sh	Sat Aug 04 12:52:41 2018 +0100
     3.3 @@ -22,6 +22,23 @@
     3.4  # questions.
     3.5  #
     3.6  
     3.7 +generate_configure_script() {
     3.8 +  # First create a header
     3.9 +  cat > $1 << EOT
    3.10 +#!/bin/bash
    3.11 +#
    3.12 +# ##########################################################
    3.13 +# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
    3.14 +# ##########################################################
    3.15 +#
    3.16 +EOT
    3.17 +  # Then replace "magic" variables in configure.ac and append the output
    3.18 +  # from autoconf. $2 is either cat (just a no-op) or a filter.
    3.19 +  cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | \
    3.20 +      eval $2 | ${AUTOCONF} -W all -I$script_dir - >> $1
    3.21 +  rm -rf autom4te.cache
    3.22 +}
    3.23 +
    3.24  script_dir=`dirname $0`
    3.25  
    3.26  # Create a timestamp as seconds since epoch
    3.27 @@ -36,7 +53,8 @@
    3.28  fi
    3.29  
    3.30  if test "x$CUSTOM_CONFIG_DIR" = "x"; then
    3.31 -  custom_script_dir="$script_dir/../../jdk/make/closed/autoconf"
    3.32 +  topdir=`cd $script_dir/../..  >/dev/null && pwd`
    3.33 +  custom_script_dir="$topdir/jdk/make/closed/autoconf"
    3.34  else
    3.35    custom_script_dir=$CUSTOM_CONFIG_DIR
    3.36  fi
    3.37 @@ -45,25 +63,23 @@
    3.38  
    3.39  AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`"
    3.40  
    3.41 -echo "Autoconf found: ${AUTOCONF}"
    3.42 -
    3.43  if test "x${AUTOCONF}" = x; then
    3.44 -  echo You need autoconf installed to be able to regenerate the configure script
    3.45 -  echo Error: Cannot find autoconf 1>&2
    3.46 +  echo "You need autoconf installed to be able to regenerate the configure script"
    3.47 +  echo "Error: Cannot find autoconf" 1>&2
    3.48    exit 1
    3.49  fi
    3.50  
    3.51 -echo Generating generated-configure.sh with ${AUTOCONF}
    3.52 -cat $script_dir/configure.ac  | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | ${AUTOCONF} -W all -I$script_dir - > $script_dir/generated-configure.sh
    3.53 -rm -rf autom4te.cache
    3.54 +autoconf_version=`$AUTOCONF --version | head -1`
    3.55 +echo "Using autoconf at ${AUTOCONF} [$autoconf_version]"
    3.56 +
    3.57 +echo "Generating generated-configure.sh"
    3.58 +generate_configure_script "$script_dir/generated-configure.sh" 'cat'
    3.59  
    3.60  if test -e $custom_hook; then
    3.61 -  echo Generating custom generated-configure.sh
    3.62    # We have custom sources available; also generate configure script
    3.63    # with custom hooks compiled in.
    3.64 -  cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | \
    3.65 -      sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|" | ${AUTOCONF} -W all -I$script_dir - > $custom_script_dir/generated-configure.sh
    3.66 -  rm -rf autom4te.cache
    3.67 +  echo "Generating custom generated-configure.sh"
    3.68 +  generate_configure_script "$custom_script_dir/generated-configure.sh" 'sed -e "s|#CUSTOM_AUTOCONF_INCLUDE|m4_include([$custom_hook])|"'
    3.69  else
    3.70 -  echo No custom hook found:  $custom_hook
    3.71 +  echo "(No custom hook found at $custom_hook)"
    3.72  fi
     4.1 --- a/common/autoconf/basics.m4	Fri Jul 27 11:46:51 2018 +0100
     4.2 +++ b/common/autoconf/basics.m4	Sat Aug 04 12:52:41 2018 +0100
     4.3 @@ -1,5 +1,5 @@
     4.4  #
     4.5 -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
     4.6 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
     4.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8  #
     4.9  # This code is free software; you can redistribute it and/or modify it
    4.10 @@ -46,10 +46,24 @@
    4.11  # Appends a string to a path variable, only adding the : when needed.
    4.12  AC_DEFUN([BASIC_APPEND_TO_PATH],
    4.13  [
    4.14 -  if test "x[$]$1" = x; then
    4.15 -    $1="$2"
    4.16 -  else
    4.17 -    $1="[$]$1:$2"
    4.18 +  if test "x$2" != x; then
    4.19 +    if test "x[$]$1" = x; then
    4.20 +      $1="$2"
    4.21 +    else
    4.22 +      $1="[$]$1:$2"
    4.23 +    fi
    4.24 +  fi
    4.25 +])
    4.26 +
    4.27 +# Prepends a string to a path variable, only adding the : when needed.
    4.28 +AC_DEFUN([BASIC_PREPEND_TO_PATH],
    4.29 +[
    4.30 +  if test "x$2" != x; then
    4.31 +    if test "x[$]$1" = x; then
    4.32 +      $1="$2"
    4.33 +    else
    4.34 +      $1="$2:[$]$1"
    4.35 +    fi
    4.36    fi
    4.37  ])
    4.38  
    4.39 @@ -126,7 +140,7 @@
    4.40        done
    4.41        IFS="$IFS_save"
    4.42      else
    4.43 -      AC_MSG_NOTICE([Resolving $1 (as $path) failed, using $path directly.])
    4.44 +      # This is an absolute path, we can use it without further modifications.
    4.45        new_path="$path"
    4.46      fi
    4.47  
    4.48 @@ -236,35 +250,119 @@
    4.49  
    4.50  # Test that variable $1 denoting a program is not empty. If empty, exit with an error.
    4.51  # $1: variable to check
    4.52 -# $2: executable name to print in warning (optional)
    4.53  AC_DEFUN([BASIC_CHECK_NONEMPTY],
    4.54  [
    4.55    if test "x[$]$1" = x; then
    4.56 -    if test "x$2" = x; then
    4.57 -      PROG_NAME=translit($1,A-Z,a-z)
    4.58 -    else
    4.59 -      PROG_NAME=$2
    4.60 -    fi
    4.61 -    AC_MSG_NOTICE([Could not find $PROG_NAME!])
    4.62 -    AC_MSG_ERROR([Cannot continue])
    4.63 +    AC_MSG_ERROR([Could not find required tool for $1])
    4.64    fi
    4.65  ])
    4.66  
    4.67 -# Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY.
    4.68 -# Arguments as AC_PATH_PROG:
    4.69 +# Check that there are no unprocessed overridden variables left.
    4.70 +# If so, they are an incorrect argument and we will exit with an error.
    4.71 +AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
    4.72 +[
    4.73 +  if test "x$CONFIGURE_OVERRIDDEN_VARIABLES" != x; then
    4.74 +    # Replace the separating ! with spaces before presenting for end user.
    4.75 +    unknown_variables=${CONFIGURE_OVERRIDDEN_VARIABLES//!/ }
    4.76 +    AC_MSG_WARN([The following variables might be unknown to configure: $unknown_variables])
    4.77 +  fi
    4.78 +])
    4.79 +
    4.80 +# Setup a tool for the given variable. If correctly specified by the user, 
    4.81 +# use that value, otherwise search for the tool using the supplied code snippet.
    4.82  # $1: variable to set
    4.83 -# $2: executable name to look for
    4.84 -AC_DEFUN([BASIC_REQUIRE_PROG],
    4.85 +# $2: code snippet to call to look for the tool
    4.86 +AC_DEFUN([BASIC_SETUP_TOOL],
    4.87  [
    4.88 -  AC_PATH_PROGS($1, $2)
    4.89 -  BASIC_CHECK_NONEMPTY($1, $2)
    4.90 +  # Publish this variable in the help.
    4.91 +  AC_ARG_VAR($1, [Override default value for $1])
    4.92 +
    4.93 +  if test "x[$]$1" = x; then
    4.94 +    # The variable is not set by user, try to locate tool using the code snippet
    4.95 +    $2
    4.96 +  else
    4.97 +    # The variable is set, but is it from the command line or the environment?
    4.98 +
    4.99 +    # Try to remove the string !$1! from our list.
   4.100 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!$1!/}
   4.101 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
   4.102 +      # If it failed, the variable was not from the command line. Ignore it,
   4.103 +      # but warn the user (except for BASH, which is always set by the calling BASH).
   4.104 +      if test "x$1" != xBASH; then
   4.105 +        AC_MSG_WARN([Ignoring value of $1 from the environment. Use command line variables instead.])
   4.106 +      fi
   4.107 +      # Try to locate tool using the code snippet
   4.108 +      $2
   4.109 +    else
   4.110 +      # If it succeeded, then it was overridden by the user. We will use it
   4.111 +      # for the tool.
   4.112 +
   4.113 +      # First remove it from the list of overridden variables, so we can test
   4.114 +      # for unknown variables in the end.
   4.115 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
   4.116 +
   4.117 +      # Check if the provided tool contains a complete path.
   4.118 +      tool_specified="[$]$1"
   4.119 +      tool_basename="${tool_specified##*/}"
   4.120 +      if test "x$tool_basename" = "x$tool_specified"; then
   4.121 +        # A command without a complete path is provided, search $PATH.
   4.122 +        AC_MSG_NOTICE([Will search for user supplied tool $1=$tool_basename])
   4.123 +        AC_PATH_PROG($1, $tool_basename)
   4.124 +        if test "x[$]$1" = x; then
   4.125 +          AC_MSG_ERROR([User supplied tool $tool_basename could not be found])
   4.126 +        fi
   4.127 +      else
   4.128 +        # Otherwise we believe it is a complete path. Use it as it is.
   4.129 +        AC_MSG_NOTICE([Will use user supplied tool $1=$tool_specified])
   4.130 +        AC_MSG_CHECKING([for $1])
   4.131 +        if test ! -x "$tool_specified"; then
   4.132 +          AC_MSG_RESULT([not found])
   4.133 +          AC_MSG_ERROR([User supplied tool $1=$tool_specified does not exist or is not executable])
   4.134 +        fi
   4.135 +        AC_MSG_RESULT([$tool_specified])
   4.136 +      fi
   4.137 +    fi
   4.138 +  fi
   4.139 +])
   4.140 +
   4.141 +# Call BASIC_SETUP_TOOL with AC_PATH_PROGS to locate the tool
   4.142 +# $1: variable to set
   4.143 +# $2: executable name (or list of names) to look for
   4.144 +AC_DEFUN([BASIC_PATH_PROGS],
   4.145 +[
   4.146 +  BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2)])
   4.147 +])
   4.148 +
   4.149 +# Call BASIC_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool
   4.150 +# $1: variable to set
   4.151 +# $2: executable name (or list of names) to look for
   4.152 +AC_DEFUN([BASIC_CHECK_TOOLS],
   4.153 +[
   4.154 +  BASIC_SETUP_TOOL($1, [AC_CHECK_TOOLS($1, $2)])
   4.155 +])
   4.156 +
   4.157 +# Like BASIC_PATH_PROGS but fails if no tool was found.
   4.158 +# $1: variable to set
   4.159 +# $2: executable name (or list of names) to look for
   4.160 +AC_DEFUN([BASIC_REQUIRE_PROGS],
   4.161 +[
   4.162 +  BASIC_PATH_PROGS($1, $2)
   4.163 +  BASIC_CHECK_NONEMPTY($1)
   4.164 +])
   4.165 +
   4.166 +# Like BASIC_SETUP_TOOL but fails if no tool was found.
   4.167 +# $1: variable to set
   4.168 +# $2: autoconf macro to call to look for the special tool
   4.169 +AC_DEFUN([BASIC_REQUIRE_SPECIAL],
   4.170 +[
   4.171 +  BASIC_SETUP_TOOL($1, [$2])
   4.172 +  BASIC_CHECK_NONEMPTY($1)
   4.173  ])
   4.174  
   4.175  # Setup the most fundamental tools that relies on not much else to set up,
   4.176  # but is used by much of the early bootstrap code.
   4.177  AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
   4.178  [
   4.179 -
   4.180    # Start with tools that do not need have cross compilation support
   4.181    # and can be expected to be found in the default PATH. These tools are
   4.182    # used by configure. Nor are these tools expected to be found in the
   4.183 @@ -272,57 +370,49 @@
   4.184    # needed to download the devkit.
   4.185  
   4.186    # First are all the simple required tools.
   4.187 -  BASIC_REQUIRE_PROG(BASENAME, basename)
   4.188 -  BASIC_REQUIRE_PROG(BASH, bash)
   4.189 -  BASIC_REQUIRE_PROG(CAT, cat)
   4.190 -  BASIC_REQUIRE_PROG(CHMOD, chmod)
   4.191 -  BASIC_REQUIRE_PROG(CMP, cmp)
   4.192 -  BASIC_REQUIRE_PROG(COMM, comm)
   4.193 -  BASIC_REQUIRE_PROG(CP, cp)
   4.194 -  BASIC_REQUIRE_PROG(CPIO, cpio)
   4.195 -  BASIC_REQUIRE_PROG(CUT, cut)
   4.196 -  BASIC_REQUIRE_PROG(DATE, date)
   4.197 -  BASIC_REQUIRE_PROG(DIFF, [gdiff diff])
   4.198 -  BASIC_REQUIRE_PROG(DIRNAME, dirname)
   4.199 -  BASIC_REQUIRE_PROG(ECHO, echo)
   4.200 -  BASIC_REQUIRE_PROG(EXPR, expr)
   4.201 -  BASIC_REQUIRE_PROG(FILE, file)
   4.202 -  BASIC_REQUIRE_PROG(FIND, find)
   4.203 -  BASIC_REQUIRE_PROG(HEAD, head)
   4.204 -  BASIC_REQUIRE_PROG(LN, ln)
   4.205 -  BASIC_REQUIRE_PROG(LS, ls)
   4.206 -  BASIC_REQUIRE_PROG(MKDIR, mkdir)
   4.207 -  BASIC_REQUIRE_PROG(MKTEMP, mktemp)
   4.208 -  BASIC_REQUIRE_PROG(MV, mv)
   4.209 -  BASIC_REQUIRE_PROG(PRINTF, printf)
   4.210 -  BASIC_REQUIRE_PROG(RM, rm)
   4.211 -  BASIC_REQUIRE_PROG(SH, sh)
   4.212 -  BASIC_REQUIRE_PROG(SORT, sort)
   4.213 -  BASIC_REQUIRE_PROG(TAIL, tail)
   4.214 -  BASIC_REQUIRE_PROG(TAR, tar)
   4.215 -  BASIC_REQUIRE_PROG(TEE, tee)
   4.216 -  BASIC_REQUIRE_PROG(TOUCH, touch)
   4.217 -  BASIC_REQUIRE_PROG(TR, tr)
   4.218 -  BASIC_REQUIRE_PROG(UNAME, uname)
   4.219 -  BASIC_REQUIRE_PROG(UNIQ, uniq)
   4.220 -  BASIC_REQUIRE_PROG(WC, wc)
   4.221 -  BASIC_REQUIRE_PROG(WHICH, which)
   4.222 -  BASIC_REQUIRE_PROG(XARGS, xargs)
   4.223 +  BASIC_REQUIRE_PROGS(BASENAME, basename)
   4.224 +  BASIC_REQUIRE_PROGS(BASH, bash)
   4.225 +  BASIC_REQUIRE_PROGS(CAT, cat)
   4.226 +  BASIC_REQUIRE_PROGS(CHMOD, chmod)
   4.227 +  BASIC_REQUIRE_PROGS(CMP, cmp)
   4.228 +  BASIC_REQUIRE_PROGS(COMM, comm)
   4.229 +  BASIC_REQUIRE_PROGS(CP, cp)
   4.230 +  BASIC_REQUIRE_PROGS(CUT, cut)
   4.231 +  BASIC_REQUIRE_PROGS(DATE, date)
   4.232 +  BASIC_REQUIRE_PROGS(DIFF, [gdiff diff])
   4.233 +  BASIC_REQUIRE_PROGS(DIRNAME, dirname)
   4.234 +  BASIC_REQUIRE_PROGS(ECHO, echo)
   4.235 +  BASIC_REQUIRE_PROGS(EXPR, expr)
   4.236 +  BASIC_REQUIRE_PROGS(FILE, file)
   4.237 +  BASIC_REQUIRE_PROGS(FIND, find)
   4.238 +  BASIC_REQUIRE_PROGS(HEAD, head)
   4.239 +  BASIC_REQUIRE_PROGS(LN, ln)
   4.240 +  BASIC_REQUIRE_PROGS(LS, ls)
   4.241 +  BASIC_REQUIRE_PROGS(MKDIR, mkdir)
   4.242 +  BASIC_REQUIRE_PROGS(MKTEMP, mktemp)
   4.243 +  BASIC_REQUIRE_PROGS(MV, mv)
   4.244 +  BASIC_REQUIRE_PROGS(NAWK, [nawk gawk awk])
   4.245 +  BASIC_REQUIRE_PROGS(PRINTF, printf)
   4.246 +  BASIC_REQUIRE_PROGS(RM, rm)
   4.247 +  BASIC_REQUIRE_PROGS(SH, sh)
   4.248 +  BASIC_REQUIRE_PROGS(SORT, sort)
   4.249 +  BASIC_REQUIRE_PROGS(TAIL, tail)
   4.250 +  BASIC_REQUIRE_PROGS(TAR, tar)
   4.251 +  BASIC_REQUIRE_PROGS(TEE, tee)
   4.252 +  BASIC_REQUIRE_PROGS(TOUCH, touch)
   4.253 +  BASIC_REQUIRE_PROGS(TR, tr)
   4.254 +  BASIC_REQUIRE_PROGS(UNAME, uname)
   4.255 +  BASIC_REQUIRE_PROGS(UNIQ, uniq)
   4.256 +  BASIC_REQUIRE_PROGS(WC, wc)
   4.257 +  BASIC_REQUIRE_PROGS(WHICH, which)
   4.258 +  BASIC_REQUIRE_PROGS(XARGS, xargs)
   4.259  
   4.260    # Then required tools that require some special treatment.
   4.261 -  AC_PROG_AWK
   4.262 -  BASIC_CHECK_NONEMPTY(AWK)
   4.263 -  AC_PROG_GREP
   4.264 -  BASIC_CHECK_NONEMPTY(GREP)
   4.265 -  AC_PROG_EGREP
   4.266 -  BASIC_CHECK_NONEMPTY(EGREP)
   4.267 -  AC_PROG_FGREP
   4.268 -  BASIC_CHECK_NONEMPTY(FGREP)
   4.269 -  AC_PROG_SED
   4.270 -  BASIC_CHECK_NONEMPTY(SED)
   4.271 -
   4.272 -  AC_PATH_PROGS(NAWK, [nawk gawk awk])
   4.273 -  BASIC_CHECK_NONEMPTY(NAWK)
   4.274 +  BASIC_REQUIRE_SPECIAL(AWK, [AC_PROG_AWK])
   4.275 +  BASIC_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
   4.276 +  BASIC_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
   4.277 +  BASIC_REQUIRE_SPECIAL(FGREP, [AC_PROG_FGREP])
   4.278 +  BASIC_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
   4.279  
   4.280    # Always force rm.
   4.281    RM="$RM -f"
   4.282 @@ -332,23 +422,18 @@
   4.283    THEPWDCMD=pwd
   4.284  
   4.285    # These are not required on all platforms
   4.286 -  AC_PATH_PROG(CYGPATH, cygpath)
   4.287 -  AC_PATH_PROG(READLINK, readlink)
   4.288 -  AC_PATH_PROG(DF, df)
   4.289 -  AC_PATH_PROG(SETFILE, SetFile)
   4.290 +  BASIC_PATH_PROGS(CYGPATH, cygpath)
   4.291 +  BASIC_PATH_PROGS(READLINK, [greadlink readlink])
   4.292 +  BASIC_PATH_PROGS(DF, df)
   4.293 +  BASIC_PATH_PROGS(SETFILE, SetFile)
   4.294 +  BASIC_PATH_PROGS(CPIO, [cpio bsdcpio])
   4.295  ])
   4.296  
   4.297  # Setup basic configuration paths, and platform-specific stuff related to PATHs.
   4.298  AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   4.299  [
   4.300 -  # Locate the directory of this script.
   4.301 -  SCRIPT="[$]0"
   4.302 -  AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
   4.303 -
   4.304 -  # Where is the source? It is located two levels above the configure script.
   4.305 +  # Save the current directory this script was started from
   4.306    CURDIR="$PWD"
   4.307 -  cd "$AUTOCONF_DIR/../.."
   4.308 -  SRC_ROOT="`$THEPWDCMD -L`"
   4.309  
   4.310    if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
   4.311      PATH_SEP=";"
   4.312 @@ -356,56 +441,148 @@
   4.313    else
   4.314      PATH_SEP=":"
   4.315    fi
   4.316 +  AC_SUBST(PATH_SEP)
   4.317  
   4.318 -  AC_SUBST(SRC_ROOT)
   4.319 -  AC_SUBST(PATH_SEP)
   4.320 -  cd "$CURDIR"
   4.321 +  # We get the top-level directory from the supporting wrappers.
   4.322 +  AC_MSG_CHECKING([for top-level directory])
   4.323 +  AC_MSG_RESULT([$TOPDIR])
   4.324 +  AC_SUBST(TOPDIR)
   4.325  
   4.326 -  BASIC_FIXUP_PATH(SRC_ROOT)
   4.327 +  # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
   4.328    BASIC_FIXUP_PATH(CURDIR)
   4.329 +  BASIC_FIXUP_PATH(TOPDIR)
   4.330 +  # SRC_ROOT is a traditional alias for TOPDIR.
   4.331 +  SRC_ROOT=$TOPDIR
   4.332 +
   4.333 +  # Locate the directory of this script.
   4.334 +  AUTOCONF_DIR=$TOPDIR/common/autoconf
   4.335 +])
   4.336 +
   4.337 +# Evaluates platform specific overrides for devkit variables.
   4.338 +# $1: Name of variable
   4.339 +AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
   4.340 +[
   4.341 +  if test "x[$]$1" = x; then
   4.342 +    eval $1="\${$1_${OPENJDK_TARGET_CPU}}"
   4.343 +  fi
   4.344 +])
   4.345 +
   4.346 +AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
   4.347 +[
   4.348 +  AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
   4.349 +      [use this devkit for compilers, tools and resources])])
   4.350 +
   4.351 +  if test "x$with_devkit" = xyes; then
   4.352 +    AC_MSG_ERROR([--with-devkit must have a value])
   4.353 +  elif test "x$with_devkit" != x && test "x$with_devkit" != xno; then
   4.354 +    BASIC_FIXUP_PATH([with_devkit])
   4.355 +    DEVKIT_ROOT="$with_devkit"
   4.356 +    # Check for a meta data info file in the root of the devkit
   4.357 +    if test -f "$DEVKIT_ROOT/devkit.info"; then
   4.358 +      . $DEVKIT_ROOT/devkit.info
   4.359 +      # This potentially sets the following:
   4.360 +      # A descriptive name of the devkit
   4.361 +      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_NAME])
   4.362 +      # Corresponds to --with-extra-path
   4.363 +      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_EXTRA_PATH])
   4.364 +      # Corresponds to --with-toolchain-path
   4.365 +      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_TOOLCHAIN_PATH])
   4.366 +      # Corresponds to --with-sysroot
   4.367 +      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_SYSROOT])
   4.368 +
   4.369 +      # Identifies the Visual Studio version in the devkit
   4.370 +      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_VERSION])
   4.371 +      # The Visual Studio include environment variable
   4.372 +      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_INCLUDE])
   4.373 +      # The Visual Studio lib environment variable
   4.374 +      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_VS_LIB])
   4.375 +      # Corresponds to --with-msvcr-dll
   4.376 +      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_MSVCR_DLL])
   4.377 +      # Corresponds to --with-msvcp-dll
   4.378 +      BASIC_EVAL_DEVKIT_VARIABLE([DEVKIT_MSVCP_DLL])
   4.379 +    fi
   4.380 +
   4.381 +    AC_MSG_CHECKING([for devkit])
   4.382 +    if test "x$DEVKIT_NAME" != x; then
   4.383 +      AC_MSG_RESULT([$DEVKIT_NAME in $DEVKIT_ROOT])
   4.384 +    else
   4.385 +      AC_MSG_RESULT([$DEVKIT_ROOT])
   4.386 +    fi
   4.387 +
   4.388 +    BASIC_PREPEND_TO_PATH([EXTRA_PATH],$DEVKIT_EXTRA_PATH)
   4.389 +
   4.390 +    # Fallback default of just /bin if DEVKIT_PATH is not defined
   4.391 +    if test "x$DEVKIT_TOOLCHAIN_PATH" = x; then
   4.392 +      DEVKIT_TOOLCHAIN_PATH="$DEVKIT_ROOT/bin"
   4.393 +    fi
   4.394 +    BASIC_PREPEND_TO_PATH([TOOLCHAIN_PATH],$DEVKIT_TOOLCHAIN_PATH)
   4.395 +
   4.396 +    # If DEVKIT_SYSROOT is set, use that, otherwise try a couple of known
   4.397 +    # places for backwards compatiblity.
   4.398 +    if test "x$DEVKIT_SYSROOT" != x; then
   4.399 +      SYSROOT="$DEVKIT_SYSROOT"
   4.400 +    elif test -d "$DEVKIT_ROOT/$host_alias/libc"; then
   4.401 +      SYSROOT="$DEVKIT_ROOT/$host_alias/libc"
   4.402 +    elif test -d "$DEVKIT_ROOT/$host/sys-root"; then
   4.403 +      SYSROOT="$DEVKIT_ROOT/$host/sys-root"
   4.404 +    fi
   4.405 +
   4.406 +    if test "x$DEVKIT_ROOT" != x; then
   4.407 +      DEVKIT_LIB_DIR="$DEVKIT_ROOT/lib"
   4.408 +      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
   4.409 +        DEVKIT_LIB_DIR="$DEVKIT_ROOT/lib64"
   4.410 +      fi
   4.411 +      AC_SUBST(DEVKIT_LIB_DIR)
   4.412 +    fi
   4.413 +  fi
   4.414 +
   4.415 +  # You can force the sysroot if the sysroot encoded into the compiler tools
   4.416 +  # is not correct.
   4.417 +  AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
   4.418 +      [alias for --with-sysroot for backwards compatability])],
   4.419 +      [SYSROOT=$with_sys_root]
   4.420 +  )
   4.421 +
   4.422 +  AC_ARG_WITH(sysroot, [AS_HELP_STRING([--with-sysroot],
   4.423 +      [use this directory as sysroot)])],
   4.424 +      [SYSROOT=$with_sysroot]
   4.425 +  )
   4.426 +
   4.427 +  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
   4.428 +      [alias for --with-toolchain-path for backwards compatibility])],
   4.429 +      [BASIC_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_tools_dir)]
   4.430 +  )
   4.431 +
   4.432 +  AC_ARG_WITH([toolchain-path], [AS_HELP_STRING([--with-toolchain-path],
   4.433 +      [prepend these directories when searching for toolchain binaries (compilers etc)])],
   4.434 +      [BASIC_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_toolchain_path)]
   4.435 +  )
   4.436 +
   4.437 +  AC_ARG_WITH([extra-path], [AS_HELP_STRING([--with-extra-path],
   4.438 +      [prepend these directories to the default path])],
   4.439 +      [BASIC_PREPEND_TO_PATH([EXTRA_PATH],$with_extra_path)]
   4.440 +  )
   4.441 +
   4.442 +  # Prepend the extra path to the global path
   4.443 +  BASIC_PREPEND_TO_PATH([PATH],$EXTRA_PATH)
   4.444  
   4.445    if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
   4.446      # Add extra search paths on solaris for utilities like ar and as etc...
   4.447      PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
   4.448    fi
   4.449  
   4.450 -  # You can force the sys-root if the sys-root encoded into the cross compiler tools
   4.451 -  # is not correct.
   4.452 -  AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
   4.453 -      [pass this sys-root to the compilers and tools (for cross-compiling)])])
   4.454 -
   4.455 -  if test "x$with_sys_root" != x; then
   4.456 -    SYS_ROOT=$with_sys_root
   4.457 -  else
   4.458 -    SYS_ROOT=/
   4.459 -  fi
   4.460 -  AC_SUBST(SYS_ROOT)
   4.461 -
   4.462 -  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
   4.463 -      [search this directory for compilers and tools (for cross-compiling)])],
   4.464 -      [TOOLS_DIR=$with_tools_dir]
   4.465 -  )
   4.466 -
   4.467    # Xcode version will be validated later
   4.468    AC_ARG_WITH([xcode-path], [AS_HELP_STRING([--with-xcode-path],
   4.469        [explicit path to Xcode 4 (generally for building on 10.9 and later)])],
   4.470        [XCODE_PATH=$with_xcode_path]
   4.471    )
   4.472  
   4.473 -  AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
   4.474 -      [use this directory as base for tools-dir and sys-root (for cross-compiling)])],
   4.475 -      [
   4.476 -        if test "x$with_sys_root" != x; then
   4.477 -          AC_MSG_ERROR([Cannot specify both --with-devkit and --with-sys-root at the same time])
   4.478 -        fi
   4.479 -        BASIC_FIXUP_PATH([with_devkit])
   4.480 -        BASIC_APPEND_TO_PATH([TOOLS_DIR],$with_devkit/bin)
   4.481 -        if test -d "$with_devkit/$host_alias/libc"; then
   4.482 -          SYS_ROOT=$with_devkit/$host_alias/libc
   4.483 -        elif test -d "$with_devkit/$host/sys-root"; then
   4.484 -          SYS_ROOT=$with_devkit/$host/sys-root
   4.485 -        fi
   4.486 -      ])
   4.487 +  AC_MSG_CHECKING([for sysroot])
   4.488 +  AC_MSG_RESULT([$SYSROOT])
   4.489 +  AC_MSG_CHECKING([for toolchain path])
   4.490 +  AC_MSG_RESULT([$TOOLCHAIN_PATH])
   4.491 +  AC_MSG_CHECKING([for extra path])
   4.492 +  AC_MSG_RESULT([$EXTRA_PATH])
   4.493  ])
   4.494  
   4.495  AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
   4.496 @@ -416,13 +593,17 @@
   4.497        [ CONF_NAME=${with_conf_name} ])
   4.498  
   4.499    # Test from where we are running configure, in or outside of src root.
   4.500 +  AC_MSG_CHECKING([where to store configuration])
   4.501    if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
   4.502        || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
   4.503        || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
   4.504      # We are running configure from the src root.
   4.505      # Create a default ./build/target-variant-debuglevel output root.
   4.506      if test "x${CONF_NAME}" = x; then
   4.507 +      AC_MSG_RESULT([in default location])
   4.508        CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
   4.509 +    else
   4.510 +      AC_MSG_RESULT([in build directory with custom name])
   4.511      fi
   4.512      OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
   4.513      $MKDIR -p "$OUTPUT_ROOT"
   4.514 @@ -438,6 +619,7 @@
   4.515        CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
   4.516      fi
   4.517      OUTPUT_ROOT="$CURDIR"
   4.518 +    AC_MSG_RESULT([in current directory])
   4.519  
   4.520      # WARNING: This might be a bad thing to do. You need to be sure you want to
   4.521      # have a configuration in this directory. Do some sanity checks!
   4.522 @@ -448,8 +630,12 @@
   4.523        files_present=`$LS $OUTPUT_ROOT`
   4.524        # Configure has already touched config.log and confdefs.h in the current dir when this check
   4.525        # is performed.
   4.526 -      filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \
   4.527 -      | $TR -d '\n'`
   4.528 +      filtered_files=`$ECHO "$files_present" \
   4.529 +          | $SED -e 's/config.log//g' \
   4.530 +	      -e 's/confdefs.h//g' \
   4.531 +	      -e 's/fixpath.exe//g' \
   4.532 +	      -e 's/ //g' \
   4.533 +          | $TR -d '\n'`
   4.534        if test "x$filtered_files" != x; then
   4.535          AC_MSG_NOTICE([Current directory is $CURDIR.])
   4.536          AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here])
   4.537 @@ -487,9 +673,6 @@
   4.538    # You can run make from the OUTPUT_ROOT, or from the top-level Makefile
   4.539    # which will look for generated configurations
   4.540    AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in])
   4.541 -
   4.542 -  # Save the arguments given to us
   4.543 -  echo "$CONFIGURE_COMMAND_LINE" > $OUTPUT_ROOT/configure-arguments
   4.544  ])
   4.545  
   4.546  AC_DEFUN_ONCE([BASIC_SETUP_LOGGING],
   4.547 @@ -573,10 +756,10 @@
   4.548      fi
   4.549  
   4.550      if test "x$FOUND_MAKE" = x; then
   4.551 -      if test "x$TOOLS_DIR" != x; then
   4.552 -        # We have a tools-dir, check that as well before giving up.
   4.553 +      if test "x$TOOLCHAIN_PATH" != x; then
   4.554 +        # We have a toolchain path, check that as well before giving up.
   4.555          OLD_PATH=$PATH
   4.556 -        PATH=$TOOLS_DIR:$PATH
   4.557 +        PATH=$TOOLCHAIN_PATH:$PATH
   4.558          AC_PATH_PROGS(CHECK_TOOLSDIR_GMAKE, gmake)
   4.559          BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_GMAKE", [gmake in tools-dir])
   4.560          if test "x$FOUND_MAKE" = x; then
   4.561 @@ -628,22 +811,22 @@
   4.562  
   4.563    # These tools might not be installed by default,
   4.564    # need hint on how to install them.
   4.565 -  BASIC_REQUIRE_PROG(UNZIP, unzip)
   4.566 -  BASIC_REQUIRE_PROG(ZIP, zip)
   4.567 +  BASIC_REQUIRE_PROGS(UNZIP, unzip)
   4.568 +  BASIC_REQUIRE_PROGS(ZIP, zip)
   4.569  
   4.570    # Non-required basic tools
   4.571  
   4.572 -  AC_PATH_PROG(LDD, ldd)
   4.573 +  BASIC_PATH_PROGS(LDD, ldd)
   4.574    if test "x$LDD" = "x"; then
   4.575      # List shared lib dependencies is used for
   4.576      # debug output and checking for forbidden dependencies.
   4.577      # We can build without it.
   4.578      LDD="true"
   4.579    fi
   4.580 -  AC_PATH_PROGS(READELF, [readelf greadelf])
   4.581 -  AC_PATH_PROG(HG, hg)
   4.582 -  AC_PATH_PROG(STAT, stat)
   4.583 -  AC_PATH_PROG(TIME, time)
   4.584 +  BASIC_PATH_PROGS(READELF, [readelf greadelf])
   4.585 +  BASIC_PATH_PROGS(HG, hg)
   4.586 +  BASIC_PATH_PROGS(STAT, stat)
   4.587 +  BASIC_PATH_PROGS(TIME, time)
   4.588    # Check if it's GNU time
   4.589    IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
   4.590    if test "x$IS_GNU_TIME" != x; then
   4.591 @@ -654,13 +837,13 @@
   4.592    AC_SUBST(IS_GNU_TIME)
   4.593  
   4.594    if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
   4.595 -    BASIC_REQUIRE_PROG(COMM, comm)
   4.596 +    BASIC_REQUIRE_PROGS(COMM, comm)
   4.597    fi
   4.598  
   4.599    if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
   4.600 -    BASIC_REQUIRE_PROG(DSYMUTIL, dsymutil)
   4.601 -    BASIC_REQUIRE_PROG(XATTR, xattr)
   4.602 -    AC_PATH_PROG(CODESIGN, codesign)
   4.603 +    BASIC_REQUIRE_PROGS(DSYMUTIL, dsymutil)
   4.604 +    BASIC_REQUIRE_PROGS(XATTR, xattr)
   4.605 +    BASIC_PATH_PROGS(CODESIGN, codesign)
   4.606      if test "x$CODESIGN" != "x"; then
   4.607        # Verify that the openjdk_codesign certificate is present
   4.608        AC_MSG_CHECKING([if openjdk_codesign certificate is present])
   4.609 @@ -712,7 +895,7 @@
   4.610  # not be the case in cygwin in certain conditions.
   4.611  AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
   4.612  [
   4.613 -  if test x"$OPENJDK_BUILD_OS" = xwindows; then
   4.614 +  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
   4.615      file_to_test="$SRC_ROOT/LICENSE"
   4.616      if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
   4.617        AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
   4.618 @@ -722,6 +905,9 @@
   4.619  
   4.620  AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
   4.621  [
   4.622 +  # Did user specify any unknown variables?
   4.623 +  BASIC_CHECK_LEFTOVER_OVERRIDDEN
   4.624 +
   4.625    AC_MSG_CHECKING([if build directory is on local disk])
   4.626    BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT,
   4.627        [OUTPUT_DIR_IS_LOCAL="yes"],
   4.628 @@ -740,12 +926,4 @@
   4.629    else
   4.630      IS_RECONFIGURE=no
   4.631    fi
   4.632 -
   4.633 -  if test -e $SRC_ROOT/build/.hide-configure-performance-hints; then
   4.634 -    HIDE_PERFORMANCE_HINTS=yes
   4.635 -  else
   4.636 -    HIDE_PERFORMANCE_HINTS=no
   4.637 -    # Hide it the next time around...
   4.638 -    $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1
   4.639 -  fi
   4.640  ])
     5.1 --- a/common/autoconf/basics_windows.m4	Fri Jul 27 11:46:51 2018 +0100
     5.2 +++ b/common/autoconf/basics_windows.m4	Sat Aug 04 12:52:41 2018 +0100
     5.3 @@ -66,7 +66,7 @@
     5.4        # Going to short mode and back again did indeed matter. Since short mode is
     5.5        # case insensitive, let's make it lowercase to improve readability.
     5.6        shortmode_path=`$ECHO "$shortmode_path" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
     5.7 -      # Now convert it back to Unix-stile (cygpath)
     5.8 +      # Now convert it back to Unix-style (cygpath)
     5.9        input_path=`$CYGPATH -u "$shortmode_path"`
    5.10        new_path="$input_path"
    5.11      fi
    5.12 @@ -266,6 +266,14 @@
    5.13      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
    5.14  
    5.15      new_path=`$WHICH "$new_path" 2> /dev/null`
    5.16 +    # bat and cmd files are not always considered executable in MSYS causing which
    5.17 +    # to not find them
    5.18 +    if test "x$new_path" = x \
    5.19 +        && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
    5.20 +        && test "x`$LS \"$path\" 2>/dev/null`" != x; then
    5.21 +      new_path="$path"
    5.22 +      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path)
    5.23 +    fi
    5.24  
    5.25      if test "x$new_path" = x; then
    5.26        # It's still not found. Now this is an unrecoverable error.
    5.27 @@ -321,8 +329,8 @@
    5.28        AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path])
    5.29      fi
    5.30      AC_MSG_CHECKING([cygwin root directory as unix-style path])
    5.31 -    # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away
    5.32 -    cygwin_winpath_root=`cd / ; cmd /c cd | grep ".*"`
    5.33 +    # The cmd output ends with Windows line endings (CR/LF)
    5.34 +    cygwin_winpath_root=`cd / ; cmd /c cd | $TR -d '\r\n'`
    5.35      # Force cygpath to report the proper root by including a trailing space, and then stripping it off again.
    5.36      CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 -d " "`
    5.37      AC_MSG_RESULT([$CYGWIN_ROOT_PATH])
     6.1 --- a/common/autoconf/boot-jdk.m4	Fri Jul 27 11:46:51 2018 +0100
     6.2 +++ b/common/autoconf/boot-jdk.m4	Sat Aug 04 12:52:41 2018 +0100
     6.3 @@ -334,7 +334,7 @@
     6.4    # Maximum amount of heap memory.
     6.5    # Maximum stack size.
     6.6    if test "x$BOOT_JDK_BITS" = x32; then
     6.7 -    JVM_MAX_HEAP=1100M
     6.8 +    JVM_MAX_HEAP=768M
     6.9      STACK_SIZE=768
    6.10    else
    6.11      # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
     7.1 --- a/common/autoconf/build-performance.m4	Fri Jul 27 11:46:51 2018 +0100
     7.2 +++ b/common/autoconf/build-performance.m4	Sat Aug 04 12:52:41 2018 +0100
     7.3 @@ -1,5 +1,5 @@
     7.4  #
     7.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     7.6 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
     7.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8  #
     7.9  # This code is free software; you can redistribute it and/or modify it
    7.10 @@ -160,20 +160,28 @@
    7.11  AC_DEFUN([BPERF_SETUP_CCACHE],
    7.12  [
    7.13    AC_ARG_ENABLE([ccache],
    7.14 -      [AS_HELP_STRING([--disable-ccache],
    7.15 -      [disable using ccache to speed up recompilations @<:@enabled@:>@])],
    7.16 -      [ENABLE_CCACHE=${enable_ccache}], [ENABLE_CCACHE=yes])
    7.17 -  if test "x$ENABLE_CCACHE" = xyes; then
    7.18 +      [AS_HELP_STRING([--enable-ccache],
    7.19 +      [enable using ccache to speed up recompilations @<:@disabled@:>@])])
    7.20 +
    7.21 +  CCACHE=
    7.22 +  AC_MSG_CHECKING([is ccache enabled])
    7.23 +  ENABLE_CCACHE=$enable_ccache
    7.24 +  if test "x$enable_ccache" = xyes; then
    7.25 +    AC_MSG_RESULT([yes])
    7.26      OLD_PATH="$PATH"
    7.27 -    if test "x$TOOLS_DIR" != x; then
    7.28 -      PATH=$TOOLS_DIR:$PATH
    7.29 +    if test "x$TOOLCHAIN_PATH" != x; then
    7.30 +      PATH=$TOOLCHAIN_PATH:$PATH
    7.31      fi
    7.32 -    AC_PATH_PROG(CCACHE, ccache)
    7.33 +    BASIC_REQUIRE_PROGS(CCACHE, ccache)
    7.34 +    CCACHE_STATUS="enabled"
    7.35      PATH="$OLD_PATH"
    7.36 +  elif test "x$enable_ccache" = xno; then
    7.37 +    AC_MSG_RESULT([no, explicitly disabled])
    7.38 +  elif test "x$enable_ccache" = x; then
    7.39 +    AC_MSG_RESULT([no])
    7.40    else
    7.41 -    AC_MSG_CHECKING([for ccache])
    7.42 -    AC_MSG_RESULT([explicitly disabled])
    7.43 -    CCACHE=
    7.44 +    AC_MSG_RESULT([unknown])
    7.45 +    AC_MSG_ERROR([--enable-ccache does not accept any parameters])
    7.46    fi
    7.47    AC_SUBST(CCACHE)
    7.48  
    7.49 @@ -185,8 +193,11 @@
    7.50      # When using a non home ccache directory, assume the use is to share ccache files
    7.51      # with other users. Thus change the umask.
    7.52      SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002"
    7.53 +    if test "x$CCACHE" = x; then
    7.54 +      AC_MSG_WARN([--with-ccache-dir has no meaning when ccache is not enabled])
    7.55 +    fi
    7.56    fi
    7.57 -  CCACHE_FOUND=""
    7.58 +
    7.59    if test "x$CCACHE" != x; then
    7.60      BPERF_SETUP_CCACHE_USAGE
    7.61    fi
    7.62 @@ -195,7 +206,6 @@
    7.63  AC_DEFUN([BPERF_SETUP_CCACHE_USAGE],
    7.64  [
    7.65    if test "x$CCACHE" != x; then
    7.66 -    CCACHE_FOUND="true"
    7.67      # Only use ccache if it is 3.1.4 or later, which supports
    7.68      # precompiled headers.
    7.69      AC_MSG_CHECKING([if ccache supports precompiled headers])
    7.70 @@ -203,6 +213,7 @@
    7.71      if test "x$HAS_GOOD_CCACHE" = x; then
    7.72        AC_MSG_RESULT([no, disabling ccache])
    7.73        CCACHE=
    7.74 +      CCACHE_STATUS="disabled"
    7.75      else
    7.76        AC_MSG_RESULT([yes])
    7.77        AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers])
    7.78 @@ -215,6 +226,7 @@
    7.79        else
    7.80          AC_MSG_RESULT([no, disabling ccaching of precompiled headers])
    7.81          CCACHE=
    7.82 +        CCACHE_STATUS="disabled"
    7.83        fi
    7.84      fi
    7.85    fi
    7.86 @@ -249,7 +261,7 @@
    7.87  
    7.88    if test "x$ENABLE_PRECOMPH" = xyes; then
    7.89      # Check that the compiler actually supports precomp headers.
    7.90 -    if test "x$GCC" = xyes; then
    7.91 +    if test "x$TOOLCHAIN_TYPE" = xgcc; then
    7.92        AC_MSG_CHECKING([that precompiled headers work])
    7.93        echo "int alfa();" > conftest.h
    7.94        $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD
     8.1 --- a/common/autoconf/compare.sh.in	Fri Jul 27 11:46:51 2018 +0100
     8.2 +++ b/common/autoconf/compare.sh.in	Sat Aug 04 12:52:41 2018 +0100
     8.3 @@ -1,6 +1,6 @@
     8.4  #!/bin/bash
     8.5  #
     8.6 -# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
     8.7 +# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
     8.8  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.9  #
    8.10  # This code is free software; you can redistribute it and/or modify it
    8.11 @@ -64,7 +64,7 @@
    8.12  UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200"
    8.13  UNZIP="@UNZIP@"
    8.14  
    8.15 -SRC_ROOT="@SRC_ROOT@"
    8.16 +SRC_ROOT="@TOPDIR@"
    8.17  
    8.18  if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
    8.19    PATH="@VS_PATH@"
     9.1 --- a/common/autoconf/configure	Fri Jul 27 11:46:51 2018 +0100
     9.2 +++ b/common/autoconf/configure	Sat Aug 04 12:52:41 2018 +0100
     9.3 @@ -1,6 +1,6 @@
     9.4  #!/bin/bash
     9.5  #
     9.6 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     9.7 +# Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
     9.8  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.9  #
    9.10  # This code is free software; you can redistribute it and/or modify it
    9.11 @@ -22,23 +22,30 @@
    9.12  # questions.
    9.13  #
    9.14  
    9.15 -if test "x$BASH_VERSION" = x; then
    9.16 -  echo This script needs bash to run.
    9.17 -  echo It is recommended to use the configure script in the source tree root instead.
    9.18 -  exit 1
    9.19 +if test "x$1" != xCHECKME; then
    9.20 +  echo "WARNING: Calling the wrapper script directly is deprecated and unsupported."
    9.21 +  echo "Not all features of configure will be available."
    9.22 +  echo "Use the 'configure' script in the top-level directory instead."
    9.23 +  TOPDIR=$(cd $(dirname $0)/../.. > /dev/null && pwd)
    9.24 +else
    9.25 +  # Now the next argument is the absolute top-level directory path.
    9.26 +  # The TOPDIR variable is passed on to configure.ac.
    9.27 +  TOPDIR="$2"
    9.28 +  # Remove these two arguments to get to the user supplied arguments
    9.29 +  shift
    9.30 +  shift
    9.31  fi
    9.32  
    9.33  # Force autoconf to use bash. This also means we must disable autoconf re-exec.
    9.34  export CONFIG_SHELL=$BASH
    9.35  export _as_can_reexec=no
    9.36  
    9.37 -CONFIGURE_COMMAND_LINE="$@"
    9.38 -conf_script_dir=`dirname $0`
    9.39 +conf_script_dir="$TOPDIR/common/autoconf"
    9.40  
    9.41  if [ "$CUSTOM_CONFIG_DIR" = "" ]; then
    9.42 -  conf_custom_script_dir="$conf_script_dir/../../jdk/make/closed/autoconf"
    9.43 +  conf_custom_script_dir="$TOPDIR/jdk/make/closed/autoconf"
    9.44  else
    9.45 -  conf_custom_script_dir=$CUSTOM_CONFIG_DIR
    9.46 +  conf_custom_script_dir="$CUSTOM_CONFIG_DIR"
    9.47  fi
    9.48  
    9.49  ###
    9.50 @@ -114,28 +121,79 @@
    9.51  if test "x$conf_debug_configure" = xtrue; then
    9.52    conf_debug_configure=recursive
    9.53  fi
    9.54 +
    9.55  ###
    9.56  ### Process command-line arguments
    9.57  ###
    9.58 +
    9.59 +# Returns a shell-escaped version of the argument given.
    9.60 +function shell_quote() {
    9.61 +  if [[ -n "$1" ]]; then
    9.62 +    # Uses only shell-safe characters?  No quoting needed.
    9.63 +    # '=' is a zsh meta-character, but only in word-initial position.
    9.64 +    if [[ "$1" =~ ^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.:,%/+=_-]+$ && ! "$1" =~ ^= ]]; then
    9.65 +      quoted="$1"
    9.66 +    else
    9.67 +      if [[ "$1" =~ [\'!] ]]; then
    9.68 +        # csh does history expansion within single quotes, but not
    9.69 +        # when backslash-escaped!
    9.70 +        local quoted_quote="'\\''" quoted_exclam="'\\!'"
    9.71 +        word="${1//\'/${quoted_quote}}"
    9.72 +        word="${1//\!/${quoted_exclam}}"
    9.73 +      fi
    9.74 +      quoted="'$1'"
    9.75 +    fi
    9.76 +    echo "$quoted"
    9.77 +  fi
    9.78 +}
    9.79 +
    9.80  conf_processed_arguments=()
    9.81 +conf_quoted_arguments=()
    9.82  conf_openjdk_target=
    9.83  
    9.84  for conf_option
    9.85  do
    9.86 +
    9.87 +  # Process (and remove) our own extensions that will not be passed to autoconf
    9.88    case $conf_option in
    9.89      --openjdk-target=*)
    9.90        conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'`
    9.91 -      continue ;;
    9.92 +      ;;
    9.93      --debug-configure)
    9.94        if test "x$conf_debug_configure" != xrecursive; then
    9.95          conf_debug_configure=true
    9.96          export conf_debug_configure
    9.97        fi
    9.98 -      continue ;;
    9.99 +      ;;
   9.100      *)
   9.101 -      conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") ;;
   9.102 +      conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option")
   9.103 +      ;;
   9.104    esac
   9.105  
   9.106 +  # Store all variables overridden on the command line
   9.107 +  case $conf_option in
   9.108 +    [^-]*=*)
   9.109 +      # Add name of variable to CONFIGURE_OVERRIDDEN_VARIABLES list inside !...!.
   9.110 +      conf_env_var=`expr "x$conf_option" : 'x\([^=]*\)='`
   9.111 +      CONFIGURE_OVERRIDDEN_VARIABLES="$CONFIGURE_OVERRIDDEN_VARIABLES!$conf_env_var!"
   9.112 +      ;;
   9.113 +  esac
   9.114 +
   9.115 +  # Save the arguments, intelligently quoted for CONFIGURE_COMMAND_LINE.
   9.116 +  case $conf_option in
   9.117 +    *=*)
   9.118 +      conf_option_name=`expr "x$conf_option" : 'x\([^=]*\)='`
   9.119 +      conf_option_name=$(shell_quote "$conf_option_name")
   9.120 +      conf_option_value=`expr "x$conf_option" : 'x[^=]*=\(.*\)'`
   9.121 +      conf_option_value=$(shell_quote "$conf_option_value")
   9.122 +      conf_quoted_arguments=("${conf_quoted_arguments[@]}" "$conf_option_name=$conf_option_value")
   9.123 +      ;;
   9.124 +    *)
   9.125 +      conf_quoted_arguments=("${conf_quoted_arguments[@]}" "$(shell_quote "$conf_option")")
   9.126 +      ;;
   9.127 +  esac
   9.128 +
   9.129 +  # Check for certain autoconf options that require extra action
   9.130    case $conf_option in
   9.131      -build | --build | --buil | --bui | --bu |-build=* | --build=* | --buil=* | --bui=* | --bu=*)
   9.132        conf_legacy_crosscompile="$conf_legacy_crosscompile $conf_option" ;;
   9.133 @@ -148,6 +206,9 @@
   9.134    esac
   9.135  done
   9.136  
   9.137 +# Save the quoted command line
   9.138 +CONFIGURE_COMMAND_LINE="${conf_quoted_arguments[@]}"
   9.139 +
   9.140  if test "x$conf_legacy_crosscompile" != "x"; then
   9.141    if test "x$conf_openjdk_target" != "x"; then
   9.142      echo "Error: Specifying --openjdk-target together with autoconf"
   9.143 @@ -177,10 +238,10 @@
   9.144  ###
   9.145  if test -e $conf_custom_script_dir/generated-configure.sh; then
   9.146    # Custom source configure available; run that instead
   9.147 -  echo Running custom generated-configure.sh
   9.148 +  echo "Running custom generated-configure.sh"
   9.149    conf_script_to_run=$conf_custom_script_dir/generated-configure.sh
   9.150  else
   9.151 -  echo Running generated-configure.sh
   9.152 +  echo "Running generated-configure.sh"
   9.153    conf_script_to_run=$conf_script_dir/generated-configure.sh
   9.154  fi
   9.155  
   9.156 @@ -214,8 +275,18 @@
   9.157    --debug-configure       Run the configure script with additional debug
   9.158                            logging enabled.
   9.159  
   9.160 +EOT
   9.161 +
   9.162 +    # Print list of toolchains. This must be done by the autoconf script.
   9.163 +    ( CONFIGURE_PRINT_TOOLCHAIN_LIST=true . $conf_script_to_run PRINTF=printf )
   9.164 +
   9.165 +    cat <<EOT
   9.166 +
   9.167  Please be aware that, when cross-compiling, the OpenJDK configure script will
   9.168  generally use 'target' where autoconf traditionally uses 'host'.
   9.169 +
   9.170 +Also note that variables must be passed on the command line. Variables in the
   9.171 +environment will generally be ignored, unlike traditional autoconf scripts.
   9.172  EOT
   9.173    fi
   9.174  else
    10.1 --- a/common/autoconf/configure.ac	Fri Jul 27 11:46:51 2018 +0100
    10.2 +++ b/common/autoconf/configure.ac	Sat Aug 04 12:52:41 2018 +0100
    10.3 @@ -1,5 +1,5 @@
    10.4  #
    10.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    10.6 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
    10.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8  #
    10.9  # This code is free software; you can redistribute it and/or modify it
   10.10 @@ -33,7 +33,7 @@
   10.11  AC_PREREQ([2.69])
   10.12  AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net)
   10.13  
   10.14 -AC_CONFIG_AUX_DIR([build-aux])
   10.15 +AC_CONFIG_AUX_DIR([$TOPDIR/common/autoconf/build-aux])
   10.16  m4_include([build-aux/pkg.m4])
   10.17  
   10.18  # Include these first...
   10.19 @@ -43,6 +43,7 @@
   10.20  # ... then the rest
   10.21  m4_include([boot-jdk.m4])
   10.22  m4_include([build-performance.m4])
   10.23 +m4_include([flags.m4])
   10.24  m4_include([help.m4])
   10.25  m4_include([jdk-options.m4])
   10.26  m4_include([libraries.m4])
   10.27 @@ -72,7 +73,11 @@
   10.28  #
   10.29  ###############################################################################
   10.30  
   10.31 -# Basic initialization that must happen first of all
   10.32 +# If we are requested to print additional help, do that and then exit.
   10.33 +# This must be the very first call.
   10.34 +HELP_PRINT_ADDITIONAL_HELP_AND_EXIT
   10.35 +
   10.36 +# Basic initialization that must happen first of all in the normal process.
   10.37  BASIC_INIT
   10.38  BASIC_SETUP_FUNDAMENTAL_TOOLS
   10.39  
   10.40 @@ -96,6 +101,9 @@
   10.41  # With basic setup done, call the custom early hook.
   10.42  CUSTOM_EARLY_HOOK
   10.43  
   10.44 +# Check if we have devkits, extra paths or sysroot set.
   10.45 +BASIC_SETUP_DEVKIT
   10.46 +
   10.47  # To properly create a configuration name, we need to have the OpenJDK target
   10.48  # and options (variants and debug level) parsed.
   10.49  BASIC_SETUP_OUTPUT_DIR
   10.50 @@ -149,26 +157,41 @@
   10.51  
   10.52  ###############################################################################
   10.53  #
   10.54 -# Setup the toolchain (compilers etc), i.e. the tools that need to be
   10.55 -# cross-compilation aware.
   10.56 +# Setup the toolchain (compilers etc), i.e. tools used to compile and process
   10.57 +# native code.
   10.58  #
   10.59  ###############################################################################
   10.60  
   10.61 -TOOLCHAIN_SETUP_SYSROOT_AND_OUT_OPTIONS
   10.62 -# Locate the actual tools
   10.63 -TOOLCHAIN_SETUP_PATHS
   10.64 +# First determine the toolchain type (compiler family)
   10.65 +TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE
   10.66  
   10.67 -# FIXME: Currently we must test this after paths but before flags. Fix!
   10.68 +# Then detect the actual binaries needed
   10.69 +TOOLCHAIN_PRE_DETECTION
   10.70 +TOOLCHAIN_DETECT_TOOLCHAIN_CORE
   10.71 +TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA
   10.72 +TOOLCHAIN_POST_DETECTION
   10.73  
   10.74 -# And we can test some aspects on the target using configure macros.
   10.75 +# Finally do some processing after the detection phase
   10.76 +TOOLCHAIN_SETUP_BUILD_COMPILERS
   10.77 +TOOLCHAIN_SETUP_LEGACY
   10.78 +TOOLCHAIN_MISC_CHECKS
   10.79 +
   10.80 +# Setup the JTReg Regression Test Harness.
   10.81 +TOOLCHAIN_SETUP_JTREG
   10.82 +
   10.83 +FLAGS_SETUP_INIT_FLAGS
   10.84 +
   10.85 +# FIXME: Currently we must test this after toolchain but before flags. Fix!
   10.86 +
   10.87 +# Now we can test some aspects on the target using configure macros.
   10.88  PLATFORM_SETUP_OPENJDK_TARGET_BITS
   10.89  PLATFORM_SETUP_OPENJDK_TARGET_ENDIANNESS
   10.90  
   10.91  # Configure flags for the tools
   10.92 -TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_LIBS
   10.93 -TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION
   10.94 -TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK
   10.95 -TOOLCHAIN_SETUP_COMPILER_FLAGS_MISC
   10.96 +FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS
   10.97 +FLAGS_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION
   10.98 +FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK
   10.99 +FLAGS_SETUP_COMPILER_FLAGS_MISC
  10.100  
  10.101  # Setup debug symbols (need objcopy from the toolchain for that)
  10.102  JDKOPT_SETUP_DEBUG_SYMBOLS
  10.103 @@ -189,7 +212,7 @@
  10.104  LIB_SETUP_ALSA
  10.105  LIB_SETUP_MISC_LIBS
  10.106  LIB_SETUP_STATIC_LINK_LIBSTDCPP
  10.107 -
  10.108 +LIB_SETUP_ON_WINDOWS
  10.109  
  10.110  ###############################################################################
  10.111  #
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/common/autoconf/flags.m4	Sat Aug 04 12:52:41 2018 +0100
    11.3 @@ -0,0 +1,808 @@
    11.4 +#
    11.5 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
    11.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.7 +#
    11.8 +# This code is free software; you can redistribute it and/or modify it
    11.9 +# under the terms of the GNU General Public License version 2 only, as
   11.10 +# published by the Free Software Foundation.  Oracle designates this
   11.11 +# particular file as subject to the "Classpath" exception as provided
   11.12 +# by Oracle in the LICENSE file that accompanied this code.
   11.13 +#
   11.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
   11.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   11.16 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   11.17 +# version 2 for more details (a copy is included in the LICENSE file that
   11.18 +# accompanied this code).
   11.19 +#
   11.20 +# You should have received a copy of the GNU General Public License version
   11.21 +# 2 along with this work; if not, write to the Free Software Foundation,
   11.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   11.23 +#
   11.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   11.25 +# or visit www.oracle.com if you need additional information or have any
   11.26 +# questions.
   11.27 +#
   11.28 +
   11.29 +AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
   11.30 +[
   11.31 +  # Option used to tell the compiler whether to create 32- or 64-bit executables
   11.32 +  if test "x$TOOLCHAIN_TYPE" = xxlc; then
   11.33 +    COMPILER_TARGET_BITS_FLAG="-q"
   11.34 +  else
   11.35 +    COMPILER_TARGET_BITS_FLAG="-m"
   11.36 +  fi
   11.37 +  AC_SUBST(COMPILER_TARGET_BITS_FLAG)
   11.38 +
   11.39 +  # FIXME: figure out if we should select AR flags depending on OS or toolchain.
   11.40 +  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
   11.41 +    ARFLAGS="-r"
   11.42 +  elif test "x$OPENJDK_TARGET_OS" = xaix; then
   11.43 +    ARFLAGS="-X64"
   11.44 +  elif test "x$OPENJDK_TARGET_OS" = xwindows; then
   11.45 +    # lib.exe is used as AR to create static libraries.
   11.46 +    ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
   11.47 +  else
   11.48 +    ARFLAGS=""
   11.49 +  fi
   11.50 +  AC_SUBST(ARFLAGS)
   11.51 +
   11.52 +  ## Setup strip.
   11.53 +  # FIXME: should this really be per platform, or should it be per toolchain type?
   11.54 +  # strip is not provided by clang or solstudio; so guessing platform makes most sense.
   11.55 +  # FIXME: we should really only export STRIPFLAGS from here, not POST_STRIP_CMD.
   11.56 +  if test "x$OPENJDK_TARGET_OS" = xlinux; then
   11.57 +    STRIPFLAGS="-g"
   11.58 +  elif test "x$OPENJDK_TARGET_OS" = xsolaris; then
   11.59 +    STRIPFLAGS="-x"
   11.60 +  elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
   11.61 +    STRIPFLAGS="-S"
   11.62 +  elif test "x$OPENJDK_TARGET_OS" = xaix; then
   11.63 +    STRIPFLAGS="-X32_64"
   11.64 +  fi
   11.65 +
   11.66 +  if test "x$OPENJDK_TARGET_OS" != xwindows; then
   11.67 +    POST_STRIP_CMD="$STRIP $STRIPFLAGS"
   11.68 +  fi
   11.69 +  AC_SUBST(POST_STRIP_CMD)
   11.70 +
   11.71 +  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
   11.72 +    # FIXME: break out into MCSFLAGS
   11.73 +    POST_MCS_CMD="$MCS -d -a \"JDK $FULL_VERSION\""
   11.74 +  fi
   11.75 +  AC_SUBST(POST_MCS_CMD)
   11.76 +
   11.77 +  if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
   11.78 +    CC_OUT_OPTION=-Fo
   11.79 +    EXE_OUT_OPTION=-out:
   11.80 +    LD_OUT_OPTION=-out:
   11.81 +    AR_OUT_OPTION=-out:
   11.82 +  else
   11.83 +    # The option used to specify the target .o,.a or .so file.
   11.84 +    # When compiling, how to specify the to be created object file.
   11.85 +    CC_OUT_OPTION='-o$(SPACE)'
   11.86 +    # When linking, how to specify the to be created executable.
   11.87 +    EXE_OUT_OPTION='-o$(SPACE)'
   11.88 +    # When linking, how to specify the to be created dynamically linkable library.
   11.89 +    LD_OUT_OPTION='-o$(SPACE)'
   11.90 +    # When archiving, how to specify the to be create static archive for object files.
   11.91 +    AR_OUT_OPTION='rcs$(SPACE)'
   11.92 +  fi
   11.93 +  AC_SUBST(CC_OUT_OPTION)
   11.94 +  AC_SUBST(EXE_OUT_OPTION)
   11.95 +  AC_SUBST(LD_OUT_OPTION)
   11.96 +  AC_SUBST(AR_OUT_OPTION)
   11.97 +
   11.98 +  # On Windows, we need to set RC flags.
   11.99 +  if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
  11.100 +    RC_FLAGS="-nologo -l 0x409 -r"
  11.101 +    if test "x$VARIANT" = xOPT; then
  11.102 +      RC_FLAGS="$RC_FLAGS -d NDEBUG"
  11.103 +    fi
  11.104 +
  11.105 +    # The version variables used to create RC_FLAGS may be overridden
  11.106 +    # in a custom configure script, or possibly the command line.
  11.107 +    # Let those variables be expanded at make time in spec.gmk.
  11.108 +    # The \$ are escaped to the shell, and the $(...) variables
  11.109 +    # are evaluated by make.
  11.110 +    RC_FLAGS="$RC_FLAGS \
  11.111 +        -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
  11.112 +        -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
  11.113 +        -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
  11.114 +        -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
  11.115 +        -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
  11.116 +        -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
  11.117 +        -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
  11.118 +  fi
  11.119 +  AC_SUBST(RC_FLAGS)
  11.120 +
  11.121 +  if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
  11.122 +    # FIXME: likely bug, should be CCXXFLAGS_JDK? or one for C or CXX.
  11.123 +    CCXXFLAGS="$CCXXFLAGS -nologo"
  11.124 +  fi
  11.125 +
  11.126 +  if test "x$SYSROOT" != "x"; then
  11.127 +    if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
  11.128 +      if test "x$OPENJDK_TARGET_OS" = xsolaris; then
  11.129 +        # Solaris Studio does not have a concept of sysroot. Instead we must
  11.130 +        # make sure the default include and lib dirs are appended to each 
  11.131 +        # compile and link command line.
  11.132 +        SYSROOT_CFLAGS="-I$SYSROOT/usr/include"
  11.133 +        SYSROOT_LDFLAGS="-L$SYSROOT/usr/lib$OPENJDK_TARGET_CPU_ISADIR \
  11.134 +            -L$SYSROOT/lib$OPENJDK_TARGET_CPU_ISADIR \
  11.135 +            -L$SYSROOT/usr/ccs/lib$OPENJDK_TARGET_CPU_ISADIR"
  11.136 +      fi
  11.137 +    elif test "x$TOOLCHAIN_TYPE" = xgcc; then
  11.138 +      SYSROOT_CFLAGS="--sysroot=\"$SYSROOT\""
  11.139 +      SYSROOT_LDFLAGS="--sysroot=\"$SYSROOT\""
  11.140 +    elif test "x$TOOLCHAIN_TYPE" = xclang; then
  11.141 +      SYSROOT_CFLAGS="-isysroot \"$SYSROOT\""
  11.142 +      SYSROOT_LDFLAGS="-isysroot \"$SYSROOT\""
  11.143 +    fi
  11.144 +    # Propagate the sysroot args to hotspot
  11.145 +    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
  11.146 +    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
  11.147 +    LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
  11.148 +  fi
  11.149 +  AC_SUBST(SYSROOT_CFLAGS)
  11.150 +  AC_SUBST(SYSROOT_LDFLAGS)
  11.151 +])
  11.152 +
  11.153 +AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS],
  11.154 +[
  11.155 +  ###############################################################################
  11.156 +  #
  11.157 +  # How to compile shared libraries.
  11.158 +  #
  11.159 +
  11.160 +  if test "x$TOOLCHAIN_TYPE" = xgcc; then
  11.161 +    PICFLAG="-fPIC"
  11.162 +    C_FLAG_REORDER=''
  11.163 +    CXX_FLAG_REORDER=''
  11.164 +
  11.165 +    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
  11.166 +      # Linking is different on MacOSX
  11.167 +      SHARED_LIBRARY_FLAGS="-dynamiclib -compatibility_version 1.0.0 -current_version 1.0.0 $PICFLAG"
  11.168 +      SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker @loader_path/.'
  11.169 +      SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
  11.170 +      SET_SHARED_LIBRARY_NAME='-Xlinker -install_name -Xlinker @rpath/[$]1'
  11.171 +      SET_SHARED_LIBRARY_MAPFILE=''
  11.172 +    else
  11.173 +      # Default works for linux, might work on other platforms as well.
  11.174 +      SHARED_LIBRARY_FLAGS='-shared'
  11.175 +      SET_EXECUTABLE_ORIGIN='-Xlinker -rpath -Xlinker \$$$$ORIGIN[$]1'
  11.176 +      SET_SHARED_LIBRARY_ORIGIN="-Xlinker -z -Xlinker origin $SET_EXECUTABLE_ORIGIN"
  11.177 +      SET_SHARED_LIBRARY_NAME='-Xlinker -soname=[$]1'
  11.178 +      SET_SHARED_LIBRARY_MAPFILE='-Xlinker -version-script=[$]1'
  11.179 +    fi
  11.180 +  elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
  11.181 +    PICFLAG="-KPIC"
  11.182 +    C_FLAG_REORDER='-xF'
  11.183 +    CXX_FLAG_REORDER='-xF'
  11.184 +    SHARED_LIBRARY_FLAGS="-G"
  11.185 +    SET_EXECUTABLE_ORIGIN='-R\$$$$ORIGIN[$]1'
  11.186 +    SET_SHARED_LIBRARY_ORIGIN="$SET_EXECUTABLE_ORIGIN"
  11.187 +    SET_SHARED_LIBRARY_NAME=''
  11.188 +    SET_SHARED_LIBRARY_MAPFILE='-M[$]1'
  11.189 +  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
  11.190 +    PICFLAG="-qpic=large"
  11.191 +    C_FLAG_REORDER=''
  11.192 +    CXX_FLAG_REORDER=''
  11.193 +    SHARED_LIBRARY_FLAGS="-qmkshrobj"
  11.194 +    SET_EXECUTABLE_ORIGIN=""
  11.195 +    SET_SHARED_LIBRARY_ORIGIN=''
  11.196 +    SET_SHARED_LIBRARY_NAME=''
  11.197 +    SET_SHARED_LIBRARY_MAPFILE=''
  11.198 +  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
  11.199 +    PICFLAG=""
  11.200 +    C_FLAG_REORDER=''
  11.201 +    CXX_FLAG_REORDER=''
  11.202 +    SHARED_LIBRARY_FLAGS="-LD"
  11.203 +    SET_EXECUTABLE_ORIGIN=''
  11.204 +    SET_SHARED_LIBRARY_ORIGIN=''
  11.205 +    SET_SHARED_LIBRARY_NAME=''
  11.206 +    SET_SHARED_LIBRARY_MAPFILE=''
  11.207 +  fi
  11.208 +
  11.209 +  AC_SUBST(C_FLAG_REORDER)
  11.210 +  AC_SUBST(CXX_FLAG_REORDER)
  11.211 +  AC_SUBST(SHARED_LIBRARY_FLAGS)
  11.212 +  AC_SUBST(SET_EXECUTABLE_ORIGIN)
  11.213 +  AC_SUBST(SET_SHARED_LIBRARY_ORIGIN)
  11.214 +  AC_SUBST(SET_SHARED_LIBRARY_NAME)
  11.215 +  AC_SUBST(SET_SHARED_LIBRARY_MAPFILE)
  11.216 +
  11.217 +  if test "x$OPENJDK_TARGET_OS" = xsolaris; then
  11.218 +    CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__"
  11.219 +    CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__"
  11.220 +    CFLAGS_JDKLIB_EXTRA='-xstrconst'
  11.221 +  fi
  11.222 +  # The (cross) compiler is now configured, we can now test capabilities
  11.223 +  # of the target platform.
  11.224 +])
  11.225 +
  11.226 +# Documentation on common flags used for solstudio in HIGHEST.
  11.227 +#
  11.228 +# WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
  11.229 +#          done with care, there are some assumptions below that need to
  11.230 +#          be understood about the use of pointers, and IEEE behavior.
  11.231 +#
  11.232 +# -fns: Use non-standard floating point mode (not IEEE 754)
  11.233 +# -fsimple: Do some simplification of floating point arithmetic (not IEEE 754)
  11.234 +# -fsingle: Use single precision floating point with 'float'
  11.235 +# -xalias_level=basic: Assume memory references via basic pointer types do not alias
  11.236 +#   (Source with excessing pointer casting and data access with mixed
  11.237 +#    pointer types are not recommended)
  11.238 +# -xbuiltin=%all: Use intrinsic or inline versions for math/std functions
  11.239 +#   (If you expect perfect errno behavior, do not use this)
  11.240 +# -xdepend: Loop data dependency optimizations (need -xO3 or higher)
  11.241 +# -xrestrict: Pointer parameters to functions do not overlap
  11.242 +#   (Similar to -xalias_level=basic usage, but less obvious sometimes.
  11.243 +#    If you pass in multiple pointers to the same data, do not use this)
  11.244 +# -xlibmil: Inline some library routines
  11.245 +#   (If you expect perfect errno behavior, do not use this)
  11.246 +# -xlibmopt: Use optimized math routines (CURRENTLY DISABLED)
  11.247 +#   (If you expect perfect errno behavior, do not use this)
  11.248 +#  Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
  11.249 +
  11.250 +    # FIXME: this will never happen since sparc != sparcv9, ie 32 bit, which we don't build anymore.
  11.251 +    # Bug?
  11.252 +    #if test "x$OPENJDK_TARGET_CPU" = xsparc; then
  11.253 +    #  CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
  11.254 +    #  CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
  11.255 +    #fi
  11.256 +
  11.257 +AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
  11.258 +[
  11.259 +
  11.260 +  ###############################################################################
  11.261 +  #
  11.262 +  # Setup the opt flags for different compilers
  11.263 +  # and different operating systems.
  11.264 +  #
  11.265 +
  11.266 +  # FIXME: this was indirectly the old default, but just inherited.
  11.267 +  # if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
  11.268 +  #   C_FLAG_DEPS="-MMD -MF"
  11.269 +  # fi
  11.270 +
  11.271 +  # Generate make dependency files
  11.272 +  if test "x$TOOLCHAIN_TYPE" = xgcc; then
  11.273 +    C_FLAG_DEPS="-MMD -MF"
  11.274 +  elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
  11.275 +    C_FLAG_DEPS="-xMMD -xMF"
  11.276 +  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
  11.277 +    C_FLAG_DEPS="-qmakedep=gcc -MF"
  11.278 +  fi
  11.279 +  CXX_FLAG_DEPS="$C_FLAG_DEPS"
  11.280 +  AC_SUBST(C_FLAG_DEPS)
  11.281 +  AC_SUBST(CXX_FLAG_DEPS)
  11.282 +
  11.283 +  # Debug symbols
  11.284 +  if test "x$TOOLCHAIN_TYPE" = xgcc; then
  11.285 +    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
  11.286 +      CFLAGS_DEBUG_SYMBOLS="-g1"
  11.287 +      CXXFLAGS_DEBUG_SYMBOLS="-g1"
  11.288 +    else
  11.289 +      CFLAGS_DEBUG_SYMBOLS="-g"
  11.290 +      CXXFLAGS_DEBUG_SYMBOLS="-g"
  11.291 +    fi
  11.292 +  elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
  11.293 +    CFLAGS_DEBUG_SYMBOLS="-g -xs"
  11.294 +    CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
  11.295 +  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
  11.296 +    CFLAGS_DEBUG_SYMBOLS="-g"
  11.297 +    CXXFLAGS_DEBUG_SYMBOLS="-g"
  11.298 +  fi
  11.299 +  AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
  11.300 +  AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
  11.301 +
  11.302 +  # Optimization levels
  11.303 +  if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
  11.304 +    CC_HIGHEST="$CC_HIGHEST -fns -fsimple -fsingle -xalias_level=basic -xbuiltin=%all -xdepend -xrestrict -xlibmil"
  11.305 +
  11.306 +    if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86"; then
  11.307 +      # FIXME: seems we always set -xregs=no%frameptr; put it elsewhere more global?
  11.308 +      C_O_FLAG_HIGHEST="-xO4 -Wu,-O4~yz $CC_HIGHEST -xregs=no%frameptr"
  11.309 +      C_O_FLAG_HI="-xO4 -Wu,-O4~yz -xregs=no%frameptr"
  11.310 +      C_O_FLAG_NORM="-xO2 -Wu,-O2~yz -xregs=no%frameptr"
  11.311 +      C_O_FLAG_NONE="-xregs=no%frameptr"
  11.312 +      CXX_O_FLAG_HIGHEST="-xO4 -Qoption ube -O4~yz $CC_HIGHEST -xregs=no%frameptr"
  11.313 +      CXX_O_FLAG_HI="-xO4 -Qoption ube -O4~yz -xregs=no%frameptr"
  11.314 +      CXX_O_FLAG_NORM="-xO2 -Qoption ube -O2~yz -xregs=no%frameptr"
  11.315 +      CXX_O_FLAG_NONE="-xregs=no%frameptr"
  11.316 +      if test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then
  11.317 +        C_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST -xchip=pentium"
  11.318 +        CXX_O_FLAG_HIGHEST="$CXX_O_FLAG_HIGHEST -xchip=pentium"
  11.319 +      fi
  11.320 +    elif test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
  11.321 +      C_O_FLAG_HIGHEST="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
  11.322 +      C_O_FLAG_HI="-xO4 -Wc,-Qrm-s -Wc,-Qiselect-T0"
  11.323 +      C_O_FLAG_NORM="-xO2 -Wc,-Qrm-s -Wc,-Qiselect-T0"
  11.324 +      C_O_FLAG_NONE=""
  11.325 +      CXX_O_FLAG_HIGHEST="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0 $CC_HIGHEST -xprefetch=auto,explicit -xchip=ultra"
  11.326 +      CXX_O_FLAG_HI="-xO4 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
  11.327 +      CXX_O_FLAG_NORM="-xO2 -Qoption cg -Qrm-s -Qoption cg -Qiselect-T0"
  11.328 +      CXX_O_FLAG_NONE=""
  11.329 +    fi
  11.330 +  else
  11.331 +    # The remaining toolchains share opt flags between CC and CXX;
  11.332 +    # setup for C and duplicate afterwards.
  11.333 +    if test "x$TOOLCHAIN_TYPE" = xgcc; then
  11.334 +      if test "x$OPENJDK_TARGET_OS" = xmacosx; then
  11.335 +        # On MacOSX we optimize for size, something
  11.336 +        # we should do for all platforms?
  11.337 +        C_O_FLAG_HIGHEST="-Os"
  11.338 +        C_O_FLAG_HI="-Os"
  11.339 +        C_O_FLAG_NORM="-Os"
  11.340 +        C_O_FLAG_NONE=""
  11.341 +      else
  11.342 +        C_O_FLAG_HIGHEST="-O3"
  11.343 +        C_O_FLAG_HI="-O3"
  11.344 +        C_O_FLAG_NORM="-O2"
  11.345 +        C_O_FLAG_NONE="-O0"
  11.346 +      fi
  11.347 +    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
  11.348 +      C_O_FLAG_HIGHEST="-O3"
  11.349 +      C_O_FLAG_HI="-O3 -qstrict"
  11.350 +      C_O_FLAG_NORM="-O2"
  11.351 +      C_O_FLAG_NONE=""
  11.352 +    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
  11.353 +      C_O_FLAG_HIGHEST="-O2"
  11.354 +      C_O_FLAG_HI="-O1"
  11.355 +      C_O_FLAG_NORM="-O1"
  11.356 +      C_O_FLAG_NONE="-Od"
  11.357 +    fi
  11.358 +    CXX_O_FLAG_HIGHEST="$C_O_FLAG_HIGHEST"
  11.359 +    CXX_O_FLAG_HI="$C_O_FLAG_HI"
  11.360 +    CXX_O_FLAG_NORM="$C_O_FLAG_NORM"
  11.361 +    CXX_O_FLAG_NONE="$C_O_FLAG_NONE"
  11.362 +  fi
  11.363 +
  11.364 +  AC_SUBST(C_O_FLAG_HIGHEST)
  11.365 +  AC_SUBST(C_O_FLAG_HI)
  11.366 +  AC_SUBST(C_O_FLAG_NORM)
  11.367 +  AC_SUBST(C_O_FLAG_NONE)
  11.368 +  AC_SUBST(CXX_O_FLAG_HIGHEST)
  11.369 +  AC_SUBST(CXX_O_FLAG_HI)
  11.370 +  AC_SUBST(CXX_O_FLAG_NORM)
  11.371 +  AC_SUBST(CXX_O_FLAG_NONE)
  11.372 +])
  11.373 +
  11.374 +AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
  11.375 +[
  11.376 +  # Special extras...
  11.377 +  if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
  11.378 +    if test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
  11.379 +      CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
  11.380 +      CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
  11.381 +    fi
  11.382 +  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
  11.383 +    LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall"
  11.384 +    CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
  11.385 +    CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
  11.386 +  elif test "x$TOOLCHAIN_TYPE" = xgcc; then
  11.387 +    $2CXXSTD_CXXFLAG="-std=gnu++98"
  11.388 +    FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]$2CXXSTD_CXXFLAG -Werror],
  11.389 +                                       [], [$2CXXSTD_CXXFLAG=""])
  11.390 +    $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} ${$2CXXSTD_CXXFLAG}"
  11.391 +    $2JVM_CFLAGS="${$2JVM_CFLAGS} ${$2CXXSTD_CXXFLAG}"
  11.392 +    AC_SUBST($2CXXSTD_CXXFLAG)
  11.393 +  fi
  11.394 +
  11.395 +  if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
  11.396 +    AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use --with-extra-cflags])
  11.397 +  fi
  11.398 +
  11.399 +  if test "x$CXXFLAGS" != "x${ADDED_CXXFLAGS}"; then
  11.400 +    AC_MSG_WARN([Ignoring CXXFLAGS($CXXFLAGS) found in environment. Use --with-extra-cxxflags])
  11.401 +  fi
  11.402 +
  11.403 +  if test "x$LDFLAGS" != "x${ADDED_LDFLAGS}"; then
  11.404 +    AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags])
  11.405 +  fi
  11.406 +
  11.407 +  AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags],
  11.408 +      [extra flags to be used when compiling jdk c-files])])
  11.409 +
  11.410 +  AC_ARG_WITH(extra-cxxflags, [AS_HELP_STRING([--with-extra-cxxflags],
  11.411 +      [extra flags to be used when compiling jdk c++-files])])
  11.412 +
  11.413 +  AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags],
  11.414 +      [extra flags to be used when linking jdk])])
  11.415 +
  11.416 +  CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
  11.417 +  CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
  11.418 +  LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
  11.419 +
  11.420 +  # Hotspot needs these set in their legacy form
  11.421 +  LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
  11.422 +  LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
  11.423 +  LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
  11.424 +
  11.425 +  AC_SUBST(LEGACY_EXTRA_CFLAGS)
  11.426 +  AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
  11.427 +  AC_SUBST(LEGACY_EXTRA_LDFLAGS)
  11.428 +
  11.429 +  ###############################################################################
  11.430 +  #
  11.431 +  # Now setup the CFLAGS and LDFLAGS for the JDK build.
  11.432 +  # Later we will also have CFLAGS and LDFLAGS for the hotspot subrepo build.
  11.433 +  #
  11.434 +
  11.435 +  # Setup compiler/platform specific flags to CFLAGS_JDK,
  11.436 +  # CXXFLAGS_JDK and CCXXFLAGS_JDK (common to C and CXX?)
  11.437 +  if test "x$TOOLCHAIN_TYPE" = xgcc; then
  11.438 +    # these options are used for both C and C++ compiles
  11.439 +    CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \
  11.440 +        -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
  11.441 +    case $OPENJDK_TARGET_CPU_ARCH in
  11.442 +      arm )
  11.443 +        # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
  11.444 +        CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
  11.445 +        ;;
  11.446 +      ppc )
  11.447 +        # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
  11.448 +        ;;
  11.449 +      * )
  11.450 +        CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"
  11.451 +        CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
  11.452 +        ;;
  11.453 +    esac
  11.454 +    TOOLCHAIN_CHECK_COMPILER_VERSION(6, FLAGS_SETUP_GCC6_COMPILER_FLAGS)
  11.455 +  elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
  11.456 +    CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS"
  11.457 +    if test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
  11.458 +      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DcpuIntel -Di586 -D$OPENJDK_TARGET_CPU_LEGACY_LIB"
  11.459 +      CFLAGS_JDK="$CFLAGS_JDK -erroff=E_BAD_PRAGMA_PACK_VALUE"
  11.460 +    fi
  11.461 +  
  11.462 +    CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -W0,-noglobal"
  11.463 +    CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
  11.464 +  elif test "x$TOOLCHAIN_TYPE" = xxlc; then
  11.465 +    CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
  11.466 +    CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
  11.467 +  elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
  11.468 +    CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK \
  11.469 +        -Zi -MD -Zc:wchar_t- -W3 -wd4800 \
  11.470 +        -DWIN32_LEAN_AND_MEAN \
  11.471 +        -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
  11.472 +        -DWIN32 -DIAL"
  11.473 +    if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
  11.474 +      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_AMD64_ -Damd64"
  11.475 +    else
  11.476 +      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_X86_ -Dx86"
  11.477 +    fi
  11.478 +    # If building with Visual Studio 2010, we can still use _STATIC_CPPLIB to
  11.479 +    # avoid bundling msvcpNNN.dll. Doesn't work with newer versions of visual
  11.480 +    # studio.
  11.481 +    if test "x$TOOLCHAIN_VERSION" = "x2010"; then
  11.482 +      CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
  11.483 +          -D_STATIC_CPPLIB -D_DISABLE_DEPRECATE_STATIC_CPPLIB"
  11.484 +    fi
  11.485 +  fi
  11.486 +
  11.487 +  ###############################################################################
  11.488 +
  11.489 +  # Adjust flags according to debug level.
  11.490 +  case $DEBUG_LEVEL in
  11.491 +    fastdebug )
  11.492 +      CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
  11.493 +      CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
  11.494 +      C_O_FLAG_HI="$C_O_FLAG_NORM"
  11.495 +      C_O_FLAG_NORM="$C_O_FLAG_NORM"
  11.496 +      CXX_O_FLAG_HI="$CXX_O_FLAG_NORM"
  11.497 +      CXX_O_FLAG_NORM="$CXX_O_FLAG_NORM"
  11.498 +      JAVAC_FLAGS="$JAVAC_FLAGS -g"
  11.499 +      ;;
  11.500 +    slowdebug )
  11.501 +      CFLAGS_JDK="$CFLAGS_JDK $CFLAGS_DEBUG_SYMBOLS"
  11.502 +      CXXFLAGS_JDK="$CXXFLAGS_JDK $CXXFLAGS_DEBUG_SYMBOLS"
  11.503 +      C_O_FLAG_HI="$C_O_FLAG_NONE"
  11.504 +      C_O_FLAG_NORM="$C_O_FLAG_NONE"
  11.505 +      CXX_O_FLAG_HI="$CXX_O_FLAG_NONE"
  11.506 +      CXX_O_FLAG_NORM="$CXX_O_FLAG_NONE"
  11.507 +      JAVAC_FLAGS="$JAVAC_FLAGS -g"
  11.508 +      ;;
  11.509 +  esac
  11.510 +
  11.511 +  # Setup LP64
  11.512 +  CCXXFLAGS_JDK="$CCXXFLAGS_JDK $ADD_LP64"
  11.513 +
  11.514 +  # Set some common defines. These works for all compilers, but assume
  11.515 +  # -D is universally accepted.
  11.516 +
  11.517 +  # Setup endianness
  11.518 +  if test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
  11.519 +    # The macro _LITTLE_ENDIAN needs to be defined the same to avoid the
  11.520 +    #   Sun C compiler warning message: warning: macro redefined: _LITTLE_ENDIAN
  11.521 +    #   (The Solaris X86 system defines this in file /usr/include/sys/isa_defs.h).
  11.522 +    #   Note: -Dmacro         is the same as    #define macro 1
  11.523 +    #         -Dmacro=        is the same as    #define macro
  11.524 +    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
  11.525 +      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN="
  11.526 +    else
  11.527 +      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_LITTLE_ENDIAN"
  11.528 +    fi
  11.529 +  else
  11.530 +    # Same goes for _BIG_ENDIAN. Do we really need to set *ENDIAN on Solaris if they
  11.531 +    # are defined in the system?
  11.532 +    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
  11.533 +      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN="
  11.534 +    else
  11.535 +      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
  11.536 +    fi
  11.537 +  fi
  11.538 +  
  11.539 +  # Setup target OS define. Use OS target name but in upper case.
  11.540 +  OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
  11.541 +  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D$OPENJDK_TARGET_OS_UPPERCASE"
  11.542 +
  11.543 +  # Setup target CPU
  11.544 +  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
  11.545 +  
  11.546 +  # Setup debug/release defines
  11.547 +  if test "x$DEBUG_LEVEL" = xrelease; then
  11.548 +    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DNDEBUG"
  11.549 +    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
  11.550 +      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DTRIMMED"
  11.551 +    fi
  11.552 +  else
  11.553 +    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DDEBUG"
  11.554 +  fi
  11.555 +
  11.556 +  # Setup release name
  11.557 +  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
  11.558 +
  11.559 +
  11.560 +  # Set some additional per-OS defines.
  11.561 +  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
  11.562 +    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
  11.563 +  elif test "x$OPENJDK_TARGET_OS" = xaix; then
  11.564 +    # FIXME: PPC64 should not be here.
  11.565 +    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DPPC64"
  11.566 +  elif test "x$OPENJDK_TARGET_OS" = xbsd; then
  11.567 +    CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_ALLBSD_SOURCE"
  11.568 +  fi
  11.569 +
  11.570 +  # Additional macosx handling
  11.571 +  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
  11.572 +    if test "x$TOOLCHAIN_TYPE" = xgcc; then
  11.573 +      # FIXME: This needs to be exported in spec.gmk due to closed legacy code.
  11.574 +      # FIXME: clean this up, and/or move it elsewhere.
  11.575 +
  11.576 +      # Setting these parameters makes it an error to link to macosx APIs that are
  11.577 +      # newer than the given OS version and makes the linked binaries compatible 
  11.578 +      # even if built on a newer version of the OS.
  11.579 +      # The expected format is X.Y.Z
  11.580 +      MACOSX_VERSION_MIN=10.7.0
  11.581 +      AC_SUBST(MACOSX_VERSION_MIN)
  11.582 +    
  11.583 +      # The macro takes the version with no dots, ex: 1070
  11.584 +      # Let the flags variables get resolved in make for easier override on make
  11.585 +      # command line.
  11.586 +      CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(subst .,,\$(MACOSX_VERSION_MIN)) -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
  11.587 +      LDFLAGS_JDK="$LDFLAGS_JDK -mmacosx-version-min=\$(MACOSX_VERSION_MIN)"
  11.588 +    fi
  11.589 +  fi
  11.590 +
  11.591 +  # Setup some hard coded includes
  11.592 +  CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
  11.593 +      -I${JDK_OUTPUTDIR}/include \
  11.594 +      -I${JDK_OUTPUTDIR}/include/$OPENJDK_TARGET_OS \
  11.595 +      -I${JDK_TOPDIR}/src/share/javavm/export \
  11.596 +      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_EXPORT_DIR/javavm/export \
  11.597 +      -I${JDK_TOPDIR}/src/share/native/common \
  11.598 +      -I${JDK_TOPDIR}/src/$OPENJDK_TARGET_OS_API_DIR/native/common"
  11.599 +
  11.600 +  # The shared libraries are compiled using the picflag.
  11.601 +  CFLAGS_JDKLIB="$CCXXFLAGS_JDK $CFLAGS_JDK $PICFLAG $CFLAGS_JDKLIB_EXTRA"
  11.602 +  CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
  11.603 +
  11.604 +  # Executable flags
  11.605 +  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
  11.606 +  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
  11.607 +
  11.608 +  AC_SUBST(CFLAGS_JDKLIB)
  11.609 +  AC_SUBST(CFLAGS_JDKEXE)
  11.610 +  AC_SUBST(CXXFLAGS_JDKLIB)
  11.611 +  AC_SUBST(CXXFLAGS_JDKEXE)
  11.612 +
  11.613 +  # Setup LDFLAGS et al.
  11.614 +  #
  11.615 +  # Now this is odd. The JDK native libraries have to link against libjvm.so
  11.616 +  # On 32-bit machines there is normally two distinct libjvm.so:s, client and server.
  11.617 +  # Which should we link to? Are we lucky enough that the binary api to the libjvm.so library
  11.618 +  # is identical for client and server? Yes. Which is picked at runtime (client or server)?
  11.619 +  # Neither, since the chosen libjvm.so has already been loaded by the launcher, all the following
  11.620 +  # libraries will link to whatever is in memory. Yuck.
  11.621 +  #
  11.622 +  # Thus we offer the compiler to find libjvm.so first in server then in client. It works. Ugh.
  11.623 +  if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
  11.624 +    LDFLAGS_JDK="$LDFLAGS_JDK -nologo -opt:ref -incremental:no"
  11.625 +    if test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then
  11.626 +      LDFLAGS_JDK="$LDFLAGS_JDK -safeseh"
  11.627 +    fi
  11.628 +    # TODO: make -debug optional "--disable-full-debug-symbols"
  11.629 +    LDFLAGS_JDK="$LDFLAGS_JDK -debug"
  11.630 +    LDFLAGS_JDKLIB="${LDFLAGS_JDK} -dll -libpath:${JDK_OUTPUTDIR}/lib"
  11.631 +    LDFLAGS_JDKLIB_SUFFIX=""
  11.632 +    if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
  11.633 +      LDFLAGS_STACK_SIZE=1048576
  11.634 +    else
  11.635 +      LDFLAGS_STACK_SIZE=327680
  11.636 +    fi
  11.637 +    LDFLAGS_JDKEXE="${LDFLAGS_JDK} /STACK:$LDFLAGS_STACK_SIZE"
  11.638 +  else
  11.639 +    if test "x$TOOLCHAIN_TYPE" = xgcc; then
  11.640 +      # If this is a --hash-style=gnu system, use --hash-style=both, why?
  11.641 +      # We have previously set HAS_GNU_HASH if this is the case
  11.642 +      if test -n "$HAS_GNU_HASH"; then
  11.643 +        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker --hash-style=both "
  11.644 +      fi
  11.645 +      if test "x$OPENJDK_TARGET_OS" = xlinux; then
  11.646 +        # And since we now know that the linker is gnu, then add:
  11.647 +        #   -z defs, to forbid undefined symbols in object files
  11.648 +        #   -z noexecstack, to mark stack regions as non-executable
  11.649 +        LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -z -Xlinker defs -Xlinker -z -Xlinker noexecstack"
  11.650 +        if test "x$DEBUG_LEVEL" = "xrelease"; then
  11.651 +          # When building release libraries, tell the linker optimize them.
  11.652 +          # Should this be supplied to the OSS linker as well?
  11.653 +          LDFLAGS_JDK="${LDFLAGS_JDK} -Xlinker -O1"
  11.654 +        fi
  11.655 +      fi
  11.656 +    fi
  11.657 +
  11.658 +    if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
  11.659 +      LDFLAGS_JDK="$LDFLAGS_JDK -z defs -xildoff -ztext"
  11.660 +      LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK -norunpath -xnolib"
  11.661 +    fi
  11.662 +
  11.663 +    LDFLAGS_JDKLIB="${LDFLAGS_JDK} $SHARED_LIBRARY_FLAGS \
  11.664 +        -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}"
  11.665 +
  11.666 +    # On some platforms (mac) the linker warns about non existing -L dirs.
  11.667 +    # Add server first if available. Linking aginst client does not always produce the same results.
  11.668 +    # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1.
  11.669 +    # Default to server for other variants.
  11.670 +    if test "x$JVM_VARIANT_SERVER" = xtrue; then
  11.671 +      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
  11.672 +    elif test "x$JVM_VARIANT_CLIENT" = xtrue; then
  11.673 +      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client"
  11.674 +    elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
  11.675 +      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal"
  11.676 +    else
  11.677 +      LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server"
  11.678 +    fi
  11.679 +
  11.680 +    LDFLAGS_JDKLIB_SUFFIX="-ljava -ljvm"
  11.681 +    if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
  11.682 +      LDFLAGS_JDKLIB_SUFFIX="$LDFLAGS_JDKLIB_SUFFIX -lc"
  11.683 +    fi
  11.684 +
  11.685 +    LDFLAGS_JDKEXE="${LDFLAGS_JDK}"
  11.686 +    if test "x$OPENJDK_TARGET_OS" = xlinux; then
  11.687 +      LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
  11.688 +    fi
  11.689 +  fi
  11.690 +  AC_SUBST(LDFLAGS_JDKLIB)
  11.691 +  AC_SUBST(LDFLAGS_JDKEXE)
  11.692 +  AC_SUBST(LDFLAGS_JDKLIB_SUFFIX)
  11.693 +  AC_SUBST(LDFLAGS_JDKEXE_SUFFIX)
  11.694 +  AC_SUBST(LDFLAGS_CXX_JDK)
  11.695 +])
  11.696 +
  11.697 +
  11.698 +# FLAGS_C_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
  11.699 +#                                  [RUN-IF-FALSE])
  11.700 +# ------------------------------------------------------------
  11.701 +# Check that the C compiler supports an argument
  11.702 +AC_DEFUN([FLAGS_C_COMPILER_CHECK_ARGUMENTS],
  11.703 +[
  11.704 +  AC_MSG_CHECKING([if the C compiler supports "$1"])
  11.705 +  supports=yes
  11.706 +
  11.707 +  saved_cflags="$CFLAGS"
  11.708 +  CFLAGS="$CFLAGS $1"
  11.709 +  AC_LANG_PUSH([C])
  11.710 +  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [], 
  11.711 +      [supports=no])
  11.712 +  AC_LANG_POP([C])
  11.713 +  CFLAGS="$saved_cflags"
  11.714 +
  11.715 +  AC_MSG_RESULT([$supports])
  11.716 +  if test "x$supports" = "xyes" ; then
  11.717 +    m4_ifval([$2], [$2], [:])
  11.718 +  else
  11.719 +    m4_ifval([$3], [$3], [:])
  11.720 +  fi
  11.721 +])
  11.722 +
  11.723 +# FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
  11.724 +#                                    [RUN-IF-FALSE])
  11.725 +# ------------------------------------------------------------
  11.726 +# Check that the C++ compiler supports an argument
  11.727 +AC_DEFUN([FLAGS_CXX_COMPILER_CHECK_ARGUMENTS],
  11.728 +[
  11.729 +  AC_MSG_CHECKING([if the C++ compiler supports "$1"])
  11.730 +  supports=yes
  11.731 +
  11.732 +  saved_cxxflags="$CXXFLAGS"
  11.733 +  CXXFLAGS="$CXXFLAG $1"
  11.734 +  AC_LANG_PUSH([C++])
  11.735 +  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [], 
  11.736 +      [supports=no])
  11.737 +  AC_LANG_POP([C++])
  11.738 +  CXXFLAGS="$saved_cxxflags"
  11.739 +  
  11.740 +  AC_MSG_RESULT([$supports])
  11.741 +  if test "x$supports" = "xyes" ; then
  11.742 +    m4_ifval([$2], [$2], [:])
  11.743 +  else
  11.744 +    m4_ifval([$3], [$3], [:])
  11.745 +  fi
  11.746 +])
  11.747 +
  11.748 +# FLAGS_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
  11.749 +#                                [RUN-IF-FALSE])
  11.750 +# ------------------------------------------------------------
  11.751 +# Check that the C and C++ compilers support an argument
  11.752 +AC_DEFUN([FLAGS_COMPILER_CHECK_ARGUMENTS],
  11.753 +[
  11.754 +  FLAGS_C_COMPILER_CHECK_ARGUMENTS([$1],
  11.755 +                       [C_COMP_SUPPORTS="yes"],
  11.756 +                       [C_COMP_SUPPORTS="no"])
  11.757 +  FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([$1],
  11.758 +                     [CXX_COMP_SUPPORTS="yes"],
  11.759 +                     [CXX_COMP_SUPPORTS="no"])
  11.760 +
  11.761 +  AC_MSG_CHECKING([if both compilers support "$1"])
  11.762 +  supports=no
  11.763 +  if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi
  11.764 +  
  11.765 +  AC_MSG_RESULT([$supports])
  11.766 +  if test "x$supports" = "xyes" ; then
  11.767 +    m4_ifval([$2], [$2], [:])
  11.768 +  else
  11.769 +    m4_ifval([$3], [$3], [:])
  11.770 +  fi
  11.771 +])
  11.772 +
  11.773 +AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_MISC],
  11.774 +[
  11.775 +  # Some Zero and Shark settings.
  11.776 +  # ZERO_ARCHFLAG tells the compiler which mode to build for
  11.777 +  case "${OPENJDK_TARGET_CPU}" in
  11.778 +    s390)
  11.779 +      ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}31"
  11.780 +      ;;
  11.781 +    *)
  11.782 +      ZERO_ARCHFLAG="${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}"
  11.783 +  esac
  11.784 +  FLAGS_COMPILER_CHECK_ARGUMENTS([$ZERO_ARCHFLAG], [], [ZERO_ARCHFLAG=""])
  11.785 +  AC_SUBST(ZERO_ARCHFLAG)
  11.786 +
  11.787 +  # Check that the compiler supports -mX (or -qX on AIX) flags
  11.788 +  # Set COMPILER_SUPPORTS_TARGET_BITS_FLAG to 'true' if it does
  11.789 +  FLAGS_COMPILER_CHECK_ARGUMENTS([${COMPILER_TARGET_BITS_FLAG}${OPENJDK_TARGET_CPU_BITS}],
  11.790 +      [COMPILER_SUPPORTS_TARGET_BITS_FLAG=true],
  11.791 +      [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
  11.792 +  AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
  11.793 +])
  11.794 +
  11.795 +AC_DEFUN_ONCE([FLAGS_SETUP_GCC6_COMPILER_FLAGS],
  11.796 +[
  11.797 +  # These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code
  11.798 +  # runs afoul of the more aggressive versions of these optimisations.
  11.799 +  # Notably, value range propagation now assumes that the this pointer of C++
  11.800 +  # member functions is non-null.
  11.801 +  NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks"
  11.802 +  FLAGS_COMPILER_CHECK_ARGUMENTS([$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror],
  11.803 +                                     [], [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""])
  11.804 +  AC_SUBST([NO_DELETE_NULL_POINTER_CHECKS_CFLAG])
  11.805 +  NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse"
  11.806 +  FLAGS_COMPILER_CHECK_ARGUMENTS([$NO_LIFETIME_DSE_CFLAG -Werror],
  11.807 +                                     [], [NO_LIFETIME_DSE_CFLAG=""])
  11.808 +  CFLAGS_JDK="${CFLAGS_JDK} ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}"
  11.809 +  AC_SUBST([NO_LIFETIME_DSE_CFLAG])
  11.810 +])
  11.811 +
    12.1 --- a/common/autoconf/generated-configure.sh	Fri Jul 27 11:46:51 2018 +0100
    12.2 +++ b/common/autoconf/generated-configure.sh	Sat Aug 04 12:52:41 2018 +0100
    12.3 @@ -1,3 +1,9 @@
    12.4 +#!/bin/bash
    12.5 +#
    12.6 +# ##########################################################
    12.7 +# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
    12.8 +# ##########################################################
    12.9 +#
   12.10  #! /bin/sh
   12.11  # Guess values for system-dependent variables and create Makefiles.
   12.12  # Generated by GNU Autoconf 2.69 for OpenJDK jdk8.
   12.13 @@ -634,6 +640,8 @@
   12.14  ENABLE_INTREE_EC
   12.15  SALIB_NAME
   12.16  HOTSPOT_MAKE_ARGS
   12.17 +MSVCP_DLL
   12.18 +MSVCR_DLL
   12.19  LIBCXX
   12.20  LLVM_LIBS
   12.21  LLVM_LDFLAGS
   12.22 @@ -654,18 +662,16 @@
   12.23  FREETYPE_LIBS
   12.24  FREETYPE_CFLAGS
   12.25  CUPS_CFLAGS
   12.26 -OPENWIN_HOME
   12.27  X_EXTRA_LIBS
   12.28  X_LIBS
   12.29  X_PRE_LIBS
   12.30  X_CFLAGS
   12.31  XMKMF
   12.32  FIXPATH
   12.33 -CXXFLAGS_DEBUG_SYMBOLS
   12.34 -CFLAGS_DEBUG_SYMBOLS
   12.35  ZIP_DEBUGINFO_FILES
   12.36 +DEBUG_BINARIES
   12.37 +STRIP_POLICY
   12.38  ENABLE_DEBUG_SYMBOLS
   12.39 -USING_BROKEN_SUSE_LD
   12.40  COMPILER_SUPPORTS_TARGET_BITS_FLAG
   12.41  ZERO_ARCHFLAG
   12.42  LDFLAGS_CXX_JDK
   12.43 @@ -678,15 +684,12 @@
   12.44  CFLAGS_JDKEXE
   12.45  CFLAGS_JDKLIB
   12.46  MACOSX_VERSION_MIN
   12.47 -PACKAGE_PATH
   12.48  NO_LIFETIME_DSE_CFLAG
   12.49  NO_DELETE_NULL_POINTER_CHECKS_CFLAG
   12.50 -CXXSTD_CXXFLAG
   12.51  LEGACY_EXTRA_LDFLAGS
   12.52  LEGACY_EXTRA_CXXFLAGS
   12.53  LEGACY_EXTRA_CFLAGS
   12.54 -CXX_FLAG_DEPS
   12.55 -C_FLAG_DEPS
   12.56 +CXXSTD_CXXFLAG
   12.57  CXX_O_FLAG_NONE
   12.58  CXX_O_FLAG_NORM
   12.59  CXX_O_FLAG_HI
   12.60 @@ -695,67 +698,77 @@
   12.61  C_O_FLAG_NORM
   12.62  C_O_FLAG_HI
   12.63  C_O_FLAG_HIGHEST
   12.64 +CXXFLAGS_DEBUG_SYMBOLS
   12.65 +CFLAGS_DEBUG_SYMBOLS
   12.66 +CXX_FLAG_DEPS
   12.67 +C_FLAG_DEPS
   12.68 +SET_SHARED_LIBRARY_MAPFILE
   12.69 +SET_SHARED_LIBRARY_NAME
   12.70 +SET_SHARED_LIBRARY_ORIGIN
   12.71 +SET_EXECUTABLE_ORIGIN
   12.72 +SHARED_LIBRARY_FLAGS
   12.73 +CXX_FLAG_REORDER
   12.74 +C_FLAG_REORDER
   12.75 +SYSROOT_LDFLAGS
   12.76 +SYSROOT_CFLAGS
   12.77 +RC_FLAGS
   12.78 +AR_OUT_OPTION
   12.79 +LD_OUT_OPTION
   12.80 +EXE_OUT_OPTION
   12.81 +CC_OUT_OPTION
   12.82  POST_MCS_CMD
   12.83  POST_STRIP_CMD
   12.84 -SET_EXECUTABLE_ORIGIN
   12.85 -SET_SHARED_LIBRARY_ORIGIN
   12.86 -CXX_FLAG_REORDER
   12.87 -C_FLAG_REORDER
   12.88 -SET_SHARED_LIBRARY_MAPFILE
   12.89 -SET_SHARED_LIBRARY_NAME
   12.90 -SHARED_LIBRARY_FLAGS
   12.91 -EXE_SUFFIX
   12.92 -STATIC_LIBRARY_SUFFIX
   12.93 -SHARED_LIBRARY_SUFFIX
   12.94 -LIBRARY_PREFIX
   12.95 -STATIC_LIBRARY
   12.96 -SHARED_LIBRARY
   12.97 -OBJ_SUFFIX
   12.98 -COMPILER_NAME
   12.99 +ARFLAGS
  12.100 +COMPILER_TARGET_BITS_FLAG
  12.101  JT_HOME
  12.102  JTREGEXE
  12.103 +USING_BROKEN_SUSE_LD
  12.104 +PACKAGE_PATH
  12.105 +LDEXECXX
  12.106 +LDEXE
  12.107 +USE_CLANG
  12.108 +HOTSPOT_LD
  12.109 +HOTSPOT_CXX
  12.110 +HOTSPOT_RC
  12.111 +HOTSPOT_MT
  12.112 +BUILD_LD
  12.113 +BUILD_CXX
  12.114 +BUILD_CC
  12.115  ac_ct_OBJDUMP
  12.116  OBJDUMP
  12.117  ac_ct_OBJCOPY
  12.118  OBJCOPY
  12.119 +ac_ct_NM
  12.120  OTOOL
  12.121 +ac_ct_STRIP
  12.122  MCS
  12.123 -STRIP
  12.124  GNM
  12.125  NM
  12.126 -AS
  12.127 -CXXCPP
  12.128 -CPP
  12.129 -COMPILER_TYPE
  12.130 -RC_FLAGS
  12.131 +STRIP
  12.132 +MSBUILD
  12.133  DUMPBIN
  12.134 -WINAR
  12.135 -HOTSPOT_RC
  12.136 -HOTSPOT_MT
  12.137  RC
  12.138  MT
  12.139 -WINLD
  12.140 -HOTSPOT_LD
  12.141 -HOTSPOT_CXX
  12.142 -ARFLAGS
  12.143 -AR
  12.144 -LDEXECXX
  12.145 -LDCXX
  12.146 -LDEXE
  12.147 -LD
  12.148 +LIPO
  12.149  ac_ct_OBJC
  12.150  OBJCFLAGS
  12.151  OBJC
  12.152 -CXX_VERSION
  12.153 -CC_VERSION
  12.154 +ac_ct_AR
  12.155 +AR
  12.156 +AS
  12.157 +LDCXX
  12.158 +LD
  12.159 +CXXCPP
  12.160 +CPP
  12.161 +CXX_VERSION_NUMBER
  12.162 +CC_VERSION_NUMBER
  12.163  ac_ct_CXX
  12.164  CXXFLAGS
  12.165  CXX
  12.166  ac_ct_PROPER_COMPILER_CXX
  12.167  PROPER_COMPILER_CXX
  12.168 +TOOLCHAIN_PATH_CXX
  12.169  POTENTIAL_CXX
  12.170 -TOOLS_DIR_CXX
  12.171 -COMPILER_TARGET_BITS_FLAG
  12.172  OBJEXT
  12.173  EXEEXT
  12.174  ac_ct_CC
  12.175 @@ -765,23 +778,23 @@
  12.176  CC
  12.177  ac_ct_PROPER_COMPILER_CC
  12.178  PROPER_COMPILER_CC
  12.179 +TOOLCHAIN_PATH_CC
  12.180  POTENTIAL_CC
  12.181 -TOOLS_DIR_CC
  12.182  SDKPATH
  12.183  XCODEBUILD
  12.184  SET_DEVELOPER_DIR
  12.185 -BUILD_LD
  12.186 -BUILD_CXX
  12.187 -BUILD_CC
  12.188 -MSVCR_DLL
  12.189 -VS_PATH
  12.190  VS_LIB
  12.191  VS_INCLUDE
  12.192 +VS_PATH
  12.193  CYGWIN_LINK
  12.194 -AR_OUT_OPTION
  12.195 -LD_OUT_OPTION
  12.196 -EXE_OUT_OPTION
  12.197 -CC_OUT_OPTION
  12.198 +EXE_SUFFIX
  12.199 +OBJ_SUFFIX
  12.200 +STATIC_LIBRARY
  12.201 +SHARED_LIBRARY
  12.202 +STATIC_LIBRARY_SUFFIX
  12.203 +SHARED_LIBRARY_SUFFIX
  12.204 +LIBRARY_PREFIX
  12.205 +TOOLCHAIN_TYPE
  12.206  BUILD_HOTSPOT
  12.207  HOTSPOT_DIST
  12.208  BUILD_OUTPUT
  12.209 @@ -857,6 +870,7 @@
  12.210  OUTPUT_ROOT
  12.211  CONF_NAME
  12.212  SPEC
  12.213 +DEVKIT_LIB_DIR
  12.214  BUILD_VARIANT_RELEASE
  12.215  DEBUG_CLASSFILES
  12.216  FASTDEBUG
  12.217 @@ -878,9 +892,8 @@
  12.218  BUILD_LOG_WRAPPER
  12.219  BUILD_LOG_PREVIOUS
  12.220  BUILD_LOG
  12.221 -SYS_ROOT
  12.222 +TOPDIR
  12.223  PATH_SEP
  12.224 -SRC_ROOT
  12.225  ZERO_ARCHDEF
  12.226  DEFINE_CROSS_COMPILE_ARCH
  12.227  LP64
  12.228 @@ -899,12 +912,14 @@
  12.229  OPENJDK_TARGET_CPU_BITS
  12.230  OPENJDK_TARGET_CPU_ARCH
  12.231  OPENJDK_TARGET_CPU
  12.232 +OPENJDK_TARGET_OS_ENV
  12.233  OPENJDK_TARGET_OS_API
  12.234  OPENJDK_TARGET_OS
  12.235  OPENJDK_BUILD_CPU_ENDIAN
  12.236  OPENJDK_BUILD_CPU_BITS
  12.237  OPENJDK_BUILD_CPU_ARCH
  12.238  OPENJDK_BUILD_CPU
  12.239 +OPENJDK_BUILD_OS_ENV
  12.240  OPENJDK_BUILD_OS_API
  12.241  OPENJDK_BUILD_OS
  12.242  OPENJDK_BUILD_AUTOCONF_NAME
  12.243 @@ -921,11 +936,11 @@
  12.244  build_vendor
  12.245  build_cpu
  12.246  build
  12.247 +CPIO
  12.248  SETFILE
  12.249  DF
  12.250  READLINK
  12.251  CYGPATH
  12.252 -NAWK
  12.253  SED
  12.254  FGREP
  12.255  EGREP
  12.256 @@ -945,6 +960,7 @@
  12.257  SH
  12.258  RM
  12.259  PRINTF
  12.260 +NAWK
  12.261  MV
  12.262  MKTEMP
  12.263  MKDIR
  12.264 @@ -959,7 +975,6 @@
  12.265  DIFF
  12.266  DATE
  12.267  CUT
  12.268 -CPIO
  12.269  CP
  12.270  COMM
  12.271  CMP
  12.272 @@ -1013,16 +1028,19 @@
  12.273  enable_option_checking
  12.274  with_custom_make_dir
  12.275  with_target_bits
  12.276 -with_sys_root
  12.277 -with_tools_dir
  12.278 -with_xcode_path
  12.279 -with_devkit
  12.280  enable_openjdk_only
  12.281  with_jdk_variant
  12.282  with_jvm_interpreter
  12.283  with_jvm_variants
  12.284  enable_debug
  12.285  with_debug_level
  12.286 +with_devkit
  12.287 +with_sys_root
  12.288 +with_sysroot
  12.289 +with_tools_dir
  12.290 +with_toolchain_path
  12.291 +with_extra_path
  12.292 +with_xcode_path
  12.293  with_conf_name
  12.294  with_builddeps_conf
  12.295  with_builddeps_server
  12.296 @@ -1050,16 +1068,15 @@
  12.297  with_override_nashorn
  12.298  with_override_jdk
  12.299  with_import_hotspot
  12.300 -with_msvcr_dll
  12.301 -with_dxsdk
  12.302 -with_dxsdk_lib
  12.303 -with_dxsdk_include
  12.304 +with_toolchain_type
  12.305 +with_toolchain_version
  12.306  with_jtreg
  12.307  with_extra_cflags
  12.308  with_extra_cxxflags
  12.309  with_extra_ldflags
  12.310  enable_debug_symbols
  12.311  enable_zip_debug_info
  12.312 +with_native_debug_symbols
  12.313  enable_macosx_runtime_support
  12.314  with_x
  12.315  with_cups
  12.316 @@ -1067,6 +1084,7 @@
  12.317  with_freetype
  12.318  with_freetype_include
  12.319  with_freetype_lib
  12.320 +with_freetype_src
  12.321  enable_freetype_bundling
  12.322  with_alsa
  12.323  with_alsa_include
  12.324 @@ -1074,6 +1092,11 @@
  12.325  with_giflib
  12.326  with_zlib
  12.327  with_stdc__lib
  12.328 +with_msvcr_dll
  12.329 +with_msvcp_dll
  12.330 +with_dxsdk
  12.331 +with_dxsdk_lib
  12.332 +with_dxsdk_include
  12.333  with_num_cores
  12.334  with_memory_size
  12.335  with_jobs
  12.336 @@ -1086,6 +1109,62 @@
  12.337        ac_precious_vars='build_alias
  12.338  host_alias
  12.339  target_alias
  12.340 +BASENAME
  12.341 +BASH
  12.342 +CAT
  12.343 +CHMOD
  12.344 +CMP
  12.345 +COMM
  12.346 +CP
  12.347 +CUT
  12.348 +DATE
  12.349 +DIFF
  12.350 +DIRNAME
  12.351 +ECHO
  12.352 +EXPR
  12.353 +FILE
  12.354 +FIND
  12.355 +HEAD
  12.356 +LN
  12.357 +LS
  12.358 +MKDIR
  12.359 +MKTEMP
  12.360 +MV
  12.361 +NAWK
  12.362 +PRINTF
  12.363 +RM
  12.364 +SH
  12.365 +SORT
  12.366 +TAIL
  12.367 +TAR
  12.368 +TEE
  12.369 +TOUCH
  12.370 +TR
  12.371 +UNAME
  12.372 +UNIQ
  12.373 +WC
  12.374 +WHICH
  12.375 +XARGS
  12.376 +AWK
  12.377 +GREP
  12.378 +EGREP
  12.379 +FGREP
  12.380 +SED
  12.381 +CYGPATH
  12.382 +READLINK
  12.383 +DF
  12.384 +SETFILE
  12.385 +CPIO
  12.386 +UNZIP
  12.387 +ZIP
  12.388 +LDD
  12.389 +READELF
  12.390 +HG
  12.391 +STAT
  12.392 +TIME
  12.393 +DSYMUTIL
  12.394 +XATTR
  12.395 +CODESIGN
  12.396  PKG_CONFIG
  12.397  CC
  12.398  CFLAGS
  12.399 @@ -1095,17 +1174,31 @@
  12.400  CXX
  12.401  CXXFLAGS
  12.402  CCC
  12.403 +CPP
  12.404 +CXXCPP
  12.405 +AS
  12.406 +AR
  12.407  OBJC
  12.408  OBJCFLAGS
  12.409 -CPP
  12.410 -CXXCPP
  12.411 +LIPO
  12.412 +STRIP
  12.413 +NM
  12.414 +GNM
  12.415 +MCS
  12.416 +OBJCOPY
  12.417 +OBJDUMP
  12.418 +BUILD_CC
  12.419 +BUILD_CXX
  12.420 +BUILD_LD
  12.421 +JTREGEXE
  12.422  XMKMF
  12.423  FREETYPE_CFLAGS
  12.424  FREETYPE_LIBS
  12.425  ALSA_CFLAGS
  12.426  ALSA_LIBS
  12.427  LIBFFI_CFLAGS
  12.428 -LIBFFI_LIBS'
  12.429 +LIBFFI_LIBS
  12.430 +CCACHE'
  12.431  
  12.432  
  12.433  # Initialize some variables set by options.
  12.434 @@ -1749,8 +1842,8 @@
  12.435    --disable-precompiled-headers
  12.436                            disable using precompiled headers when compiling C++
  12.437                            [enabled]
  12.438 -  --disable-ccache        disable using ccache to speed up recompilations
  12.439 -                          [enabled]
  12.440 +  --enable-ccache         enable using ccache to speed up recompilations
  12.441 +                          [disabled]
  12.442  
  12.443  Optional Packages:
  12.444    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
  12.445 @@ -1758,14 +1851,6 @@
  12.446    --with-custom-make-dir  use this directory for custom build/make files
  12.447    --with-target-bits      build 32-bit or 64-bit binaries (for platforms that
  12.448                            support it), e.g. --with-target-bits=32 [guessed]
  12.449 -  --with-sys-root         pass this sys-root to the compilers and tools (for
  12.450 -                          cross-compiling)
  12.451 -  --with-tools-dir        search this directory for compilers and tools (for
  12.452 -                          cross-compiling)
  12.453 -  --with-xcode-path       explicit path to Xcode 4 (generally for building on
  12.454 -                          10.9 and later)
  12.455 -  --with-devkit           use this directory as base for tools-dir and
  12.456 -                          sys-root (for cross-compiling)
  12.457    --with-jdk-variant      JDK variant to build (normal) [normal]
  12.458    --with-jvm-interpreter  JVM interpreter to build (template, cpp) [template]
  12.459    --with-jvm-variants     JVM variants (separated by commas) to build (server,
  12.460 @@ -1773,6 +1858,16 @@
  12.461                            [server]
  12.462    --with-debug-level      set the debug level (release, fastdebug, slowdebug)
  12.463                            [release]
  12.464 +  --with-devkit           use this devkit for compilers, tools and resources
  12.465 +  --with-sys-root         alias for --with-sysroot for backwards compatability
  12.466 +  --with-sysroot          use this directory as sysroot)
  12.467 +  --with-tools-dir        alias for --with-toolchain-path for backwards
  12.468 +                          compatibility
  12.469 +  --with-toolchain-path   prepend these directories when searching for
  12.470 +                          toolchain binaries (compilers etc)
  12.471 +  --with-extra-path       prepend these directories to the default path
  12.472 +  --with-xcode-path       explicit path to Xcode 4 (generally for building on
  12.473 +                          10.9 and later)
  12.474    --with-conf-name        use this as the name of the configuration [generated
  12.475                            from important configuration options]
  12.476    --with-builddeps-conf   use this configuration file for the builddeps
  12.477 @@ -1818,18 +1913,19 @@
  12.478    --with-import-hotspot   import hotspot binaries from this jdk image or
  12.479                            hotspot build dist dir instead of building from
  12.480                            source
  12.481 -  --with-msvcr-dll        copy this msvcr100.dll into the built JDK (Windows
  12.482 -                          only) [probed]
  12.483 -  --with-dxsdk            Deprecated. Option is kept for backwards
  12.484 -                          compatibility and is ignored
  12.485 -  --with-dxsdk-lib        Deprecated. Option is kept for backwards
  12.486 -                          compatibility and is ignored
  12.487 -  --with-dxsdk-include    Deprecated. Option is kept for backwards
  12.488 -                          compatibility and is ignored
  12.489 +  --with-toolchain-type   the toolchain type (or family) to use, use '--help'
  12.490 +                          to show possible values [platform dependent]
  12.491 +  --with-toolchain-version
  12.492 +                          the version of the toolchain to look for, use
  12.493 +                          '--help' to show possible values [platform
  12.494 +                          dependent]
  12.495    --with-jtreg            Regression Test Harness [probed]
  12.496    --with-extra-cflags     extra flags to be used when compiling jdk c-files
  12.497    --with-extra-cxxflags   extra flags to be used when compiling jdk c++-files
  12.498    --with-extra-ldflags    extra flags to be used when linking jdk
  12.499 +  --with-native-debug-symbols
  12.500 +                          set the native debug symbol configuration (none,
  12.501 +                          internal, external, zipped) [varying]
  12.502    --with-x                use the X Window System
  12.503    --with-cups             specify prefix directory for the cups package
  12.504                            (expecting the headers under PATH/include)
  12.505 @@ -1839,6 +1935,9 @@
  12.506                            headers under PATH/include)
  12.507    --with-freetype-include specify directory for the freetype include files
  12.508    --with-freetype-lib     specify directory for the freetype library
  12.509 +  --with-freetype-src     specify directory with freetype sources to
  12.510 +                          automatically build the library (experimental,
  12.511 +                          Windows-only)
  12.512    --with-alsa             specify prefix directory for the alsa package
  12.513                            (expecting the libraries under PATH/lib and the
  12.514                            headers under PATH/include)
  12.515 @@ -1852,6 +1951,16 @@
  12.516                            force linking of the C++ runtime on Linux to either
  12.517                            static or dynamic, default is static with dynamic as
  12.518                            fallback
  12.519 +  --with-msvcr-dll        path to microsoft C runtime dll (msvcr*.dll)
  12.520 +                          (Windows only) [probed]
  12.521 +  --with-msvcp-dll        path to microsoft C++ runtime dll (msvcp*.dll)
  12.522 +                          (Windows only) [probed]
  12.523 +  --with-dxsdk            Deprecated. Option is kept for backwards
  12.524 +                          compatibility and is ignored
  12.525 +  --with-dxsdk-lib        Deprecated. Option is kept for backwards
  12.526 +                          compatibility and is ignored
  12.527 +  --with-dxsdk-include    Deprecated. Option is kept for backwards
  12.528 +                          compatibility and is ignored
  12.529    --with-num-cores        number of cores in the build system, e.g.
  12.530                            --with-num-cores=8 [probed]
  12.531    --with-memory-size      memory (in MB) available in the build system, e.g.
  12.532 @@ -1864,6 +1973,62 @@
  12.533    --with-ccache-dir       where to store ccache files [~/.ccache]
  12.534  
  12.535  Some influential environment variables:
  12.536 +  BASENAME    Override default value for BASENAME
  12.537 +  BASH        Override default value for BASH
  12.538 +  CAT         Override default value for CAT
  12.539 +  CHMOD       Override default value for CHMOD
  12.540 +  CMP         Override default value for CMP
  12.541 +  COMM        Override default value for COMM
  12.542 +  CP          Override default value for CP
  12.543 +  CUT         Override default value for CUT
  12.544 +  DATE        Override default value for DATE
  12.545 +  DIFF        Override default value for DIFF
  12.546 +  DIRNAME     Override default value for DIRNAME
  12.547 +  ECHO        Override default value for ECHO
  12.548 +  EXPR        Override default value for EXPR
  12.549 +  FILE        Override default value for FILE
  12.550 +  FIND        Override default value for FIND
  12.551 +  HEAD        Override default value for HEAD
  12.552 +  LN          Override default value for LN
  12.553 +  LS          Override default value for LS
  12.554 +  MKDIR       Override default value for MKDIR
  12.555 +  MKTEMP      Override default value for MKTEMP
  12.556 +  MV          Override default value for MV
  12.557 +  NAWK        Override default value for NAWK
  12.558 +  PRINTF      Override default value for PRINTF
  12.559 +  RM          Override default value for RM
  12.560 +  SH          Override default value for SH
  12.561 +  SORT        Override default value for SORT
  12.562 +  TAIL        Override default value for TAIL
  12.563 +  TAR         Override default value for TAR
  12.564 +  TEE         Override default value for TEE
  12.565 +  TOUCH       Override default value for TOUCH
  12.566 +  TR          Override default value for TR
  12.567 +  UNAME       Override default value for UNAME
  12.568 +  UNIQ        Override default value for UNIQ
  12.569 +  WC          Override default value for WC
  12.570 +  WHICH       Override default value for WHICH
  12.571 +  XARGS       Override default value for XARGS
  12.572 +  AWK         Override default value for AWK
  12.573 +  GREP        Override default value for GREP
  12.574 +  EGREP       Override default value for EGREP
  12.575 +  FGREP       Override default value for FGREP
  12.576 +  SED         Override default value for SED
  12.577 +  CYGPATH     Override default value for CYGPATH
  12.578 +  READLINK    Override default value for READLINK
  12.579 +  DF          Override default value for DF
  12.580 +  SETFILE     Override default value for SETFILE
  12.581 +  CPIO        Override default value for CPIO
  12.582 +  UNZIP       Override default value for UNZIP
  12.583 +  ZIP         Override default value for ZIP
  12.584 +  LDD         Override default value for LDD
  12.585 +  READELF     Override default value for READELF
  12.586 +  HG          Override default value for HG
  12.587 +  STAT        Override default value for STAT
  12.588 +  TIME        Override default value for TIME
  12.589 +  DSYMUTIL    Override default value for DSYMUTIL
  12.590 +  XATTR       Override default value for XATTR
  12.591 +  CODESIGN    Override default value for CODESIGN
  12.592    PKG_CONFIG  path to pkg-config utility
  12.593    CC          C compiler command
  12.594    CFLAGS      C compiler flags
  12.595 @@ -1874,10 +2039,23 @@
  12.596                you have headers in a nonstandard directory <include dir>
  12.597    CXX         C++ compiler command
  12.598    CXXFLAGS    C++ compiler flags
  12.599 +  CPP         C preprocessor
  12.600 +  CXXCPP      C++ preprocessor
  12.601 +  AS          Override default value for AS
  12.602 +  AR          Override default value for AR
  12.603    OBJC        Objective C compiler command
  12.604    OBJCFLAGS   Objective C compiler flags
  12.605 -  CPP         C preprocessor
  12.606 -  CXXCPP      C++ preprocessor
  12.607 +  LIPO        Override default value for LIPO
  12.608 +  STRIP       Override default value for STRIP
  12.609 +  NM          Override default value for NM
  12.610 +  GNM         Override default value for GNM
  12.611 +  MCS         Override default value for MCS
  12.612 +  OBJCOPY     Override default value for OBJCOPY
  12.613 +  OBJDUMP     Override default value for OBJDUMP
  12.614 +  BUILD_CC    Override default value for BUILD_CC
  12.615 +  BUILD_CXX   Override default value for BUILD_CXX
  12.616 +  BUILD_LD    Override default value for BUILD_LD
  12.617 +  JTREGEXE    Override default value for JTREGEXE
  12.618    XMKMF       Path to xmkmf, Makefile generator for X Window System
  12.619    FREETYPE_CFLAGS
  12.620                C compiler flags for FREETYPE, overriding pkg-config
  12.621 @@ -1888,6 +2066,7 @@
  12.622    LIBFFI_CFLAGS
  12.623                C compiler flags for LIBFFI, overriding pkg-config
  12.624    LIBFFI_LIBS linker flags for LIBFFI, overriding pkg-config
  12.625 +  CCACHE      Override default value for CCACHE
  12.626  
  12.627  Use these variables to override the choices made by `configure' or to help
  12.628  it to find libraries and programs with nonstandard names/locations.
  12.629 @@ -2046,6 +2225,80 @@
  12.630  
  12.631  } # ac_fn_cxx_try_compile
  12.632  
  12.633 +# ac_fn_c_try_cpp LINENO
  12.634 +# ----------------------
  12.635 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
  12.636 +ac_fn_c_try_cpp ()
  12.637 +{
  12.638 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  12.639 +  if { { ac_try="$ac_cpp conftest.$ac_ext"
  12.640 +case "(($ac_try" in
  12.641 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  12.642 +  *) ac_try_echo=$ac_try;;
  12.643 +esac
  12.644 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  12.645 +$as_echo "$ac_try_echo"; } >&5
  12.646 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
  12.647 +  ac_status=$?
  12.648 +  if test -s conftest.err; then
  12.649 +    grep -v '^ *+' conftest.err >conftest.er1
  12.650 +    cat conftest.er1 >&5
  12.651 +    mv -f conftest.er1 conftest.err
  12.652 +  fi
  12.653 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  12.654 +  test $ac_status = 0; } > conftest.i && {
  12.655 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  12.656 +	 test ! -s conftest.err
  12.657 +       }; then :
  12.658 +  ac_retval=0
  12.659 +else
  12.660 +  $as_echo "$as_me: failed program was:" >&5
  12.661 +sed 's/^/| /' conftest.$ac_ext >&5
  12.662 +
  12.663 +    ac_retval=1
  12.664 +fi
  12.665 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  12.666 +  as_fn_set_status $ac_retval
  12.667 +
  12.668 +} # ac_fn_c_try_cpp
  12.669 +
  12.670 +# ac_fn_cxx_try_cpp LINENO
  12.671 +# ------------------------
  12.672 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
  12.673 +ac_fn_cxx_try_cpp ()
  12.674 +{
  12.675 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  12.676 +  if { { ac_try="$ac_cpp conftest.$ac_ext"
  12.677 +case "(($ac_try" in
  12.678 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  12.679 +  *) ac_try_echo=$ac_try;;
  12.680 +esac
  12.681 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  12.682 +$as_echo "$ac_try_echo"; } >&5
  12.683 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
  12.684 +  ac_status=$?
  12.685 +  if test -s conftest.err; then
  12.686 +    grep -v '^ *+' conftest.err >conftest.er1
  12.687 +    cat conftest.er1 >&5
  12.688 +    mv -f conftest.er1 conftest.err
  12.689 +  fi
  12.690 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  12.691 +  test $ac_status = 0; } > conftest.i && {
  12.692 +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  12.693 +	 test ! -s conftest.err
  12.694 +       }; then :
  12.695 +  ac_retval=0
  12.696 +else
  12.697 +  $as_echo "$as_me: failed program was:" >&5
  12.698 +sed 's/^/| /' conftest.$ac_ext >&5
  12.699 +
  12.700 +    ac_retval=1
  12.701 +fi
  12.702 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  12.703 +  as_fn_set_status $ac_retval
  12.704 +
  12.705 +} # ac_fn_cxx_try_cpp
  12.706 +
  12.707  # ac_fn_objc_try_compile LINENO
  12.708  # -----------------------------
  12.709  # Try to compile conftest.$ac_ext, and return whether this succeeded.
  12.710 @@ -2084,80 +2337,6 @@
  12.711  
  12.712  } # ac_fn_objc_try_compile
  12.713  
  12.714 -# ac_fn_c_try_cpp LINENO
  12.715 -# ----------------------
  12.716 -# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
  12.717 -ac_fn_c_try_cpp ()
  12.718 -{
  12.719 -  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  12.720 -  if { { ac_try="$ac_cpp conftest.$ac_ext"
  12.721 -case "(($ac_try" in
  12.722 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  12.723 -  *) ac_try_echo=$ac_try;;
  12.724 -esac
  12.725 -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  12.726 -$as_echo "$ac_try_echo"; } >&5
  12.727 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
  12.728 -  ac_status=$?
  12.729 -  if test -s conftest.err; then
  12.730 -    grep -v '^ *+' conftest.err >conftest.er1
  12.731 -    cat conftest.er1 >&5
  12.732 -    mv -f conftest.er1 conftest.err
  12.733 -  fi
  12.734 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  12.735 -  test $ac_status = 0; } > conftest.i && {
  12.736 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  12.737 -	 test ! -s conftest.err
  12.738 -       }; then :
  12.739 -  ac_retval=0
  12.740 -else
  12.741 -  $as_echo "$as_me: failed program was:" >&5
  12.742 -sed 's/^/| /' conftest.$ac_ext >&5
  12.743 -
  12.744 -    ac_retval=1
  12.745 -fi
  12.746 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  12.747 -  as_fn_set_status $ac_retval
  12.748 -
  12.749 -} # ac_fn_c_try_cpp
  12.750 -
  12.751 -# ac_fn_cxx_try_cpp LINENO
  12.752 -# ------------------------
  12.753 -# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
  12.754 -ac_fn_cxx_try_cpp ()
  12.755 -{
  12.756 -  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  12.757 -  if { { ac_try="$ac_cpp conftest.$ac_ext"
  12.758 -case "(($ac_try" in
  12.759 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  12.760 -  *) ac_try_echo=$ac_try;;
  12.761 -esac
  12.762 -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
  12.763 -$as_echo "$ac_try_echo"; } >&5
  12.764 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
  12.765 -  ac_status=$?
  12.766 -  if test -s conftest.err; then
  12.767 -    grep -v '^ *+' conftest.err >conftest.er1
  12.768 -    cat conftest.er1 >&5
  12.769 -    mv -f conftest.er1 conftest.err
  12.770 -  fi
  12.771 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
  12.772 -  test $ac_status = 0; } > conftest.i && {
  12.773 -	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  12.774 -	 test ! -s conftest.err
  12.775 -       }; then :
  12.776 -  ac_retval=0
  12.777 -else
  12.778 -  $as_echo "$as_me: failed program was:" >&5
  12.779 -sed 's/^/| /' conftest.$ac_ext >&5
  12.780 -
  12.781 -    ac_retval=1
  12.782 -fi
  12.783 -  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
  12.784 -  as_fn_set_status $ac_retval
  12.785 -
  12.786 -} # ac_fn_cxx_try_cpp
  12.787 -
  12.788  # ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
  12.789  # ---------------------------------------------------------
  12.790  # Tests whether HEADER exists, giving a warning if it cannot be compiled using
  12.791 @@ -3002,7 +3181,7 @@
  12.792  
  12.793  
  12.794  ac_aux_dir=
  12.795 -for ac_dir in build-aux "$srcdir"/build-aux; do
  12.796 +for ac_dir in $TOPDIR/common/autoconf/build-aux "$srcdir"/$TOPDIR/common/autoconf/build-aux; do
  12.797    if test -f "$ac_dir/install-sh"; then
  12.798      ac_aux_dir=$ac_dir
  12.799      ac_install_sh="$ac_aux_dir/install-sh -c"
  12.800 @@ -3018,7 +3197,7 @@
  12.801    fi
  12.802  done
  12.803  if test -z "$ac_aux_dir"; then
  12.804 -  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
  12.805 +  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $TOPDIR/common/autoconf/build-aux \"$srcdir\"/$TOPDIR/common/autoconf/build-aux" "$LINENO" 5
  12.806  fi
  12.807  
  12.808  # These three variables are undocumented and unsupported,
  12.809 @@ -3120,7 +3299,7 @@
  12.810  
  12.811  # Include these first...
  12.812  #
  12.813 -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  12.814 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  12.815  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  12.816  #
  12.817  # This code is free software; you can redistribute it and/or modify it
  12.818 @@ -3152,6 +3331,9 @@
  12.819  # Appends a string to a path variable, only adding the : when needed.
  12.820  
  12.821  
  12.822 +# Prepends a string to a path variable, only adding the : when needed.
  12.823 +
  12.824 +
  12.825  # This will make sure the given variable points to a full and proper
  12.826  # path. This means:
  12.827  # 1) There will be no spaces in the path. On posix platforms,
  12.828 @@ -3190,13 +3372,36 @@
  12.829  
  12.830  # Test that variable $1 denoting a program is not empty. If empty, exit with an error.
  12.831  # $1: variable to check
  12.832 -# $2: executable name to print in warning (optional)
  12.833 -
  12.834 -
  12.835 -# Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY.
  12.836 -# Arguments as AC_PATH_PROG:
  12.837 +
  12.838 +
  12.839 +# Check that there are no unprocessed overridden variables left.
  12.840 +# If so, they are an incorrect argument and we will exit with an error.
  12.841 +
  12.842 +
  12.843 +# Setup a tool for the given variable. If correctly specified by the user,
  12.844 +# use that value, otherwise search for the tool using the supplied code snippet.
  12.845  # $1: variable to set
  12.846 -# $2: executable name to look for
  12.847 +# $2: code snippet to call to look for the tool
  12.848 +
  12.849 +
  12.850 +# Call BASIC_SETUP_TOOL with AC_PATH_PROGS to locate the tool
  12.851 +# $1: variable to set
  12.852 +# $2: executable name (or list of names) to look for
  12.853 +
  12.854 +
  12.855 +# Call BASIC_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool
  12.856 +# $1: variable to set
  12.857 +# $2: executable name (or list of names) to look for
  12.858 +
  12.859 +
  12.860 +# Like BASIC_PATH_PROGS but fails if no tool was found.
  12.861 +# $1: variable to set
  12.862 +# $2: executable name (or list of names) to look for
  12.863 +
  12.864 +
  12.865 +# Like BASIC_SETUP_TOOL but fails if no tool was found.
  12.866 +# $1: variable to set
  12.867 +# $2: autoconf macro to call to look for the special tool
  12.868  
  12.869  
  12.870  # Setup the most fundamental tools that relies on not much else to set up,
  12.871 @@ -3206,6 +3411,12 @@
  12.872  # Setup basic configuration paths, and platform-specific stuff related to PATHs.
  12.873  
  12.874  
  12.875 +# Evaluates platform specific overrides for devkit variables.
  12.876 +# $1: Name of variable
  12.877 +
  12.878 +
  12.879 +
  12.880 +
  12.881  
  12.882  
  12.883  
  12.884 @@ -3406,7 +3617,7 @@
  12.885  
  12.886  
  12.887  #
  12.888 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
  12.889 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  12.890  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  12.891  #
  12.892  # This code is free software; you can redistribute it and/or modify it
  12.893 @@ -3450,7 +3661,95 @@
  12.894  
  12.895  
  12.896  #
  12.897 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
  12.898 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  12.899 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  12.900 +#
  12.901 +# This code is free software; you can redistribute it and/or modify it
  12.902 +# under the terms of the GNU General Public License version 2 only, as
  12.903 +# published by the Free Software Foundation.  Oracle designates this
  12.904 +# particular file as subject to the "Classpath" exception as provided
  12.905 +# by Oracle in the LICENSE file that accompanied this code.
  12.906 +#
  12.907 +# This code is distributed in the hope that it will be useful, but WITHOUT
  12.908 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  12.909 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12.910 +# version 2 for more details (a copy is included in the LICENSE file that
  12.911 +# accompanied this code).
  12.912 +#
  12.913 +# You should have received a copy of the GNU General Public License version
  12.914 +# 2 along with this work; if not, write to the Free Software Foundation,
  12.915 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  12.916 +#
  12.917 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  12.918 +# or visit www.oracle.com if you need additional information or have any
  12.919 +# questions.
  12.920 +#
  12.921 +
  12.922 +
  12.923 +
  12.924 +
  12.925 +
  12.926 +# Documentation on common flags used for solstudio in HIGHEST.
  12.927 +#
  12.928 +# WARNING: Use of OPTIMIZATION_LEVEL=HIGHEST in your Makefile needs to be
  12.929 +#          done with care, there are some assumptions below that need to
  12.930 +#          be understood about the use of pointers, and IEEE behavior.
  12.931 +#
  12.932 +# -fns: Use non-standard floating point mode (not IEEE 754)
  12.933 +# -fsimple: Do some simplification of floating point arithmetic (not IEEE 754)
  12.934 +# -fsingle: Use single precision floating point with 'float'
  12.935 +# -xalias_level=basic: Assume memory references via basic pointer types do not alias
  12.936 +#   (Source with excessing pointer casting and data access with mixed
  12.937 +#    pointer types are not recommended)
  12.938 +# -xbuiltin=%all: Use intrinsic or inline versions for math/std functions
  12.939 +#   (If you expect perfect errno behavior, do not use this)
  12.940 +# -xdepend: Loop data dependency optimizations (need -xO3 or higher)
  12.941 +# -xrestrict: Pointer parameters to functions do not overlap
  12.942 +#   (Similar to -xalias_level=basic usage, but less obvious sometimes.
  12.943 +#    If you pass in multiple pointers to the same data, do not use this)
  12.944 +# -xlibmil: Inline some library routines
  12.945 +#   (If you expect perfect errno behavior, do not use this)
  12.946 +# -xlibmopt: Use optimized math routines (CURRENTLY DISABLED)
  12.947 +#   (If you expect perfect errno behavior, do not use this)
  12.948 +#  Can cause undefined external on Solaris 8 X86 on __sincos, removing for now
  12.949 +
  12.950 +    # FIXME: this will never happen since sparc != sparcv9, ie 32 bit, which we don't build anymore.
  12.951 +    # Bug?
  12.952 +    #if test "x$OPENJDK_TARGET_CPU" = xsparc; then
  12.953 +    #  CFLAGS_JDK="${CFLAGS_JDK} -xmemalign=4s"
  12.954 +    #  CXXFLAGS_JDK="${CXXFLAGS_JDK} -xmemalign=4s"
  12.955 +    #fi
  12.956 +
  12.957 +
  12.958 +
  12.959 +
  12.960 +
  12.961 +
  12.962 +# FLAGS_C_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
  12.963 +#                                  [RUN-IF-FALSE])
  12.964 +# ------------------------------------------------------------
  12.965 +# Check that the C compiler supports an argument
  12.966 +
  12.967 +
  12.968 +# FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
  12.969 +#                                    [RUN-IF-FALSE])
  12.970 +# ------------------------------------------------------------
  12.971 +# Check that the C++ compiler supports an argument
  12.972 +
  12.973 +
  12.974 +# FLAGS_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
  12.975 +#                                [RUN-IF-FALSE])
  12.976 +# ------------------------------------------------------------
  12.977 +# Check that the C and C++ compilers support an argument
  12.978 +
  12.979 +
  12.980 +
  12.981 +
  12.982 +
  12.983 +
  12.984 +
  12.985 +#
  12.986 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
  12.987  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  12.988  #
  12.989  # This code is free software; you can redistribute it and/or modify it
  12.990 @@ -3493,20 +3792,18 @@
  12.991        HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
  12.992        ;;
  12.993      freetype)
  12.994 -      if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
  12.995 -        HELP_MSG="To install freetype, run:
  12.996 -wget \"http://gnuwin32.sourceforge.net/downlinks/freetype.php\" -O /tmp/freetype-setup.exe
  12.997 -chmod +x /tmp/freetype-setup.exe
  12.998 -/tmp/freetype-setup.exe
  12.999 -Follow GUI prompts, and install to default directory \"C:\Program Files (x86)\GnuWin32\".
 12.1000 -After installation, locate lib/libfreetype.dll.a and make a copy with the name freetype.dll."
 12.1001 -      else
 12.1002 -        HELP_MSG="You need to build a 64-bit version of freetype.
 12.1003 -This is not readily available.
 12.1004 -You can find source code and build instructions on
 12.1005 -http://www.freetype.org/
 12.1006 -If you put the resulting build in \"C:\Program Files\GnuWin32\", it will be found automatically."
 12.1007 -      fi
 12.1008 +      HELP_MSG="
 12.1009 +The freetype library can now be build during the configure process.
 12.1010 +Download the freetype sources and unpack them into an arbitrary directory:
 12.1011 +
 12.1012 +wget http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.gz
 12.1013 +tar -xzf freetype-2.5.3.tar.gz
 12.1014 +
 12.1015 +Then run configure with '--with-freetype-src=<freetype_src>'. This will
 12.1016 +automatically build the freetype library into '<freetype_src>/lib64' for 64-bit
 12.1017 +builds or into '<freetype_src>/lib32' for 32-bit builds.
 12.1018 +Afterwards you can always use '--with-freetype-include=<freetype_src>/include'
 12.1019 +and '--with-freetype-lib=<freetype_src>/lib32|64' for other builds."
 12.1020        ;;
 12.1021    esac
 12.1022  }
 12.1023 @@ -3569,10 +3866,16 @@
 12.1024    PKGHANDLER_COMMAND=""
 12.1025  }
 12.1026  
 12.1027 -
 12.1028 -
 12.1029 -#
 12.1030 -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 12.1031 +# This function will check if we're called from the "configure" wrapper while
 12.1032 +# printing --help. If so, we will print out additional information that can
 12.1033 +# only be extracted within the autoconf script, and then exit. This must be
 12.1034 +# called at the very beginning in configure.ac.
 12.1035 +
 12.1036 +
 12.1037 +
 12.1038 +
 12.1039 +#
 12.1040 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 12.1041  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 12.1042  #
 12.1043  # This code is free software; you can redistribute it and/or modify it
 12.1044 @@ -3636,7 +3939,7 @@
 12.1045  
 12.1046  
 12.1047  #
 12.1048 -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 12.1049 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 12.1050  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 12.1051  #
 12.1052  # This code is free software; you can redistribute it and/or modify it
 12.1053 @@ -3676,6 +3979,10 @@
 12.1054  
 12.1055  
 12.1056  
 12.1057 +
 12.1058 +
 12.1059 +
 12.1060 +
 12.1061  #
 12.1062  # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 12.1063  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 12.1064 @@ -3800,8 +4107,37 @@
 12.1065  # questions.
 12.1066  #
 12.1067  
 12.1068 +########################################################################
 12.1069 +# This file is responsible for detecting, verifying and setting up the
 12.1070 +# toolchain, i.e. the compiler, linker and related utilities. It will setup
 12.1071 +# proper paths to the binaries, but it will not setup any flags.
 12.1072 +#
 12.1073 +# The binaries used is determined by the toolchain type, which is the family of
 12.1074 +# compilers and related tools that are used.
 12.1075 +########################################################################
 12.1076 +
 12.1077 +
 12.1078 +# All valid toolchains, regardless of platform (used by help.m4)
 12.1079 +VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft"
 12.1080 +
 12.1081 +# These toolchains are valid on different platforms
 12.1082 +VALID_TOOLCHAINS_linux="gcc clang"
 12.1083 +VALID_TOOLCHAINS_solaris="solstudio"
 12.1084 +VALID_TOOLCHAINS_macosx="gcc clang"
 12.1085 +VALID_TOOLCHAINS_aix="xlc"
 12.1086 +VALID_TOOLCHAINS_windows="microsoft"
 12.1087 +
 12.1088 +# Toolchain descriptions
 12.1089 +TOOLCHAIN_DESCRIPTION_clang="clang/LLVM"
 12.1090 +TOOLCHAIN_DESCRIPTION_gcc="GNU Compiler Collection"
 12.1091 +TOOLCHAIN_DESCRIPTION_microsoft="Microsoft Visual Studio"
 12.1092 +TOOLCHAIN_DESCRIPTION_solstudio="Oracle Solaris Studio"
 12.1093 +TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++"
 12.1094 +
 12.1095  # Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be called.
 12.1096  # Must have CC_VERSION_NUMBER and CXX_VERSION_NUMBER.
 12.1097 +# $1 - optional variable prefix for compiler and version variables (BUILD_)
 12.1098 +# $2 - optional variable prefix for comparable variable (OPENJDK_BUILD_)
 12.1099  
 12.1100  
 12.1101  # Check if the configured compiler (C and C++) is of a specific version or
 12.1102 @@ -3813,56 +4149,70 @@
 12.1103  #   $3:   block to run if the compiler is older than this version (<)
 12.1104  
 12.1105  
 12.1106 +
 12.1107 +# Setup a number of variables describing how native output files are
 12.1108 +# named on this platform/toolchain.
 12.1109 +
 12.1110 +
 12.1111 +# Determine which toolchain type to use, and make sure it is valid for this
 12.1112 +# platform. Setup various information about the selected toolchain.
 12.1113 +
 12.1114 +
 12.1115 +# Before we start detecting the toolchain executables, we might need some
 12.1116 +# special setup, e.g. additional paths etc.
 12.1117 +
 12.1118 +
 12.1119 +# Restore path, etc
 12.1120 +
 12.1121 +
 12.1122 +# Check if a compiler is of the toolchain type we expect, and save the version
 12.1123 +# information from it. If the compiler does not match the expected type,
 12.1124 +# this function will abort using AC_MSG_ERROR. If it matches, the version will
 12.1125 +# be stored in CC_VERSION_NUMBER/CXX_VERSION_NUMBER (as a dotted number), and
 12.1126 +# the full version string in CC_VERSION_STRING/CXX_VERSION_STRING.
 12.1127 +#
 12.1128  # $1 = compiler to test (CC or CXX)
 12.1129  # $2 = human readable name of compiler (C or C++)
 12.1130  
 12.1131  
 12.1132  
 12.1133 -
 12.1134 -
 12.1135 +# Try to locate the given C or C++ compiler in the path, or otherwise.
 12.1136 +#
 12.1137  # $1 = compiler to test (CC or CXX)
 12.1138  # $2 = human readable name of compiler (C or C++)
 12.1139  # $3 = list of compiler names to search for
 12.1140  
 12.1141  
 12.1142 -
 12.1143 -
 12.1144 -
 12.1145 -
 12.1146 -
 12.1147 -
 12.1148 -
 12.1149 -
 12.1150 -
 12.1151 -
 12.1152 -
 12.1153 -# TOOLCHAIN_C_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
 12.1154 -#                                      [RUN-IF-FALSE])
 12.1155 -# ------------------------------------------------------------
 12.1156 -# Check that the C compiler supports an argument
 12.1157 -
 12.1158 -
 12.1159 -# TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
 12.1160 -#                                        [RUN-IF-FALSE])
 12.1161 -# ------------------------------------------------------------
 12.1162 -# Check that the C++ compiler supports an argument
 12.1163 -
 12.1164 -
 12.1165 -# TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([ARGUMENT], [RUN-IF-TRUE],
 12.1166 -#                                    [RUN-IF-FALSE])
 12.1167 -# ------------------------------------------------------------
 12.1168 -# Check that the C and C++ compilers support an argument
 12.1169 -
 12.1170 -
 12.1171 -
 12.1172 -
 12.1173 -# Setup the JTREG paths
 12.1174 -
 12.1175 -
 12.1176 -
 12.1177 -
 12.1178 -#
 12.1179 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 12.1180 +# Detect the core components of the toolchain, i.e. the compilers (CC and CXX),
 12.1181 +# preprocessor (CPP and CXXCPP), the linker (LD), the assembler (AS) and the
 12.1182 +# archiver (AR). Verify that the compilers are correct according to the
 12.1183 +# toolchain type.
 12.1184 +
 12.1185 +
 12.1186 +# Setup additional tools that is considered a part of the toolchain, but not the
 12.1187 +# core part. Many of these are highly platform-specific and do not exist,
 12.1188 +# and/or are not needed on all platforms.
 12.1189 +
 12.1190 +
 12.1191 +# Setup the build tools (i.e, the compiler and linker used to build programs
 12.1192 +# that should be run on the build platform, not the target platform, as a build
 12.1193 +# helper). Since the non-cross-compile case uses the normal, target compilers
 12.1194 +# for this, we can only do this after these have been setup.
 12.1195 +
 12.1196 +
 12.1197 +# Setup legacy variables that are still needed as alternative ways to refer to
 12.1198 +# parts of the toolchain.
 12.1199 +
 12.1200 +
 12.1201 +# Do some additional checks on the detected tools.
 12.1202 +
 12.1203 +
 12.1204 +# Setup the JTReg Regression Test Harness.
 12.1205 +
 12.1206 +
 12.1207 +
 12.1208 +#
 12.1209 +# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
 12.1210  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 12.1211  #
 12.1212  # This code is free software; you can redistribute it and/or modify it
 12.1213 @@ -3886,12 +4236,83 @@
 12.1214  # questions.
 12.1215  #
 12.1216  
 12.1217 -
 12.1218 -
 12.1219 -
 12.1220 -
 12.1221 -
 12.1222 -
 12.1223 +################################################################################
 12.1224 +# The order of these defines the priority by which we try to find them.
 12.1225 +VALID_VS_VERSIONS="2010 2012 2013 2015 2017"
 12.1226 +
 12.1227 +VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
 12.1228 +VS_VERSION_INTERNAL_2010=100
 12.1229 +VS_MSVCR_2010=msvcr100.dll
 12.1230 +# We don't use msvcp on Visual Studio 2010
 12.1231 +#VS_MSVCP_2010=msvcp100.dll
 12.1232 +VS_ENVVAR_2010="VS100COMNTOOLS"
 12.1233 +VS_VS_INSTALLDIR_2010="Microsoft Visual Studio 10.0"
 12.1234 +VS_SDK_INSTALLDIR_2010="Microsoft SDKs/Windows/v7.1"
 12.1235 +VS_VS_PLATFORM_NAME_2010="v100"
 12.1236 +VS_SDK_PLATFORM_NAME_2010="Windows7.1SDK"
 12.1237 +
 12.1238 +VS_DESCRIPTION_2012="Microsoft Visual Studio 2012"
 12.1239 +VS_VERSION_INTERNAL_2012=110
 12.1240 +VS_MSVCR_2012=msvcr110.dll
 12.1241 +VS_MSVCP_2012=msvcp110.dll
 12.1242 +VS_ENVVAR_2012="VS110COMNTOOLS"
 12.1243 +VS_VS_INSTALLDIR_2012="Microsoft Visual Studio 11.0"
 12.1244 +VS_SDK_INSTALLDIR_2012=
 12.1245 +VS_VS_PLATFORM_NAME_2012="v110"
 12.1246 +VS_SDK_PLATFORM_NAME_2012=
 12.1247 +
 12.1248 +VS_DESCRIPTION_2013="Microsoft Visual Studio 2013"
 12.1249 +VS_VERSION_INTERNAL_2013=120
 12.1250 +VS_MSVCR_2013=msvcr120.dll
 12.1251 +VS_MSVCP_2013=msvcp120.dll
 12.1252 +VS_ENVVAR_2013="VS120COMNTOOLS"
 12.1253 +VS_VS_INSTALLDIR_2013="Microsoft Visual Studio 12.0"
 12.1254 +VS_SDK_INSTALLDIR_2013=
 12.1255 +VS_VS_PLATFORM_NAME_2013="v120"
 12.1256 +VS_SDK_PLATFORM_NAME_2013=
 12.1257 +
 12.1258 +VS_DESCRIPTION_2015="Microsoft Visual Studio 2015 - CURRENTLY NOT WORKING"
 12.1259 +VS_VERSION_INTERNAL_2015=140
 12.1260 +VS_MSVCR_2015=vcruntime140.dll
 12.1261 +VS_MSVCP_2015=msvcp140.dll
 12.1262 +VS_ENVVAR_2015="VS140COMNTOOLS"
 12.1263 +VS_VS_INSTALLDIR_2015="Microsoft Visual Studio 14.0"
 12.1264 +VS_SDK_INSTALLDIR_2015=
 12.1265 +VS_VS_PLATFORM_NAME_2015="v140"
 12.1266 +VS_SDK_PLATFORM_NAME_2015=
 12.1267 +# The vcvars of 2015 breaks if 2017 is also installed. Work around this by
 12.1268 +# explicitly specifying Windows Kit 8.1 to be used.
 12.1269 +VS_ENV_ARGS_2015="8.1"
 12.1270 +
 12.1271 +VS_DESCRIPTION_2017="Microsoft Visual Studio 2017 - CURRENTLY NOT WORKING"
 12.1272 +VS_VERSION_INTERNAL_2017=141
 12.1273 +VS_MSVCR_2017=vcruntime140.dll
 12.1274 +VS_MSVCP_2017=msvcp140.dll
 12.1275 +VS_ENVVAR_2017="VS150COMNTOOLS"
 12.1276 +VS_VS_INSTALLDIR_2017="Microsoft Visual Studio/2017"
 12.1277 +VS_EDITIONS_2017="Community Professional Enterprise"
 12.1278 +VS_SDK_INSTALLDIR_2017=
 12.1279 +VS_VS_PLATFORM_NAME_2017="v141"
 12.1280 +VS_SDK_PLATFORM_NAME_2017=
 12.1281 +
 12.1282 +################################################################################
 12.1283 +
 12.1284 +
 12.1285 +
 12.1286 +################################################################################
 12.1287 +
 12.1288 +
 12.1289 +
 12.1290 +################################################################################
 12.1291 +# Finds the bat or cmd file in Visual Studio or the SDK that sets up a proper
 12.1292 +# build environment and assigns it to VS_ENV_CMD
 12.1293 +
 12.1294 +
 12.1295 +################################################################################
 12.1296 +
 12.1297 +
 12.1298 +
 12.1299 +################################################################################
 12.1300  # Check if the VS env variables were setup prior to running configure.
 12.1301  # If not, then find vcvarsall.bat and run it automatically, and integrate
 12.1302  # the set env variables into the spec file.
 12.1303 @@ -3906,13 +4327,16 @@
 12.1304  
 12.1305  
 12.1306  
 12.1307 +
 12.1308 +
 12.1309 +
 12.1310  # This line needs to be here, verbatim, after all includes and the dummy hook
 12.1311  # definitions. It is replaced with custom functionality when building
 12.1312  # custom sources.
 12.1313  #CUSTOM_AUTOCONF_INCLUDE
 12.1314  
 12.1315  # Do not change or remove the following line, it is needed for consistency checks:
 12.1316 -DATE_WHEN_GENERATED=1523388104
 12.1317 +DATE_WHEN_GENERATED=1533314440
 12.1318  
 12.1319  ###############################################################################
 12.1320  #
 12.1321 @@ -3923,7 +4347,25 @@
 12.1322  #
 12.1323  ###############################################################################
 12.1324  
 12.1325 -# Basic initialization that must happen first of all
 12.1326 +# If we are requested to print additional help, do that and then exit.
 12.1327 +# This must be the very first call.
 12.1328 +
 12.1329 +  if test "x$CONFIGURE_PRINT_TOOLCHAIN_LIST" != x; then
 12.1330 +    $PRINTF "The following toolchains are available as arguments to --with-toolchain-type.\n"
 12.1331 +    $PRINTF "Which are valid to use depends on the build platform.\n"
 12.1332 +    for toolchain in $VALID_TOOLCHAINS_all; do
 12.1333 +      # Use indirect variable referencing
 12.1334 +      toolchain_var_name=TOOLCHAIN_DESCRIPTION_$toolchain
 12.1335 +      TOOLCHAIN_DESCRIPTION=${!toolchain_var_name}
 12.1336 +      $PRINTF "  %-10s  %s\n" $toolchain "$TOOLCHAIN_DESCRIPTION"
 12.1337 +    done
 12.1338 +
 12.1339 +    # And now exit directly
 12.1340 +    exit 0
 12.1341 +  fi
 12.1342 +
 12.1343 +
 12.1344 +# Basic initialization that must happen first of all in the normal process.
 12.1345  
 12.1346    # Save the original command line. This is passed to us by the wrapper configure script.
 12.1347  
 12.1348 @@ -3935,7 +4377,6 @@
 12.1349  $as_echo "$as_me: configure script generated at timestamp $DATE_WHEN_GENERATED." >&6;}
 12.1350  
 12.1351  
 12.1352 -
 12.1353    # Start with tools that do not need have cross compilation support
 12.1354    # and can be expected to be found in the default PATH. These tools are
 12.1355    # used by configure. Nor are these tools expected to be found in the
 12.1356 @@ -3944,7 +4385,14 @@
 12.1357  
 12.1358    # First are all the simple required tools.
 12.1359  
 12.1360 -  for ac_prog in basename
 12.1361 +
 12.1362 +
 12.1363 +  # Publish this variable in the help.
 12.1364 +
 12.1365 +
 12.1366 +  if test "x$BASENAME" = x; then
 12.1367 +    # The variable is not set by user, try to locate tool using the code snippet
 12.1368 +    for ac_prog in basename
 12.1369  do
 12.1370    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.1371  set dummy $ac_prog; ac_word=$2
 12.1372 @@ -3989,21 +4437,155 @@
 12.1373    test -n "$BASENAME" && break
 12.1374  done
 12.1375  
 12.1376 +  else
 12.1377 +    # The variable is set, but is it from the command line or the environment?
 12.1378 +
 12.1379 +    # Try to remove the string !BASENAME! from our list.
 12.1380 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BASENAME!/}
 12.1381 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.1382 +      # If it failed, the variable was not from the command line. Ignore it,
 12.1383 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.1384 +      if test "xBASENAME" != xBASH; then
 12.1385 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BASENAME from the environment. Use command line variables instead." >&5
 12.1386 +$as_echo "$as_me: WARNING: Ignoring value of BASENAME from the environment. Use command line variables instead." >&2;}
 12.1387 +      fi
 12.1388 +      # Try to locate tool using the code snippet
 12.1389 +      for ac_prog in basename
 12.1390 +do
 12.1391 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.1392 +set dummy $ac_prog; ac_word=$2
 12.1393 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.1394 +$as_echo_n "checking for $ac_word... " >&6; }
 12.1395 +if ${ac_cv_path_BASENAME+:} false; then :
 12.1396 +  $as_echo_n "(cached) " >&6
 12.1397 +else
 12.1398 +  case $BASENAME in
 12.1399 +  [\\/]* | ?:[\\/]*)
 12.1400 +  ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path.
 12.1401 +  ;;
 12.1402 +  *)
 12.1403 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.1404 +for as_dir in $PATH
 12.1405 +do
 12.1406 +  IFS=$as_save_IFS
 12.1407 +  test -z "$as_dir" && as_dir=.
 12.1408 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.1409 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.1410 +    ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext"
 12.1411 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.1412 +    break 2
 12.1413 +  fi
 12.1414 +done
 12.1415 +  done
 12.1416 +IFS=$as_save_IFS
 12.1417 +
 12.1418 +  ;;
 12.1419 +esac
 12.1420 +fi
 12.1421 +BASENAME=$ac_cv_path_BASENAME
 12.1422 +if test -n "$BASENAME"; then
 12.1423 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5
 12.1424 +$as_echo "$BASENAME" >&6; }
 12.1425 +else
 12.1426 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.1427 +$as_echo "no" >&6; }
 12.1428 +fi
 12.1429 +
 12.1430 +
 12.1431 +  test -n "$BASENAME" && break
 12.1432 +done
 12.1433 +
 12.1434 +    else
 12.1435 +      # If it succeeded, then it was overridden by the user. We will use it
 12.1436 +      # for the tool.
 12.1437 +
 12.1438 +      # First remove it from the list of overridden variables, so we can test
 12.1439 +      # for unknown variables in the end.
 12.1440 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.1441 +
 12.1442 +      # Check if the provided tool contains a complete path.
 12.1443 +      tool_specified="$BASENAME"
 12.1444 +      tool_basename="${tool_specified##*/}"
 12.1445 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.1446 +        # A command without a complete path is provided, search $PATH.
 12.1447 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BASENAME=$tool_basename" >&5
 12.1448 +$as_echo "$as_me: Will search for user supplied tool BASENAME=$tool_basename" >&6;}
 12.1449 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.1450 +set dummy $tool_basename; ac_word=$2
 12.1451 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.1452 +$as_echo_n "checking for $ac_word... " >&6; }
 12.1453 +if ${ac_cv_path_BASENAME+:} false; then :
 12.1454 +  $as_echo_n "(cached) " >&6
 12.1455 +else
 12.1456 +  case $BASENAME in
 12.1457 +  [\\/]* | ?:[\\/]*)
 12.1458 +  ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path.
 12.1459 +  ;;
 12.1460 +  *)
 12.1461 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.1462 +for as_dir in $PATH
 12.1463 +do
 12.1464 +  IFS=$as_save_IFS
 12.1465 +  test -z "$as_dir" && as_dir=.
 12.1466 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.1467 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.1468 +    ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext"
 12.1469 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.1470 +    break 2
 12.1471 +  fi
 12.1472 +done
 12.1473 +  done
 12.1474 +IFS=$as_save_IFS
 12.1475 +
 12.1476 +  ;;
 12.1477 +esac
 12.1478 +fi
 12.1479 +BASENAME=$ac_cv_path_BASENAME
 12.1480 +if test -n "$BASENAME"; then
 12.1481 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5
 12.1482 +$as_echo "$BASENAME" >&6; }
 12.1483 +else
 12.1484 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.1485 +$as_echo "no" >&6; }
 12.1486 +fi
 12.1487 +
 12.1488 +
 12.1489 +        if test "x$BASENAME" = x; then
 12.1490 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.1491 +        fi
 12.1492 +      else
 12.1493 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.1494 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BASENAME=$tool_specified" >&5
 12.1495 +$as_echo "$as_me: Will use user supplied tool BASENAME=$tool_specified" >&6;}
 12.1496 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASENAME" >&5
 12.1497 +$as_echo_n "checking for BASENAME... " >&6; }
 12.1498 +        if test ! -x "$tool_specified"; then
 12.1499 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.1500 +$as_echo "not found" >&6; }
 12.1501 +          as_fn_error $? "User supplied tool BASENAME=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.1502 +        fi
 12.1503 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.1504 +$as_echo "$tool_specified" >&6; }
 12.1505 +      fi
 12.1506 +    fi
 12.1507 +  fi
 12.1508 +
 12.1509 +
 12.1510  
 12.1511    if test "x$BASENAME" = x; then
 12.1512 -    if test "xbasename" = x; then
 12.1513 -      PROG_NAME=basename
 12.1514 -    else
 12.1515 -      PROG_NAME=basename
 12.1516 -    fi
 12.1517 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.1518 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.1519 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.1520 -  fi
 12.1521 -
 12.1522 -
 12.1523 -
 12.1524 -  for ac_prog in bash
 12.1525 +    as_fn_error $? "Could not find required tool for BASENAME" "$LINENO" 5
 12.1526 +  fi
 12.1527 +
 12.1528 +
 12.1529 +
 12.1530 +
 12.1531 +
 12.1532 +  # Publish this variable in the help.
 12.1533 +
 12.1534 +
 12.1535 +  if test "x$BASH" = x; then
 12.1536 +    # The variable is not set by user, try to locate tool using the code snippet
 12.1537 +    for ac_prog in bash
 12.1538  do
 12.1539    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.1540  set dummy $ac_prog; ac_word=$2
 12.1541 @@ -4048,21 +4630,155 @@
 12.1542    test -n "$BASH" && break
 12.1543  done
 12.1544  
 12.1545 +  else
 12.1546 +    # The variable is set, but is it from the command line or the environment?
 12.1547 +
 12.1548 +    # Try to remove the string !BASH! from our list.
 12.1549 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BASH!/}
 12.1550 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.1551 +      # If it failed, the variable was not from the command line. Ignore it,
 12.1552 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.1553 +      if test "xBASH" != xBASH; then
 12.1554 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BASH from the environment. Use command line variables instead." >&5
 12.1555 +$as_echo "$as_me: WARNING: Ignoring value of BASH from the environment. Use command line variables instead." >&2;}
 12.1556 +      fi
 12.1557 +      # Try to locate tool using the code snippet
 12.1558 +      for ac_prog in bash
 12.1559 +do
 12.1560 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.1561 +set dummy $ac_prog; ac_word=$2
 12.1562 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.1563 +$as_echo_n "checking for $ac_word... " >&6; }
 12.1564 +if ${ac_cv_path_BASH+:} false; then :
 12.1565 +  $as_echo_n "(cached) " >&6
 12.1566 +else
 12.1567 +  case $BASH in
 12.1568 +  [\\/]* | ?:[\\/]*)
 12.1569 +  ac_cv_path_BASH="$BASH" # Let the user override the test with a path.
 12.1570 +  ;;
 12.1571 +  *)
 12.1572 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.1573 +for as_dir in $PATH
 12.1574 +do
 12.1575 +  IFS=$as_save_IFS
 12.1576 +  test -z "$as_dir" && as_dir=.
 12.1577 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.1578 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.1579 +    ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext"
 12.1580 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.1581 +    break 2
 12.1582 +  fi
 12.1583 +done
 12.1584 +  done
 12.1585 +IFS=$as_save_IFS
 12.1586 +
 12.1587 +  ;;
 12.1588 +esac
 12.1589 +fi
 12.1590 +BASH=$ac_cv_path_BASH
 12.1591 +if test -n "$BASH"; then
 12.1592 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
 12.1593 +$as_echo "$BASH" >&6; }
 12.1594 +else
 12.1595 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.1596 +$as_echo "no" >&6; }
 12.1597 +fi
 12.1598 +
 12.1599 +
 12.1600 +  test -n "$BASH" && break
 12.1601 +done
 12.1602 +
 12.1603 +    else
 12.1604 +      # If it succeeded, then it was overridden by the user. We will use it
 12.1605 +      # for the tool.
 12.1606 +
 12.1607 +      # First remove it from the list of overridden variables, so we can test
 12.1608 +      # for unknown variables in the end.
 12.1609 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.1610 +
 12.1611 +      # Check if the provided tool contains a complete path.
 12.1612 +      tool_specified="$BASH"
 12.1613 +      tool_basename="${tool_specified##*/}"
 12.1614 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.1615 +        # A command without a complete path is provided, search $PATH.
 12.1616 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BASH=$tool_basename" >&5
 12.1617 +$as_echo "$as_me: Will search for user supplied tool BASH=$tool_basename" >&6;}
 12.1618 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.1619 +set dummy $tool_basename; ac_word=$2
 12.1620 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.1621 +$as_echo_n "checking for $ac_word... " >&6; }
 12.1622 +if ${ac_cv_path_BASH+:} false; then :
 12.1623 +  $as_echo_n "(cached) " >&6
 12.1624 +else
 12.1625 +  case $BASH in
 12.1626 +  [\\/]* | ?:[\\/]*)
 12.1627 +  ac_cv_path_BASH="$BASH" # Let the user override the test with a path.
 12.1628 +  ;;
 12.1629 +  *)
 12.1630 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.1631 +for as_dir in $PATH
 12.1632 +do
 12.1633 +  IFS=$as_save_IFS
 12.1634 +  test -z "$as_dir" && as_dir=.
 12.1635 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.1636 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.1637 +    ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext"
 12.1638 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.1639 +    break 2
 12.1640 +  fi
 12.1641 +done
 12.1642 +  done
 12.1643 +IFS=$as_save_IFS
 12.1644 +
 12.1645 +  ;;
 12.1646 +esac
 12.1647 +fi
 12.1648 +BASH=$ac_cv_path_BASH
 12.1649 +if test -n "$BASH"; then
 12.1650 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
 12.1651 +$as_echo "$BASH" >&6; }
 12.1652 +else
 12.1653 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.1654 +$as_echo "no" >&6; }
 12.1655 +fi
 12.1656 +
 12.1657 +
 12.1658 +        if test "x$BASH" = x; then
 12.1659 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.1660 +        fi
 12.1661 +      else
 12.1662 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.1663 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BASH=$tool_specified" >&5
 12.1664 +$as_echo "$as_me: Will use user supplied tool BASH=$tool_specified" >&6;}
 12.1665 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASH" >&5
 12.1666 +$as_echo_n "checking for BASH... " >&6; }
 12.1667 +        if test ! -x "$tool_specified"; then
 12.1668 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.1669 +$as_echo "not found" >&6; }
 12.1670 +          as_fn_error $? "User supplied tool BASH=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.1671 +        fi
 12.1672 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.1673 +$as_echo "$tool_specified" >&6; }
 12.1674 +      fi
 12.1675 +    fi
 12.1676 +  fi
 12.1677 +
 12.1678 +
 12.1679  
 12.1680    if test "x$BASH" = x; then
 12.1681 -    if test "xbash" = x; then
 12.1682 -      PROG_NAME=bash
 12.1683 -    else
 12.1684 -      PROG_NAME=bash
 12.1685 -    fi
 12.1686 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.1687 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.1688 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.1689 -  fi
 12.1690 -
 12.1691 -
 12.1692 -
 12.1693 -  for ac_prog in cat
 12.1694 +    as_fn_error $? "Could not find required tool for BASH" "$LINENO" 5
 12.1695 +  fi
 12.1696 +
 12.1697 +
 12.1698 +
 12.1699 +
 12.1700 +
 12.1701 +  # Publish this variable in the help.
 12.1702 +
 12.1703 +
 12.1704 +  if test "x$CAT" = x; then
 12.1705 +    # The variable is not set by user, try to locate tool using the code snippet
 12.1706 +    for ac_prog in cat
 12.1707  do
 12.1708    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.1709  set dummy $ac_prog; ac_word=$2
 12.1710 @@ -4107,21 +4823,155 @@
 12.1711    test -n "$CAT" && break
 12.1712  done
 12.1713  
 12.1714 +  else
 12.1715 +    # The variable is set, but is it from the command line or the environment?
 12.1716 +
 12.1717 +    # Try to remove the string !CAT! from our list.
 12.1718 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CAT!/}
 12.1719 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.1720 +      # If it failed, the variable was not from the command line. Ignore it,
 12.1721 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.1722 +      if test "xCAT" != xBASH; then
 12.1723 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CAT from the environment. Use command line variables instead." >&5
 12.1724 +$as_echo "$as_me: WARNING: Ignoring value of CAT from the environment. Use command line variables instead." >&2;}
 12.1725 +      fi
 12.1726 +      # Try to locate tool using the code snippet
 12.1727 +      for ac_prog in cat
 12.1728 +do
 12.1729 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.1730 +set dummy $ac_prog; ac_word=$2
 12.1731 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.1732 +$as_echo_n "checking for $ac_word... " >&6; }
 12.1733 +if ${ac_cv_path_CAT+:} false; then :
 12.1734 +  $as_echo_n "(cached) " >&6
 12.1735 +else
 12.1736 +  case $CAT in
 12.1737 +  [\\/]* | ?:[\\/]*)
 12.1738 +  ac_cv_path_CAT="$CAT" # Let the user override the test with a path.
 12.1739 +  ;;
 12.1740 +  *)
 12.1741 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.1742 +for as_dir in $PATH
 12.1743 +do
 12.1744 +  IFS=$as_save_IFS
 12.1745 +  test -z "$as_dir" && as_dir=.
 12.1746 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.1747 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.1748 +    ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext"
 12.1749 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.1750 +    break 2
 12.1751 +  fi
 12.1752 +done
 12.1753 +  done
 12.1754 +IFS=$as_save_IFS
 12.1755 +
 12.1756 +  ;;
 12.1757 +esac
 12.1758 +fi
 12.1759 +CAT=$ac_cv_path_CAT
 12.1760 +if test -n "$CAT"; then
 12.1761 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAT" >&5
 12.1762 +$as_echo "$CAT" >&6; }
 12.1763 +else
 12.1764 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.1765 +$as_echo "no" >&6; }
 12.1766 +fi
 12.1767 +
 12.1768 +
 12.1769 +  test -n "$CAT" && break
 12.1770 +done
 12.1771 +
 12.1772 +    else
 12.1773 +      # If it succeeded, then it was overridden by the user. We will use it
 12.1774 +      # for the tool.
 12.1775 +
 12.1776 +      # First remove it from the list of overridden variables, so we can test
 12.1777 +      # for unknown variables in the end.
 12.1778 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.1779 +
 12.1780 +      # Check if the provided tool contains a complete path.
 12.1781 +      tool_specified="$CAT"
 12.1782 +      tool_basename="${tool_specified##*/}"
 12.1783 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.1784 +        # A command without a complete path is provided, search $PATH.
 12.1785 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CAT=$tool_basename" >&5
 12.1786 +$as_echo "$as_me: Will search for user supplied tool CAT=$tool_basename" >&6;}
 12.1787 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.1788 +set dummy $tool_basename; ac_word=$2
 12.1789 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.1790 +$as_echo_n "checking for $ac_word... " >&6; }
 12.1791 +if ${ac_cv_path_CAT+:} false; then :
 12.1792 +  $as_echo_n "(cached) " >&6
 12.1793 +else
 12.1794 +  case $CAT in
 12.1795 +  [\\/]* | ?:[\\/]*)
 12.1796 +  ac_cv_path_CAT="$CAT" # Let the user override the test with a path.
 12.1797 +  ;;
 12.1798 +  *)
 12.1799 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.1800 +for as_dir in $PATH
 12.1801 +do
 12.1802 +  IFS=$as_save_IFS
 12.1803 +  test -z "$as_dir" && as_dir=.
 12.1804 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.1805 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.1806 +    ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext"
 12.1807 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.1808 +    break 2
 12.1809 +  fi
 12.1810 +done
 12.1811 +  done
 12.1812 +IFS=$as_save_IFS
 12.1813 +
 12.1814 +  ;;
 12.1815 +esac
 12.1816 +fi
 12.1817 +CAT=$ac_cv_path_CAT
 12.1818 +if test -n "$CAT"; then
 12.1819 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAT" >&5
 12.1820 +$as_echo "$CAT" >&6; }
 12.1821 +else
 12.1822 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.1823 +$as_echo "no" >&6; }
 12.1824 +fi
 12.1825 +
 12.1826 +
 12.1827 +        if test "x$CAT" = x; then
 12.1828 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.1829 +        fi
 12.1830 +      else
 12.1831 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.1832 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CAT=$tool_specified" >&5
 12.1833 +$as_echo "$as_me: Will use user supplied tool CAT=$tool_specified" >&6;}
 12.1834 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAT" >&5
 12.1835 +$as_echo_n "checking for CAT... " >&6; }
 12.1836 +        if test ! -x "$tool_specified"; then
 12.1837 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.1838 +$as_echo "not found" >&6; }
 12.1839 +          as_fn_error $? "User supplied tool CAT=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.1840 +        fi
 12.1841 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.1842 +$as_echo "$tool_specified" >&6; }
 12.1843 +      fi
 12.1844 +    fi
 12.1845 +  fi
 12.1846 +
 12.1847 +
 12.1848  
 12.1849    if test "x$CAT" = x; then
 12.1850 -    if test "xcat" = x; then
 12.1851 -      PROG_NAME=cat
 12.1852 -    else
 12.1853 -      PROG_NAME=cat
 12.1854 -    fi
 12.1855 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.1856 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.1857 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.1858 -  fi
 12.1859 -
 12.1860 -
 12.1861 -
 12.1862 -  for ac_prog in chmod
 12.1863 +    as_fn_error $? "Could not find required tool for CAT" "$LINENO" 5
 12.1864 +  fi
 12.1865 +
 12.1866 +
 12.1867 +
 12.1868 +
 12.1869 +
 12.1870 +  # Publish this variable in the help.
 12.1871 +
 12.1872 +
 12.1873 +  if test "x$CHMOD" = x; then
 12.1874 +    # The variable is not set by user, try to locate tool using the code snippet
 12.1875 +    for ac_prog in chmod
 12.1876  do
 12.1877    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.1878  set dummy $ac_prog; ac_word=$2
 12.1879 @@ -4166,21 +5016,155 @@
 12.1880    test -n "$CHMOD" && break
 12.1881  done
 12.1882  
 12.1883 +  else
 12.1884 +    # The variable is set, but is it from the command line or the environment?
 12.1885 +
 12.1886 +    # Try to remove the string !CHMOD! from our list.
 12.1887 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CHMOD!/}
 12.1888 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.1889 +      # If it failed, the variable was not from the command line. Ignore it,
 12.1890 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.1891 +      if test "xCHMOD" != xBASH; then
 12.1892 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CHMOD from the environment. Use command line variables instead." >&5
 12.1893 +$as_echo "$as_me: WARNING: Ignoring value of CHMOD from the environment. Use command line variables instead." >&2;}
 12.1894 +      fi
 12.1895 +      # Try to locate tool using the code snippet
 12.1896 +      for ac_prog in chmod
 12.1897 +do
 12.1898 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.1899 +set dummy $ac_prog; ac_word=$2
 12.1900 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.1901 +$as_echo_n "checking for $ac_word... " >&6; }
 12.1902 +if ${ac_cv_path_CHMOD+:} false; then :
 12.1903 +  $as_echo_n "(cached) " >&6
 12.1904 +else
 12.1905 +  case $CHMOD in
 12.1906 +  [\\/]* | ?:[\\/]*)
 12.1907 +  ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path.
 12.1908 +  ;;
 12.1909 +  *)
 12.1910 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.1911 +for as_dir in $PATH
 12.1912 +do
 12.1913 +  IFS=$as_save_IFS
 12.1914 +  test -z "$as_dir" && as_dir=.
 12.1915 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.1916 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.1917 +    ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
 12.1918 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.1919 +    break 2
 12.1920 +  fi
 12.1921 +done
 12.1922 +  done
 12.1923 +IFS=$as_save_IFS
 12.1924 +
 12.1925 +  ;;
 12.1926 +esac
 12.1927 +fi
 12.1928 +CHMOD=$ac_cv_path_CHMOD
 12.1929 +if test -n "$CHMOD"; then
 12.1930 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHMOD" >&5
 12.1931 +$as_echo "$CHMOD" >&6; }
 12.1932 +else
 12.1933 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.1934 +$as_echo "no" >&6; }
 12.1935 +fi
 12.1936 +
 12.1937 +
 12.1938 +  test -n "$CHMOD" && break
 12.1939 +done
 12.1940 +
 12.1941 +    else
 12.1942 +      # If it succeeded, then it was overridden by the user. We will use it
 12.1943 +      # for the tool.
 12.1944 +
 12.1945 +      # First remove it from the list of overridden variables, so we can test
 12.1946 +      # for unknown variables in the end.
 12.1947 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.1948 +
 12.1949 +      # Check if the provided tool contains a complete path.
 12.1950 +      tool_specified="$CHMOD"
 12.1951 +      tool_basename="${tool_specified##*/}"
 12.1952 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.1953 +        # A command without a complete path is provided, search $PATH.
 12.1954 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CHMOD=$tool_basename" >&5
 12.1955 +$as_echo "$as_me: Will search for user supplied tool CHMOD=$tool_basename" >&6;}
 12.1956 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.1957 +set dummy $tool_basename; ac_word=$2
 12.1958 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.1959 +$as_echo_n "checking for $ac_word... " >&6; }
 12.1960 +if ${ac_cv_path_CHMOD+:} false; then :
 12.1961 +  $as_echo_n "(cached) " >&6
 12.1962 +else
 12.1963 +  case $CHMOD in
 12.1964 +  [\\/]* | ?:[\\/]*)
 12.1965 +  ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path.
 12.1966 +  ;;
 12.1967 +  *)
 12.1968 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.1969 +for as_dir in $PATH
 12.1970 +do
 12.1971 +  IFS=$as_save_IFS
 12.1972 +  test -z "$as_dir" && as_dir=.
 12.1973 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.1974 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.1975 +    ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
 12.1976 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.1977 +    break 2
 12.1978 +  fi
 12.1979 +done
 12.1980 +  done
 12.1981 +IFS=$as_save_IFS
 12.1982 +
 12.1983 +  ;;
 12.1984 +esac
 12.1985 +fi
 12.1986 +CHMOD=$ac_cv_path_CHMOD
 12.1987 +if test -n "$CHMOD"; then
 12.1988 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHMOD" >&5
 12.1989 +$as_echo "$CHMOD" >&6; }
 12.1990 +else
 12.1991 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.1992 +$as_echo "no" >&6; }
 12.1993 +fi
 12.1994 +
 12.1995 +
 12.1996 +        if test "x$CHMOD" = x; then
 12.1997 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.1998 +        fi
 12.1999 +      else
 12.2000 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.2001 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CHMOD=$tool_specified" >&5
 12.2002 +$as_echo "$as_me: Will use user supplied tool CHMOD=$tool_specified" >&6;}
 12.2003 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHMOD" >&5
 12.2004 +$as_echo_n "checking for CHMOD... " >&6; }
 12.2005 +        if test ! -x "$tool_specified"; then
 12.2006 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.2007 +$as_echo "not found" >&6; }
 12.2008 +          as_fn_error $? "User supplied tool CHMOD=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.2009 +        fi
 12.2010 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.2011 +$as_echo "$tool_specified" >&6; }
 12.2012 +      fi
 12.2013 +    fi
 12.2014 +  fi
 12.2015 +
 12.2016 +
 12.2017  
 12.2018    if test "x$CHMOD" = x; then
 12.2019 -    if test "xchmod" = x; then
 12.2020 -      PROG_NAME=chmod
 12.2021 -    else
 12.2022 -      PROG_NAME=chmod
 12.2023 -    fi
 12.2024 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.2025 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.2026 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.2027 -  fi
 12.2028 -
 12.2029 -
 12.2030 -
 12.2031 -  for ac_prog in cmp
 12.2032 +    as_fn_error $? "Could not find required tool for CHMOD" "$LINENO" 5
 12.2033 +  fi
 12.2034 +
 12.2035 +
 12.2036 +
 12.2037 +
 12.2038 +
 12.2039 +  # Publish this variable in the help.
 12.2040 +
 12.2041 +
 12.2042 +  if test "x$CMP" = x; then
 12.2043 +    # The variable is not set by user, try to locate tool using the code snippet
 12.2044 +    for ac_prog in cmp
 12.2045  do
 12.2046    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2047  set dummy $ac_prog; ac_word=$2
 12.2048 @@ -4225,21 +5209,155 @@
 12.2049    test -n "$CMP" && break
 12.2050  done
 12.2051  
 12.2052 +  else
 12.2053 +    # The variable is set, but is it from the command line or the environment?
 12.2054 +
 12.2055 +    # Try to remove the string !CMP! from our list.
 12.2056 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CMP!/}
 12.2057 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.2058 +      # If it failed, the variable was not from the command line. Ignore it,
 12.2059 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.2060 +      if test "xCMP" != xBASH; then
 12.2061 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CMP from the environment. Use command line variables instead." >&5
 12.2062 +$as_echo "$as_me: WARNING: Ignoring value of CMP from the environment. Use command line variables instead." >&2;}
 12.2063 +      fi
 12.2064 +      # Try to locate tool using the code snippet
 12.2065 +      for ac_prog in cmp
 12.2066 +do
 12.2067 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2068 +set dummy $ac_prog; ac_word=$2
 12.2069 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2070 +$as_echo_n "checking for $ac_word... " >&6; }
 12.2071 +if ${ac_cv_path_CMP+:} false; then :
 12.2072 +  $as_echo_n "(cached) " >&6
 12.2073 +else
 12.2074 +  case $CMP in
 12.2075 +  [\\/]* | ?:[\\/]*)
 12.2076 +  ac_cv_path_CMP="$CMP" # Let the user override the test with a path.
 12.2077 +  ;;
 12.2078 +  *)
 12.2079 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2080 +for as_dir in $PATH
 12.2081 +do
 12.2082 +  IFS=$as_save_IFS
 12.2083 +  test -z "$as_dir" && as_dir=.
 12.2084 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2085 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2086 +    ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
 12.2087 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2088 +    break 2
 12.2089 +  fi
 12.2090 +done
 12.2091 +  done
 12.2092 +IFS=$as_save_IFS
 12.2093 +
 12.2094 +  ;;
 12.2095 +esac
 12.2096 +fi
 12.2097 +CMP=$ac_cv_path_CMP
 12.2098 +if test -n "$CMP"; then
 12.2099 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CMP" >&5
 12.2100 +$as_echo "$CMP" >&6; }
 12.2101 +else
 12.2102 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.2103 +$as_echo "no" >&6; }
 12.2104 +fi
 12.2105 +
 12.2106 +
 12.2107 +  test -n "$CMP" && break
 12.2108 +done
 12.2109 +
 12.2110 +    else
 12.2111 +      # If it succeeded, then it was overridden by the user. We will use it
 12.2112 +      # for the tool.
 12.2113 +
 12.2114 +      # First remove it from the list of overridden variables, so we can test
 12.2115 +      # for unknown variables in the end.
 12.2116 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.2117 +
 12.2118 +      # Check if the provided tool contains a complete path.
 12.2119 +      tool_specified="$CMP"
 12.2120 +      tool_basename="${tool_specified##*/}"
 12.2121 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.2122 +        # A command without a complete path is provided, search $PATH.
 12.2123 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CMP=$tool_basename" >&5
 12.2124 +$as_echo "$as_me: Will search for user supplied tool CMP=$tool_basename" >&6;}
 12.2125 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.2126 +set dummy $tool_basename; ac_word=$2
 12.2127 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2128 +$as_echo_n "checking for $ac_word... " >&6; }
 12.2129 +if ${ac_cv_path_CMP+:} false; then :
 12.2130 +  $as_echo_n "(cached) " >&6
 12.2131 +else
 12.2132 +  case $CMP in
 12.2133 +  [\\/]* | ?:[\\/]*)
 12.2134 +  ac_cv_path_CMP="$CMP" # Let the user override the test with a path.
 12.2135 +  ;;
 12.2136 +  *)
 12.2137 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2138 +for as_dir in $PATH
 12.2139 +do
 12.2140 +  IFS=$as_save_IFS
 12.2141 +  test -z "$as_dir" && as_dir=.
 12.2142 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2143 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2144 +    ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
 12.2145 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2146 +    break 2
 12.2147 +  fi
 12.2148 +done
 12.2149 +  done
 12.2150 +IFS=$as_save_IFS
 12.2151 +
 12.2152 +  ;;
 12.2153 +esac
 12.2154 +fi
 12.2155 +CMP=$ac_cv_path_CMP
 12.2156 +if test -n "$CMP"; then
 12.2157 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CMP" >&5
 12.2158 +$as_echo "$CMP" >&6; }
 12.2159 +else
 12.2160 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.2161 +$as_echo "no" >&6; }
 12.2162 +fi
 12.2163 +
 12.2164 +
 12.2165 +        if test "x$CMP" = x; then
 12.2166 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.2167 +        fi
 12.2168 +      else
 12.2169 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.2170 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CMP=$tool_specified" >&5
 12.2171 +$as_echo "$as_me: Will use user supplied tool CMP=$tool_specified" >&6;}
 12.2172 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CMP" >&5
 12.2173 +$as_echo_n "checking for CMP... " >&6; }
 12.2174 +        if test ! -x "$tool_specified"; then
 12.2175 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.2176 +$as_echo "not found" >&6; }
 12.2177 +          as_fn_error $? "User supplied tool CMP=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.2178 +        fi
 12.2179 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.2180 +$as_echo "$tool_specified" >&6; }
 12.2181 +      fi
 12.2182 +    fi
 12.2183 +  fi
 12.2184 +
 12.2185 +
 12.2186  
 12.2187    if test "x$CMP" = x; then
 12.2188 -    if test "xcmp" = x; then
 12.2189 -      PROG_NAME=cmp
 12.2190 -    else
 12.2191 -      PROG_NAME=cmp
 12.2192 -    fi
 12.2193 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.2194 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.2195 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.2196 -  fi
 12.2197 -
 12.2198 -
 12.2199 -
 12.2200 -  for ac_prog in comm
 12.2201 +    as_fn_error $? "Could not find required tool for CMP" "$LINENO" 5
 12.2202 +  fi
 12.2203 +
 12.2204 +
 12.2205 +
 12.2206 +
 12.2207 +
 12.2208 +  # Publish this variable in the help.
 12.2209 +
 12.2210 +
 12.2211 +  if test "x$COMM" = x; then
 12.2212 +    # The variable is not set by user, try to locate tool using the code snippet
 12.2213 +    for ac_prog in comm
 12.2214  do
 12.2215    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2216  set dummy $ac_prog; ac_word=$2
 12.2217 @@ -4284,21 +5402,155 @@
 12.2218    test -n "$COMM" && break
 12.2219  done
 12.2220  
 12.2221 +  else
 12.2222 +    # The variable is set, but is it from the command line or the environment?
 12.2223 +
 12.2224 +    # Try to remove the string !COMM! from our list.
 12.2225 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!COMM!/}
 12.2226 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.2227 +      # If it failed, the variable was not from the command line. Ignore it,
 12.2228 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.2229 +      if test "xCOMM" != xBASH; then
 12.2230 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of COMM from the environment. Use command line variables instead." >&5
 12.2231 +$as_echo "$as_me: WARNING: Ignoring value of COMM from the environment. Use command line variables instead." >&2;}
 12.2232 +      fi
 12.2233 +      # Try to locate tool using the code snippet
 12.2234 +      for ac_prog in comm
 12.2235 +do
 12.2236 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2237 +set dummy $ac_prog; ac_word=$2
 12.2238 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2239 +$as_echo_n "checking for $ac_word... " >&6; }
 12.2240 +if ${ac_cv_path_COMM+:} false; then :
 12.2241 +  $as_echo_n "(cached) " >&6
 12.2242 +else
 12.2243 +  case $COMM in
 12.2244 +  [\\/]* | ?:[\\/]*)
 12.2245 +  ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
 12.2246 +  ;;
 12.2247 +  *)
 12.2248 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2249 +for as_dir in $PATH
 12.2250 +do
 12.2251 +  IFS=$as_save_IFS
 12.2252 +  test -z "$as_dir" && as_dir=.
 12.2253 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2254 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2255 +    ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
 12.2256 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2257 +    break 2
 12.2258 +  fi
 12.2259 +done
 12.2260 +  done
 12.2261 +IFS=$as_save_IFS
 12.2262 +
 12.2263 +  ;;
 12.2264 +esac
 12.2265 +fi
 12.2266 +COMM=$ac_cv_path_COMM
 12.2267 +if test -n "$COMM"; then
 12.2268 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
 12.2269 +$as_echo "$COMM" >&6; }
 12.2270 +else
 12.2271 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.2272 +$as_echo "no" >&6; }
 12.2273 +fi
 12.2274 +
 12.2275 +
 12.2276 +  test -n "$COMM" && break
 12.2277 +done
 12.2278 +
 12.2279 +    else
 12.2280 +      # If it succeeded, then it was overridden by the user. We will use it
 12.2281 +      # for the tool.
 12.2282 +
 12.2283 +      # First remove it from the list of overridden variables, so we can test
 12.2284 +      # for unknown variables in the end.
 12.2285 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.2286 +
 12.2287 +      # Check if the provided tool contains a complete path.
 12.2288 +      tool_specified="$COMM"
 12.2289 +      tool_basename="${tool_specified##*/}"
 12.2290 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.2291 +        # A command without a complete path is provided, search $PATH.
 12.2292 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool COMM=$tool_basename" >&5
 12.2293 +$as_echo "$as_me: Will search for user supplied tool COMM=$tool_basename" >&6;}
 12.2294 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.2295 +set dummy $tool_basename; ac_word=$2
 12.2296 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2297 +$as_echo_n "checking for $ac_word... " >&6; }
 12.2298 +if ${ac_cv_path_COMM+:} false; then :
 12.2299 +  $as_echo_n "(cached) " >&6
 12.2300 +else
 12.2301 +  case $COMM in
 12.2302 +  [\\/]* | ?:[\\/]*)
 12.2303 +  ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
 12.2304 +  ;;
 12.2305 +  *)
 12.2306 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2307 +for as_dir in $PATH
 12.2308 +do
 12.2309 +  IFS=$as_save_IFS
 12.2310 +  test -z "$as_dir" && as_dir=.
 12.2311 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2312 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2313 +    ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
 12.2314 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2315 +    break 2
 12.2316 +  fi
 12.2317 +done
 12.2318 +  done
 12.2319 +IFS=$as_save_IFS
 12.2320 +
 12.2321 +  ;;
 12.2322 +esac
 12.2323 +fi
 12.2324 +COMM=$ac_cv_path_COMM
 12.2325 +if test -n "$COMM"; then
 12.2326 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
 12.2327 +$as_echo "$COMM" >&6; }
 12.2328 +else
 12.2329 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.2330 +$as_echo "no" >&6; }
 12.2331 +fi
 12.2332 +
 12.2333 +
 12.2334 +        if test "x$COMM" = x; then
 12.2335 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.2336 +        fi
 12.2337 +      else
 12.2338 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.2339 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool COMM=$tool_specified" >&5
 12.2340 +$as_echo "$as_me: Will use user supplied tool COMM=$tool_specified" >&6;}
 12.2341 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMM" >&5
 12.2342 +$as_echo_n "checking for COMM... " >&6; }
 12.2343 +        if test ! -x "$tool_specified"; then
 12.2344 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.2345 +$as_echo "not found" >&6; }
 12.2346 +          as_fn_error $? "User supplied tool COMM=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.2347 +        fi
 12.2348 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.2349 +$as_echo "$tool_specified" >&6; }
 12.2350 +      fi
 12.2351 +    fi
 12.2352 +  fi
 12.2353 +
 12.2354 +
 12.2355  
 12.2356    if test "x$COMM" = x; then
 12.2357 -    if test "xcomm" = x; then
 12.2358 -      PROG_NAME=comm
 12.2359 -    else
 12.2360 -      PROG_NAME=comm
 12.2361 -    fi
 12.2362 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.2363 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.2364 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.2365 -  fi
 12.2366 -
 12.2367 -
 12.2368 -
 12.2369 -  for ac_prog in cp
 12.2370 +    as_fn_error $? "Could not find required tool for COMM" "$LINENO" 5
 12.2371 +  fi
 12.2372 +
 12.2373 +
 12.2374 +
 12.2375 +
 12.2376 +
 12.2377 +  # Publish this variable in the help.
 12.2378 +
 12.2379 +
 12.2380 +  if test "x$CP" = x; then
 12.2381 +    # The variable is not set by user, try to locate tool using the code snippet
 12.2382 +    for ac_prog in cp
 12.2383  do
 12.2384    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2385  set dummy $ac_prog; ac_word=$2
 12.2386 @@ -4343,80 +5595,155 @@
 12.2387    test -n "$CP" && break
 12.2388  done
 12.2389  
 12.2390 +  else
 12.2391 +    # The variable is set, but is it from the command line or the environment?
 12.2392 +
 12.2393 +    # Try to remove the string !CP! from our list.
 12.2394 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CP!/}
 12.2395 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.2396 +      # If it failed, the variable was not from the command line. Ignore it,
 12.2397 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.2398 +      if test "xCP" != xBASH; then
 12.2399 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CP from the environment. Use command line variables instead." >&5
 12.2400 +$as_echo "$as_me: WARNING: Ignoring value of CP from the environment. Use command line variables instead." >&2;}
 12.2401 +      fi
 12.2402 +      # Try to locate tool using the code snippet
 12.2403 +      for ac_prog in cp
 12.2404 +do
 12.2405 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2406 +set dummy $ac_prog; ac_word=$2
 12.2407 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2408 +$as_echo_n "checking for $ac_word... " >&6; }
 12.2409 +if ${ac_cv_path_CP+:} false; then :
 12.2410 +  $as_echo_n "(cached) " >&6
 12.2411 +else
 12.2412 +  case $CP in
 12.2413 +  [\\/]* | ?:[\\/]*)
 12.2414 +  ac_cv_path_CP="$CP" # Let the user override the test with a path.
 12.2415 +  ;;
 12.2416 +  *)
 12.2417 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2418 +for as_dir in $PATH
 12.2419 +do
 12.2420 +  IFS=$as_save_IFS
 12.2421 +  test -z "$as_dir" && as_dir=.
 12.2422 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2423 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2424 +    ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
 12.2425 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2426 +    break 2
 12.2427 +  fi
 12.2428 +done
 12.2429 +  done
 12.2430 +IFS=$as_save_IFS
 12.2431 +
 12.2432 +  ;;
 12.2433 +esac
 12.2434 +fi
 12.2435 +CP=$ac_cv_path_CP
 12.2436 +if test -n "$CP"; then
 12.2437 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
 12.2438 +$as_echo "$CP" >&6; }
 12.2439 +else
 12.2440 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.2441 +$as_echo "no" >&6; }
 12.2442 +fi
 12.2443 +
 12.2444 +
 12.2445 +  test -n "$CP" && break
 12.2446 +done
 12.2447 +
 12.2448 +    else
 12.2449 +      # If it succeeded, then it was overridden by the user. We will use it
 12.2450 +      # for the tool.
 12.2451 +
 12.2452 +      # First remove it from the list of overridden variables, so we can test
 12.2453 +      # for unknown variables in the end.
 12.2454 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.2455 +
 12.2456 +      # Check if the provided tool contains a complete path.
 12.2457 +      tool_specified="$CP"
 12.2458 +      tool_basename="${tool_specified##*/}"
 12.2459 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.2460 +        # A command without a complete path is provided, search $PATH.
 12.2461 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CP=$tool_basename" >&5
 12.2462 +$as_echo "$as_me: Will search for user supplied tool CP=$tool_basename" >&6;}
 12.2463 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.2464 +set dummy $tool_basename; ac_word=$2
 12.2465 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2466 +$as_echo_n "checking for $ac_word... " >&6; }
 12.2467 +if ${ac_cv_path_CP+:} false; then :
 12.2468 +  $as_echo_n "(cached) " >&6
 12.2469 +else
 12.2470 +  case $CP in
 12.2471 +  [\\/]* | ?:[\\/]*)
 12.2472 +  ac_cv_path_CP="$CP" # Let the user override the test with a path.
 12.2473 +  ;;
 12.2474 +  *)
 12.2475 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2476 +for as_dir in $PATH
 12.2477 +do
 12.2478 +  IFS=$as_save_IFS
 12.2479 +  test -z "$as_dir" && as_dir=.
 12.2480 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2481 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2482 +    ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
 12.2483 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2484 +    break 2
 12.2485 +  fi
 12.2486 +done
 12.2487 +  done
 12.2488 +IFS=$as_save_IFS
 12.2489 +
 12.2490 +  ;;
 12.2491 +esac
 12.2492 +fi
 12.2493 +CP=$ac_cv_path_CP
 12.2494 +if test -n "$CP"; then
 12.2495 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
 12.2496 +$as_echo "$CP" >&6; }
 12.2497 +else
 12.2498 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.2499 +$as_echo "no" >&6; }
 12.2500 +fi
 12.2501 +
 12.2502 +
 12.2503 +        if test "x$CP" = x; then
 12.2504 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.2505 +        fi
 12.2506 +      else
 12.2507 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.2508 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CP=$tool_specified" >&5
 12.2509 +$as_echo "$as_me: Will use user supplied tool CP=$tool_specified" >&6;}
 12.2510 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CP" >&5
 12.2511 +$as_echo_n "checking for CP... " >&6; }
 12.2512 +        if test ! -x "$tool_specified"; then
 12.2513 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.2514 +$as_echo "not found" >&6; }
 12.2515 +          as_fn_error $? "User supplied tool CP=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.2516 +        fi
 12.2517 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.2518 +$as_echo "$tool_specified" >&6; }
 12.2519 +      fi
 12.2520 +    fi
 12.2521 +  fi
 12.2522 +
 12.2523 +
 12.2524  
 12.2525    if test "x$CP" = x; then
 12.2526 -    if test "xcp" = x; then
 12.2527 -      PROG_NAME=cp
 12.2528 -    else
 12.2529 -      PROG_NAME=cp
 12.2530 -    fi
 12.2531 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.2532 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.2533 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.2534 -  fi
 12.2535 -
 12.2536 -
 12.2537 -
 12.2538 -  for ac_prog in cpio
 12.2539 -do
 12.2540 -  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2541 -set dummy $ac_prog; ac_word=$2
 12.2542 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2543 -$as_echo_n "checking for $ac_word... " >&6; }
 12.2544 -if ${ac_cv_path_CPIO+:} false; then :
 12.2545 -  $as_echo_n "(cached) " >&6
 12.2546 -else
 12.2547 -  case $CPIO in
 12.2548 -  [\\/]* | ?:[\\/]*)
 12.2549 -  ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
 12.2550 -  ;;
 12.2551 -  *)
 12.2552 -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2553 -for as_dir in $PATH
 12.2554 -do
 12.2555 -  IFS=$as_save_IFS
 12.2556 -  test -z "$as_dir" && as_dir=.
 12.2557 -    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2558 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2559 -    ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
 12.2560 -    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2561 -    break 2
 12.2562 -  fi
 12.2563 -done
 12.2564 -  done
 12.2565 -IFS=$as_save_IFS
 12.2566 -
 12.2567 -  ;;
 12.2568 -esac
 12.2569 -fi
 12.2570 -CPIO=$ac_cv_path_CPIO
 12.2571 -if test -n "$CPIO"; then
 12.2572 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
 12.2573 -$as_echo "$CPIO" >&6; }
 12.2574 -else
 12.2575 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.2576 -$as_echo "no" >&6; }
 12.2577 -fi
 12.2578 -
 12.2579 -
 12.2580 -  test -n "$CPIO" && break
 12.2581 -done
 12.2582 -
 12.2583 -
 12.2584 -  if test "x$CPIO" = x; then
 12.2585 -    if test "xcpio" = x; then
 12.2586 -      PROG_NAME=cpio
 12.2587 -    else
 12.2588 -      PROG_NAME=cpio
 12.2589 -    fi
 12.2590 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.2591 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.2592 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.2593 -  fi
 12.2594 -
 12.2595 -
 12.2596 -
 12.2597 -  for ac_prog in cut
 12.2598 +    as_fn_error $? "Could not find required tool for CP" "$LINENO" 5
 12.2599 +  fi
 12.2600 +
 12.2601 +
 12.2602 +
 12.2603 +
 12.2604 +
 12.2605 +  # Publish this variable in the help.
 12.2606 +
 12.2607 +
 12.2608 +  if test "x$CUT" = x; then
 12.2609 +    # The variable is not set by user, try to locate tool using the code snippet
 12.2610 +    for ac_prog in cut
 12.2611  do
 12.2612    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2613  set dummy $ac_prog; ac_word=$2
 12.2614 @@ -4461,21 +5788,155 @@
 12.2615    test -n "$CUT" && break
 12.2616  done
 12.2617  
 12.2618 +  else
 12.2619 +    # The variable is set, but is it from the command line or the environment?
 12.2620 +
 12.2621 +    # Try to remove the string !CUT! from our list.
 12.2622 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CUT!/}
 12.2623 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.2624 +      # If it failed, the variable was not from the command line. Ignore it,
 12.2625 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.2626 +      if test "xCUT" != xBASH; then
 12.2627 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CUT from the environment. Use command line variables instead." >&5
 12.2628 +$as_echo "$as_me: WARNING: Ignoring value of CUT from the environment. Use command line variables instead." >&2;}
 12.2629 +      fi
 12.2630 +      # Try to locate tool using the code snippet
 12.2631 +      for ac_prog in cut
 12.2632 +do
 12.2633 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2634 +set dummy $ac_prog; ac_word=$2
 12.2635 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2636 +$as_echo_n "checking for $ac_word... " >&6; }
 12.2637 +if ${ac_cv_path_CUT+:} false; then :
 12.2638 +  $as_echo_n "(cached) " >&6
 12.2639 +else
 12.2640 +  case $CUT in
 12.2641 +  [\\/]* | ?:[\\/]*)
 12.2642 +  ac_cv_path_CUT="$CUT" # Let the user override the test with a path.
 12.2643 +  ;;
 12.2644 +  *)
 12.2645 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2646 +for as_dir in $PATH
 12.2647 +do
 12.2648 +  IFS=$as_save_IFS
 12.2649 +  test -z "$as_dir" && as_dir=.
 12.2650 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2651 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2652 +    ac_cv_path_CUT="$as_dir/$ac_word$ac_exec_ext"
 12.2653 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2654 +    break 2
 12.2655 +  fi
 12.2656 +done
 12.2657 +  done
 12.2658 +IFS=$as_save_IFS
 12.2659 +
 12.2660 +  ;;
 12.2661 +esac
 12.2662 +fi
 12.2663 +CUT=$ac_cv_path_CUT
 12.2664 +if test -n "$CUT"; then
 12.2665 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUT" >&5
 12.2666 +$as_echo "$CUT" >&6; }
 12.2667 +else
 12.2668 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.2669 +$as_echo "no" >&6; }
 12.2670 +fi
 12.2671 +
 12.2672 +
 12.2673 +  test -n "$CUT" && break
 12.2674 +done
 12.2675 +
 12.2676 +    else
 12.2677 +      # If it succeeded, then it was overridden by the user. We will use it
 12.2678 +      # for the tool.
 12.2679 +
 12.2680 +      # First remove it from the list of overridden variables, so we can test
 12.2681 +      # for unknown variables in the end.
 12.2682 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.2683 +
 12.2684 +      # Check if the provided tool contains a complete path.
 12.2685 +      tool_specified="$CUT"
 12.2686 +      tool_basename="${tool_specified##*/}"
 12.2687 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.2688 +        # A command without a complete path is provided, search $PATH.
 12.2689 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CUT=$tool_basename" >&5
 12.2690 +$as_echo "$as_me: Will search for user supplied tool CUT=$tool_basename" >&6;}
 12.2691 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.2692 +set dummy $tool_basename; ac_word=$2
 12.2693 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2694 +$as_echo_n "checking for $ac_word... " >&6; }
 12.2695 +if ${ac_cv_path_CUT+:} false; then :
 12.2696 +  $as_echo_n "(cached) " >&6
 12.2697 +else
 12.2698 +  case $CUT in
 12.2699 +  [\\/]* | ?:[\\/]*)
 12.2700 +  ac_cv_path_CUT="$CUT" # Let the user override the test with a path.
 12.2701 +  ;;
 12.2702 +  *)
 12.2703 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2704 +for as_dir in $PATH
 12.2705 +do
 12.2706 +  IFS=$as_save_IFS
 12.2707 +  test -z "$as_dir" && as_dir=.
 12.2708 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2709 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2710 +    ac_cv_path_CUT="$as_dir/$ac_word$ac_exec_ext"
 12.2711 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2712 +    break 2
 12.2713 +  fi
 12.2714 +done
 12.2715 +  done
 12.2716 +IFS=$as_save_IFS
 12.2717 +
 12.2718 +  ;;
 12.2719 +esac
 12.2720 +fi
 12.2721 +CUT=$ac_cv_path_CUT
 12.2722 +if test -n "$CUT"; then
 12.2723 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUT" >&5
 12.2724 +$as_echo "$CUT" >&6; }
 12.2725 +else
 12.2726 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.2727 +$as_echo "no" >&6; }
 12.2728 +fi
 12.2729 +
 12.2730 +
 12.2731 +        if test "x$CUT" = x; then
 12.2732 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.2733 +        fi
 12.2734 +      else
 12.2735 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.2736 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CUT=$tool_specified" >&5
 12.2737 +$as_echo "$as_me: Will use user supplied tool CUT=$tool_specified" >&6;}
 12.2738 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUT" >&5
 12.2739 +$as_echo_n "checking for CUT... " >&6; }
 12.2740 +        if test ! -x "$tool_specified"; then
 12.2741 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.2742 +$as_echo "not found" >&6; }
 12.2743 +          as_fn_error $? "User supplied tool CUT=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.2744 +        fi
 12.2745 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.2746 +$as_echo "$tool_specified" >&6; }
 12.2747 +      fi
 12.2748 +    fi
 12.2749 +  fi
 12.2750 +
 12.2751 +
 12.2752  
 12.2753    if test "x$CUT" = x; then
 12.2754 -    if test "xcut" = x; then
 12.2755 -      PROG_NAME=cut
 12.2756 -    else
 12.2757 -      PROG_NAME=cut
 12.2758 -    fi
 12.2759 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.2760 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.2761 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.2762 -  fi
 12.2763 -
 12.2764 -
 12.2765 -
 12.2766 -  for ac_prog in date
 12.2767 +    as_fn_error $? "Could not find required tool for CUT" "$LINENO" 5
 12.2768 +  fi
 12.2769 +
 12.2770 +
 12.2771 +
 12.2772 +
 12.2773 +
 12.2774 +  # Publish this variable in the help.
 12.2775 +
 12.2776 +
 12.2777 +  if test "x$DATE" = x; then
 12.2778 +    # The variable is not set by user, try to locate tool using the code snippet
 12.2779 +    for ac_prog in date
 12.2780  do
 12.2781    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2782  set dummy $ac_prog; ac_word=$2
 12.2783 @@ -4520,21 +5981,155 @@
 12.2784    test -n "$DATE" && break
 12.2785  done
 12.2786  
 12.2787 +  else
 12.2788 +    # The variable is set, but is it from the command line or the environment?
 12.2789 +
 12.2790 +    # Try to remove the string !DATE! from our list.
 12.2791 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!DATE!/}
 12.2792 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.2793 +      # If it failed, the variable was not from the command line. Ignore it,
 12.2794 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.2795 +      if test "xDATE" != xBASH; then
 12.2796 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of DATE from the environment. Use command line variables instead." >&5
 12.2797 +$as_echo "$as_me: WARNING: Ignoring value of DATE from the environment. Use command line variables instead." >&2;}
 12.2798 +      fi
 12.2799 +      # Try to locate tool using the code snippet
 12.2800 +      for ac_prog in date
 12.2801 +do
 12.2802 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2803 +set dummy $ac_prog; ac_word=$2
 12.2804 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2805 +$as_echo_n "checking for $ac_word... " >&6; }
 12.2806 +if ${ac_cv_path_DATE+:} false; then :
 12.2807 +  $as_echo_n "(cached) " >&6
 12.2808 +else
 12.2809 +  case $DATE in
 12.2810 +  [\\/]* | ?:[\\/]*)
 12.2811 +  ac_cv_path_DATE="$DATE" # Let the user override the test with a path.
 12.2812 +  ;;
 12.2813 +  *)
 12.2814 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2815 +for as_dir in $PATH
 12.2816 +do
 12.2817 +  IFS=$as_save_IFS
 12.2818 +  test -z "$as_dir" && as_dir=.
 12.2819 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2820 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2821 +    ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext"
 12.2822 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2823 +    break 2
 12.2824 +  fi
 12.2825 +done
 12.2826 +  done
 12.2827 +IFS=$as_save_IFS
 12.2828 +
 12.2829 +  ;;
 12.2830 +esac
 12.2831 +fi
 12.2832 +DATE=$ac_cv_path_DATE
 12.2833 +if test -n "$DATE"; then
 12.2834 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DATE" >&5
 12.2835 +$as_echo "$DATE" >&6; }
 12.2836 +else
 12.2837 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.2838 +$as_echo "no" >&6; }
 12.2839 +fi
 12.2840 +
 12.2841 +
 12.2842 +  test -n "$DATE" && break
 12.2843 +done
 12.2844 +
 12.2845 +    else
 12.2846 +      # If it succeeded, then it was overridden by the user. We will use it
 12.2847 +      # for the tool.
 12.2848 +
 12.2849 +      # First remove it from the list of overridden variables, so we can test
 12.2850 +      # for unknown variables in the end.
 12.2851 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.2852 +
 12.2853 +      # Check if the provided tool contains a complete path.
 12.2854 +      tool_specified="$DATE"
 12.2855 +      tool_basename="${tool_specified##*/}"
 12.2856 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.2857 +        # A command without a complete path is provided, search $PATH.
 12.2858 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool DATE=$tool_basename" >&5
 12.2859 +$as_echo "$as_me: Will search for user supplied tool DATE=$tool_basename" >&6;}
 12.2860 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.2861 +set dummy $tool_basename; ac_word=$2
 12.2862 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2863 +$as_echo_n "checking for $ac_word... " >&6; }
 12.2864 +if ${ac_cv_path_DATE+:} false; then :
 12.2865 +  $as_echo_n "(cached) " >&6
 12.2866 +else
 12.2867 +  case $DATE in
 12.2868 +  [\\/]* | ?:[\\/]*)
 12.2869 +  ac_cv_path_DATE="$DATE" # Let the user override the test with a path.
 12.2870 +  ;;
 12.2871 +  *)
 12.2872 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2873 +for as_dir in $PATH
 12.2874 +do
 12.2875 +  IFS=$as_save_IFS
 12.2876 +  test -z "$as_dir" && as_dir=.
 12.2877 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2878 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2879 +    ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext"
 12.2880 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2881 +    break 2
 12.2882 +  fi
 12.2883 +done
 12.2884 +  done
 12.2885 +IFS=$as_save_IFS
 12.2886 +
 12.2887 +  ;;
 12.2888 +esac
 12.2889 +fi
 12.2890 +DATE=$ac_cv_path_DATE
 12.2891 +if test -n "$DATE"; then
 12.2892 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DATE" >&5
 12.2893 +$as_echo "$DATE" >&6; }
 12.2894 +else
 12.2895 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.2896 +$as_echo "no" >&6; }
 12.2897 +fi
 12.2898 +
 12.2899 +
 12.2900 +        if test "x$DATE" = x; then
 12.2901 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.2902 +        fi
 12.2903 +      else
 12.2904 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.2905 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool DATE=$tool_specified" >&5
 12.2906 +$as_echo "$as_me: Will use user supplied tool DATE=$tool_specified" >&6;}
 12.2907 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DATE" >&5
 12.2908 +$as_echo_n "checking for DATE... " >&6; }
 12.2909 +        if test ! -x "$tool_specified"; then
 12.2910 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.2911 +$as_echo "not found" >&6; }
 12.2912 +          as_fn_error $? "User supplied tool DATE=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.2913 +        fi
 12.2914 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.2915 +$as_echo "$tool_specified" >&6; }
 12.2916 +      fi
 12.2917 +    fi
 12.2918 +  fi
 12.2919 +
 12.2920 +
 12.2921  
 12.2922    if test "x$DATE" = x; then
 12.2923 -    if test "xdate" = x; then
 12.2924 -      PROG_NAME=date
 12.2925 -    else
 12.2926 -      PROG_NAME=date
 12.2927 -    fi
 12.2928 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.2929 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.2930 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.2931 -  fi
 12.2932 -
 12.2933 -
 12.2934 -
 12.2935 -  for ac_prog in gdiff diff
 12.2936 +    as_fn_error $? "Could not find required tool for DATE" "$LINENO" 5
 12.2937 +  fi
 12.2938 +
 12.2939 +
 12.2940 +
 12.2941 +
 12.2942 +
 12.2943 +  # Publish this variable in the help.
 12.2944 +
 12.2945 +
 12.2946 +  if test "x$DIFF" = x; then
 12.2947 +    # The variable is not set by user, try to locate tool using the code snippet
 12.2948 +    for ac_prog in gdiff diff
 12.2949  do
 12.2950    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2951  set dummy $ac_prog; ac_word=$2
 12.2952 @@ -4579,21 +6174,155 @@
 12.2953    test -n "$DIFF" && break
 12.2954  done
 12.2955  
 12.2956 +  else
 12.2957 +    # The variable is set, but is it from the command line or the environment?
 12.2958 +
 12.2959 +    # Try to remove the string !DIFF! from our list.
 12.2960 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!DIFF!/}
 12.2961 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.2962 +      # If it failed, the variable was not from the command line. Ignore it,
 12.2963 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.2964 +      if test "xDIFF" != xBASH; then
 12.2965 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of DIFF from the environment. Use command line variables instead." >&5
 12.2966 +$as_echo "$as_me: WARNING: Ignoring value of DIFF from the environment. Use command line variables instead." >&2;}
 12.2967 +      fi
 12.2968 +      # Try to locate tool using the code snippet
 12.2969 +      for ac_prog in gdiff diff
 12.2970 +do
 12.2971 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.2972 +set dummy $ac_prog; ac_word=$2
 12.2973 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.2974 +$as_echo_n "checking for $ac_word... " >&6; }
 12.2975 +if ${ac_cv_path_DIFF+:} false; then :
 12.2976 +  $as_echo_n "(cached) " >&6
 12.2977 +else
 12.2978 +  case $DIFF in
 12.2979 +  [\\/]* | ?:[\\/]*)
 12.2980 +  ac_cv_path_DIFF="$DIFF" # Let the user override the test with a path.
 12.2981 +  ;;
 12.2982 +  *)
 12.2983 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.2984 +for as_dir in $PATH
 12.2985 +do
 12.2986 +  IFS=$as_save_IFS
 12.2987 +  test -z "$as_dir" && as_dir=.
 12.2988 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.2989 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.2990 +    ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext"
 12.2991 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.2992 +    break 2
 12.2993 +  fi
 12.2994 +done
 12.2995 +  done
 12.2996 +IFS=$as_save_IFS
 12.2997 +
 12.2998 +  ;;
 12.2999 +esac
 12.3000 +fi
 12.3001 +DIFF=$ac_cv_path_DIFF
 12.3002 +if test -n "$DIFF"; then
 12.3003 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIFF" >&5
 12.3004 +$as_echo "$DIFF" >&6; }
 12.3005 +else
 12.3006 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3007 +$as_echo "no" >&6; }
 12.3008 +fi
 12.3009 +
 12.3010 +
 12.3011 +  test -n "$DIFF" && break
 12.3012 +done
 12.3013 +
 12.3014 +    else
 12.3015 +      # If it succeeded, then it was overridden by the user. We will use it
 12.3016 +      # for the tool.
 12.3017 +
 12.3018 +      # First remove it from the list of overridden variables, so we can test
 12.3019 +      # for unknown variables in the end.
 12.3020 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.3021 +
 12.3022 +      # Check if the provided tool contains a complete path.
 12.3023 +      tool_specified="$DIFF"
 12.3024 +      tool_basename="${tool_specified##*/}"
 12.3025 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.3026 +        # A command without a complete path is provided, search $PATH.
 12.3027 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool DIFF=$tool_basename" >&5
 12.3028 +$as_echo "$as_me: Will search for user supplied tool DIFF=$tool_basename" >&6;}
 12.3029 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.3030 +set dummy $tool_basename; ac_word=$2
 12.3031 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3032 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3033 +if ${ac_cv_path_DIFF+:} false; then :
 12.3034 +  $as_echo_n "(cached) " >&6
 12.3035 +else
 12.3036 +  case $DIFF in
 12.3037 +  [\\/]* | ?:[\\/]*)
 12.3038 +  ac_cv_path_DIFF="$DIFF" # Let the user override the test with a path.
 12.3039 +  ;;
 12.3040 +  *)
 12.3041 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3042 +for as_dir in $PATH
 12.3043 +do
 12.3044 +  IFS=$as_save_IFS
 12.3045 +  test -z "$as_dir" && as_dir=.
 12.3046 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.3047 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.3048 +    ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext"
 12.3049 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.3050 +    break 2
 12.3051 +  fi
 12.3052 +done
 12.3053 +  done
 12.3054 +IFS=$as_save_IFS
 12.3055 +
 12.3056 +  ;;
 12.3057 +esac
 12.3058 +fi
 12.3059 +DIFF=$ac_cv_path_DIFF
 12.3060 +if test -n "$DIFF"; then
 12.3061 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIFF" >&5
 12.3062 +$as_echo "$DIFF" >&6; }
 12.3063 +else
 12.3064 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3065 +$as_echo "no" >&6; }
 12.3066 +fi
 12.3067 +
 12.3068 +
 12.3069 +        if test "x$DIFF" = x; then
 12.3070 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.3071 +        fi
 12.3072 +      else
 12.3073 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.3074 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool DIFF=$tool_specified" >&5
 12.3075 +$as_echo "$as_me: Will use user supplied tool DIFF=$tool_specified" >&6;}
 12.3076 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIFF" >&5
 12.3077 +$as_echo_n "checking for DIFF... " >&6; }
 12.3078 +        if test ! -x "$tool_specified"; then
 12.3079 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.3080 +$as_echo "not found" >&6; }
 12.3081 +          as_fn_error $? "User supplied tool DIFF=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.3082 +        fi
 12.3083 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.3084 +$as_echo "$tool_specified" >&6; }
 12.3085 +      fi
 12.3086 +    fi
 12.3087 +  fi
 12.3088 +
 12.3089 +
 12.3090  
 12.3091    if test "x$DIFF" = x; then
 12.3092 -    if test "xgdiff diff" = x; then
 12.3093 -      PROG_NAME=diff
 12.3094 -    else
 12.3095 -      PROG_NAME=gdiff diff
 12.3096 -    fi
 12.3097 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.3098 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.3099 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.3100 -  fi
 12.3101 -
 12.3102 -
 12.3103 -
 12.3104 -  for ac_prog in dirname
 12.3105 +    as_fn_error $? "Could not find required tool for DIFF" "$LINENO" 5
 12.3106 +  fi
 12.3107 +
 12.3108 +
 12.3109 +
 12.3110 +
 12.3111 +
 12.3112 +  # Publish this variable in the help.
 12.3113 +
 12.3114 +
 12.3115 +  if test "x$DIRNAME" = x; then
 12.3116 +    # The variable is not set by user, try to locate tool using the code snippet
 12.3117 +    for ac_prog in dirname
 12.3118  do
 12.3119    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3120  set dummy $ac_prog; ac_word=$2
 12.3121 @@ -4638,21 +6367,155 @@
 12.3122    test -n "$DIRNAME" && break
 12.3123  done
 12.3124  
 12.3125 +  else
 12.3126 +    # The variable is set, but is it from the command line or the environment?
 12.3127 +
 12.3128 +    # Try to remove the string !DIRNAME! from our list.
 12.3129 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!DIRNAME!/}
 12.3130 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.3131 +      # If it failed, the variable was not from the command line. Ignore it,
 12.3132 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.3133 +      if test "xDIRNAME" != xBASH; then
 12.3134 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of DIRNAME from the environment. Use command line variables instead." >&5
 12.3135 +$as_echo "$as_me: WARNING: Ignoring value of DIRNAME from the environment. Use command line variables instead." >&2;}
 12.3136 +      fi
 12.3137 +      # Try to locate tool using the code snippet
 12.3138 +      for ac_prog in dirname
 12.3139 +do
 12.3140 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3141 +set dummy $ac_prog; ac_word=$2
 12.3142 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3143 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3144 +if ${ac_cv_path_DIRNAME+:} false; then :
 12.3145 +  $as_echo_n "(cached) " >&6
 12.3146 +else
 12.3147 +  case $DIRNAME in
 12.3148 +  [\\/]* | ?:[\\/]*)
 12.3149 +  ac_cv_path_DIRNAME="$DIRNAME" # Let the user override the test with a path.
 12.3150 +  ;;
 12.3151 +  *)
 12.3152 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3153 +for as_dir in $PATH
 12.3154 +do
 12.3155 +  IFS=$as_save_IFS
 12.3156 +  test -z "$as_dir" && as_dir=.
 12.3157 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.3158 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.3159 +    ac_cv_path_DIRNAME="$as_dir/$ac_word$ac_exec_ext"
 12.3160 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.3161 +    break 2
 12.3162 +  fi
 12.3163 +done
 12.3164 +  done
 12.3165 +IFS=$as_save_IFS
 12.3166 +
 12.3167 +  ;;
 12.3168 +esac
 12.3169 +fi
 12.3170 +DIRNAME=$ac_cv_path_DIRNAME
 12.3171 +if test -n "$DIRNAME"; then
 12.3172 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIRNAME" >&5
 12.3173 +$as_echo "$DIRNAME" >&6; }
 12.3174 +else
 12.3175 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3176 +$as_echo "no" >&6; }
 12.3177 +fi
 12.3178 +
 12.3179 +
 12.3180 +  test -n "$DIRNAME" && break
 12.3181 +done
 12.3182 +
 12.3183 +    else
 12.3184 +      # If it succeeded, then it was overridden by the user. We will use it
 12.3185 +      # for the tool.
 12.3186 +
 12.3187 +      # First remove it from the list of overridden variables, so we can test
 12.3188 +      # for unknown variables in the end.
 12.3189 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.3190 +
 12.3191 +      # Check if the provided tool contains a complete path.
 12.3192 +      tool_specified="$DIRNAME"
 12.3193 +      tool_basename="${tool_specified##*/}"
 12.3194 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.3195 +        # A command without a complete path is provided, search $PATH.
 12.3196 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool DIRNAME=$tool_basename" >&5
 12.3197 +$as_echo "$as_me: Will search for user supplied tool DIRNAME=$tool_basename" >&6;}
 12.3198 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.3199 +set dummy $tool_basename; ac_word=$2
 12.3200 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3201 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3202 +if ${ac_cv_path_DIRNAME+:} false; then :
 12.3203 +  $as_echo_n "(cached) " >&6
 12.3204 +else
 12.3205 +  case $DIRNAME in
 12.3206 +  [\\/]* | ?:[\\/]*)
 12.3207 +  ac_cv_path_DIRNAME="$DIRNAME" # Let the user override the test with a path.
 12.3208 +  ;;
 12.3209 +  *)
 12.3210 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3211 +for as_dir in $PATH
 12.3212 +do
 12.3213 +  IFS=$as_save_IFS
 12.3214 +  test -z "$as_dir" && as_dir=.
 12.3215 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.3216 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.3217 +    ac_cv_path_DIRNAME="$as_dir/$ac_word$ac_exec_ext"
 12.3218 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.3219 +    break 2
 12.3220 +  fi
 12.3221 +done
 12.3222 +  done
 12.3223 +IFS=$as_save_IFS
 12.3224 +
 12.3225 +  ;;
 12.3226 +esac
 12.3227 +fi
 12.3228 +DIRNAME=$ac_cv_path_DIRNAME
 12.3229 +if test -n "$DIRNAME"; then
 12.3230 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIRNAME" >&5
 12.3231 +$as_echo "$DIRNAME" >&6; }
 12.3232 +else
 12.3233 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3234 +$as_echo "no" >&6; }
 12.3235 +fi
 12.3236 +
 12.3237 +
 12.3238 +        if test "x$DIRNAME" = x; then
 12.3239 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.3240 +        fi
 12.3241 +      else
 12.3242 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.3243 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool DIRNAME=$tool_specified" >&5
 12.3244 +$as_echo "$as_me: Will use user supplied tool DIRNAME=$tool_specified" >&6;}
 12.3245 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRNAME" >&5
 12.3246 +$as_echo_n "checking for DIRNAME... " >&6; }
 12.3247 +        if test ! -x "$tool_specified"; then
 12.3248 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.3249 +$as_echo "not found" >&6; }
 12.3250 +          as_fn_error $? "User supplied tool DIRNAME=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.3251 +        fi
 12.3252 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.3253 +$as_echo "$tool_specified" >&6; }
 12.3254 +      fi
 12.3255 +    fi
 12.3256 +  fi
 12.3257 +
 12.3258 +
 12.3259  
 12.3260    if test "x$DIRNAME" = x; then
 12.3261 -    if test "xdirname" = x; then
 12.3262 -      PROG_NAME=dirname
 12.3263 -    else
 12.3264 -      PROG_NAME=dirname
 12.3265 -    fi
 12.3266 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.3267 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.3268 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.3269 -  fi
 12.3270 -
 12.3271 -
 12.3272 -
 12.3273 -  for ac_prog in echo
 12.3274 +    as_fn_error $? "Could not find required tool for DIRNAME" "$LINENO" 5
 12.3275 +  fi
 12.3276 +
 12.3277 +
 12.3278 +
 12.3279 +
 12.3280 +
 12.3281 +  # Publish this variable in the help.
 12.3282 +
 12.3283 +
 12.3284 +  if test "x$ECHO" = x; then
 12.3285 +    # The variable is not set by user, try to locate tool using the code snippet
 12.3286 +    for ac_prog in echo
 12.3287  do
 12.3288    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3289  set dummy $ac_prog; ac_word=$2
 12.3290 @@ -4697,21 +6560,155 @@
 12.3291    test -n "$ECHO" && break
 12.3292  done
 12.3293  
 12.3294 +  else
 12.3295 +    # The variable is set, but is it from the command line or the environment?
 12.3296 +
 12.3297 +    # Try to remove the string !ECHO! from our list.
 12.3298 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!ECHO!/}
 12.3299 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.3300 +      # If it failed, the variable was not from the command line. Ignore it,
 12.3301 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.3302 +      if test "xECHO" != xBASH; then
 12.3303 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of ECHO from the environment. Use command line variables instead." >&5
 12.3304 +$as_echo "$as_me: WARNING: Ignoring value of ECHO from the environment. Use command line variables instead." >&2;}
 12.3305 +      fi
 12.3306 +      # Try to locate tool using the code snippet
 12.3307 +      for ac_prog in echo
 12.3308 +do
 12.3309 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3310 +set dummy $ac_prog; ac_word=$2
 12.3311 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3312 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3313 +if ${ac_cv_path_ECHO+:} false; then :
 12.3314 +  $as_echo_n "(cached) " >&6
 12.3315 +else
 12.3316 +  case $ECHO in
 12.3317 +  [\\/]* | ?:[\\/]*)
 12.3318 +  ac_cv_path_ECHO="$ECHO" # Let the user override the test with a path.
 12.3319 +  ;;
 12.3320 +  *)
 12.3321 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3322 +for as_dir in $PATH
 12.3323 +do
 12.3324 +  IFS=$as_save_IFS
 12.3325 +  test -z "$as_dir" && as_dir=.
 12.3326 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.3327 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.3328 +    ac_cv_path_ECHO="$as_dir/$ac_word$ac_exec_ext"
 12.3329 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.3330 +    break 2
 12.3331 +  fi
 12.3332 +done
 12.3333 +  done
 12.3334 +IFS=$as_save_IFS
 12.3335 +
 12.3336 +  ;;
 12.3337 +esac
 12.3338 +fi
 12.3339 +ECHO=$ac_cv_path_ECHO
 12.3340 +if test -n "$ECHO"; then
 12.3341 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ECHO" >&5
 12.3342 +$as_echo "$ECHO" >&6; }
 12.3343 +else
 12.3344 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3345 +$as_echo "no" >&6; }
 12.3346 +fi
 12.3347 +
 12.3348 +
 12.3349 +  test -n "$ECHO" && break
 12.3350 +done
 12.3351 +
 12.3352 +    else
 12.3353 +      # If it succeeded, then it was overridden by the user. We will use it
 12.3354 +      # for the tool.
 12.3355 +
 12.3356 +      # First remove it from the list of overridden variables, so we can test
 12.3357 +      # for unknown variables in the end.
 12.3358 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.3359 +
 12.3360 +      # Check if the provided tool contains a complete path.
 12.3361 +      tool_specified="$ECHO"
 12.3362 +      tool_basename="${tool_specified##*/}"
 12.3363 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.3364 +        # A command without a complete path is provided, search $PATH.
 12.3365 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool ECHO=$tool_basename" >&5
 12.3366 +$as_echo "$as_me: Will search for user supplied tool ECHO=$tool_basename" >&6;}
 12.3367 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.3368 +set dummy $tool_basename; ac_word=$2
 12.3369 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3370 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3371 +if ${ac_cv_path_ECHO+:} false; then :
 12.3372 +  $as_echo_n "(cached) " >&6
 12.3373 +else
 12.3374 +  case $ECHO in
 12.3375 +  [\\/]* | ?:[\\/]*)
 12.3376 +  ac_cv_path_ECHO="$ECHO" # Let the user override the test with a path.
 12.3377 +  ;;
 12.3378 +  *)
 12.3379 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3380 +for as_dir in $PATH
 12.3381 +do
 12.3382 +  IFS=$as_save_IFS
 12.3383 +  test -z "$as_dir" && as_dir=.
 12.3384 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.3385 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.3386 +    ac_cv_path_ECHO="$as_dir/$ac_word$ac_exec_ext"
 12.3387 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.3388 +    break 2
 12.3389 +  fi
 12.3390 +done
 12.3391 +  done
 12.3392 +IFS=$as_save_IFS
 12.3393 +
 12.3394 +  ;;
 12.3395 +esac
 12.3396 +fi
 12.3397 +ECHO=$ac_cv_path_ECHO
 12.3398 +if test -n "$ECHO"; then
 12.3399 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ECHO" >&5
 12.3400 +$as_echo "$ECHO" >&6; }
 12.3401 +else
 12.3402 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3403 +$as_echo "no" >&6; }
 12.3404 +fi
 12.3405 +
 12.3406 +
 12.3407 +        if test "x$ECHO" = x; then
 12.3408 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.3409 +        fi
 12.3410 +      else
 12.3411 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.3412 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool ECHO=$tool_specified" >&5
 12.3413 +$as_echo "$as_me: Will use user supplied tool ECHO=$tool_specified" >&6;}
 12.3414 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECHO" >&5
 12.3415 +$as_echo_n "checking for ECHO... " >&6; }
 12.3416 +        if test ! -x "$tool_specified"; then
 12.3417 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.3418 +$as_echo "not found" >&6; }
 12.3419 +          as_fn_error $? "User supplied tool ECHO=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.3420 +        fi
 12.3421 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.3422 +$as_echo "$tool_specified" >&6; }
 12.3423 +      fi
 12.3424 +    fi
 12.3425 +  fi
 12.3426 +
 12.3427 +
 12.3428  
 12.3429    if test "x$ECHO" = x; then
 12.3430 -    if test "xecho" = x; then
 12.3431 -      PROG_NAME=echo
 12.3432 -    else
 12.3433 -      PROG_NAME=echo
 12.3434 -    fi
 12.3435 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.3436 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.3437 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.3438 -  fi
 12.3439 -
 12.3440 -
 12.3441 -
 12.3442 -  for ac_prog in expr
 12.3443 +    as_fn_error $? "Could not find required tool for ECHO" "$LINENO" 5
 12.3444 +  fi
 12.3445 +
 12.3446 +
 12.3447 +
 12.3448 +
 12.3449 +
 12.3450 +  # Publish this variable in the help.
 12.3451 +
 12.3452 +
 12.3453 +  if test "x$EXPR" = x; then
 12.3454 +    # The variable is not set by user, try to locate tool using the code snippet
 12.3455 +    for ac_prog in expr
 12.3456  do
 12.3457    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3458  set dummy $ac_prog; ac_word=$2
 12.3459 @@ -4756,21 +6753,155 @@
 12.3460    test -n "$EXPR" && break
 12.3461  done
 12.3462  
 12.3463 +  else
 12.3464 +    # The variable is set, but is it from the command line or the environment?
 12.3465 +
 12.3466 +    # Try to remove the string !EXPR! from our list.
 12.3467 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!EXPR!/}
 12.3468 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.3469 +      # If it failed, the variable was not from the command line. Ignore it,
 12.3470 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.3471 +      if test "xEXPR" != xBASH; then
 12.3472 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of EXPR from the environment. Use command line variables instead." >&5
 12.3473 +$as_echo "$as_me: WARNING: Ignoring value of EXPR from the environment. Use command line variables instead." >&2;}
 12.3474 +      fi
 12.3475 +      # Try to locate tool using the code snippet
 12.3476 +      for ac_prog in expr
 12.3477 +do
 12.3478 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3479 +set dummy $ac_prog; ac_word=$2
 12.3480 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3481 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3482 +if ${ac_cv_path_EXPR+:} false; then :
 12.3483 +  $as_echo_n "(cached) " >&6
 12.3484 +else
 12.3485 +  case $EXPR in
 12.3486 +  [\\/]* | ?:[\\/]*)
 12.3487 +  ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path.
 12.3488 +  ;;
 12.3489 +  *)
 12.3490 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3491 +for as_dir in $PATH
 12.3492 +do
 12.3493 +  IFS=$as_save_IFS
 12.3494 +  test -z "$as_dir" && as_dir=.
 12.3495 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.3496 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.3497 +    ac_cv_path_EXPR="$as_dir/$ac_word$ac_exec_ext"
 12.3498 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.3499 +    break 2
 12.3500 +  fi
 12.3501 +done
 12.3502 +  done
 12.3503 +IFS=$as_save_IFS
 12.3504 +
 12.3505 +  ;;
 12.3506 +esac
 12.3507 +fi
 12.3508 +EXPR=$ac_cv_path_EXPR
 12.3509 +if test -n "$EXPR"; then
 12.3510 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPR" >&5
 12.3511 +$as_echo "$EXPR" >&6; }
 12.3512 +else
 12.3513 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3514 +$as_echo "no" >&6; }
 12.3515 +fi
 12.3516 +
 12.3517 +
 12.3518 +  test -n "$EXPR" && break
 12.3519 +done
 12.3520 +
 12.3521 +    else
 12.3522 +      # If it succeeded, then it was overridden by the user. We will use it
 12.3523 +      # for the tool.
 12.3524 +
 12.3525 +      # First remove it from the list of overridden variables, so we can test
 12.3526 +      # for unknown variables in the end.
 12.3527 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.3528 +
 12.3529 +      # Check if the provided tool contains a complete path.
 12.3530 +      tool_specified="$EXPR"
 12.3531 +      tool_basename="${tool_specified##*/}"
 12.3532 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.3533 +        # A command without a complete path is provided, search $PATH.
 12.3534 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool EXPR=$tool_basename" >&5
 12.3535 +$as_echo "$as_me: Will search for user supplied tool EXPR=$tool_basename" >&6;}
 12.3536 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.3537 +set dummy $tool_basename; ac_word=$2
 12.3538 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3539 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3540 +if ${ac_cv_path_EXPR+:} false; then :
 12.3541 +  $as_echo_n "(cached) " >&6
 12.3542 +else
 12.3543 +  case $EXPR in
 12.3544 +  [\\/]* | ?:[\\/]*)
 12.3545 +  ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path.
 12.3546 +  ;;
 12.3547 +  *)
 12.3548 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3549 +for as_dir in $PATH
 12.3550 +do
 12.3551 +  IFS=$as_save_IFS
 12.3552 +  test -z "$as_dir" && as_dir=.
 12.3553 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.3554 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.3555 +    ac_cv_path_EXPR="$as_dir/$ac_word$ac_exec_ext"
 12.3556 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.3557 +    break 2
 12.3558 +  fi
 12.3559 +done
 12.3560 +  done
 12.3561 +IFS=$as_save_IFS
 12.3562 +
 12.3563 +  ;;
 12.3564 +esac
 12.3565 +fi
 12.3566 +EXPR=$ac_cv_path_EXPR
 12.3567 +if test -n "$EXPR"; then
 12.3568 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPR" >&5
 12.3569 +$as_echo "$EXPR" >&6; }
 12.3570 +else
 12.3571 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3572 +$as_echo "no" >&6; }
 12.3573 +fi
 12.3574 +
 12.3575 +
 12.3576 +        if test "x$EXPR" = x; then
 12.3577 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.3578 +        fi
 12.3579 +      else
 12.3580 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.3581 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool EXPR=$tool_specified" >&5
 12.3582 +$as_echo "$as_me: Will use user supplied tool EXPR=$tool_specified" >&6;}
 12.3583 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXPR" >&5
 12.3584 +$as_echo_n "checking for EXPR... " >&6; }
 12.3585 +        if test ! -x "$tool_specified"; then
 12.3586 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.3587 +$as_echo "not found" >&6; }
 12.3588 +          as_fn_error $? "User supplied tool EXPR=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.3589 +        fi
 12.3590 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.3591 +$as_echo "$tool_specified" >&6; }
 12.3592 +      fi
 12.3593 +    fi
 12.3594 +  fi
 12.3595 +
 12.3596 +
 12.3597  
 12.3598    if test "x$EXPR" = x; then
 12.3599 -    if test "xexpr" = x; then
 12.3600 -      PROG_NAME=expr
 12.3601 -    else
 12.3602 -      PROG_NAME=expr
 12.3603 -    fi
 12.3604 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.3605 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.3606 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.3607 -  fi
 12.3608 -
 12.3609 -
 12.3610 -
 12.3611 -  for ac_prog in file
 12.3612 +    as_fn_error $? "Could not find required tool for EXPR" "$LINENO" 5
 12.3613 +  fi
 12.3614 +
 12.3615 +
 12.3616 +
 12.3617 +
 12.3618 +
 12.3619 +  # Publish this variable in the help.
 12.3620 +
 12.3621 +
 12.3622 +  if test "x$FILE" = x; then
 12.3623 +    # The variable is not set by user, try to locate tool using the code snippet
 12.3624 +    for ac_prog in file
 12.3625  do
 12.3626    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3627  set dummy $ac_prog; ac_word=$2
 12.3628 @@ -4815,21 +6946,155 @@
 12.3629    test -n "$FILE" && break
 12.3630  done
 12.3631  
 12.3632 +  else
 12.3633 +    # The variable is set, but is it from the command line or the environment?
 12.3634 +
 12.3635 +    # Try to remove the string !FILE! from our list.
 12.3636 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!FILE!/}
 12.3637 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.3638 +      # If it failed, the variable was not from the command line. Ignore it,
 12.3639 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.3640 +      if test "xFILE" != xBASH; then
 12.3641 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of FILE from the environment. Use command line variables instead." >&5
 12.3642 +$as_echo "$as_me: WARNING: Ignoring value of FILE from the environment. Use command line variables instead." >&2;}
 12.3643 +      fi
 12.3644 +      # Try to locate tool using the code snippet
 12.3645 +      for ac_prog in file
 12.3646 +do
 12.3647 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3648 +set dummy $ac_prog; ac_word=$2
 12.3649 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3650 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3651 +if ${ac_cv_path_FILE+:} false; then :
 12.3652 +  $as_echo_n "(cached) " >&6
 12.3653 +else
 12.3654 +  case $FILE in
 12.3655 +  [\\/]* | ?:[\\/]*)
 12.3656 +  ac_cv_path_FILE="$FILE" # Let the user override the test with a path.
 12.3657 +  ;;
 12.3658 +  *)
 12.3659 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3660 +for as_dir in $PATH
 12.3661 +do
 12.3662 +  IFS=$as_save_IFS
 12.3663 +  test -z "$as_dir" && as_dir=.
 12.3664 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.3665 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.3666 +    ac_cv_path_FILE="$as_dir/$ac_word$ac_exec_ext"
 12.3667 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.3668 +    break 2
 12.3669 +  fi
 12.3670 +done
 12.3671 +  done
 12.3672 +IFS=$as_save_IFS
 12.3673 +
 12.3674 +  ;;
 12.3675 +esac
 12.3676 +fi
 12.3677 +FILE=$ac_cv_path_FILE
 12.3678 +if test -n "$FILE"; then
 12.3679 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FILE" >&5
 12.3680 +$as_echo "$FILE" >&6; }
 12.3681 +else
 12.3682 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3683 +$as_echo "no" >&6; }
 12.3684 +fi
 12.3685 +
 12.3686 +
 12.3687 +  test -n "$FILE" && break
 12.3688 +done
 12.3689 +
 12.3690 +    else
 12.3691 +      # If it succeeded, then it was overridden by the user. We will use it
 12.3692 +      # for the tool.
 12.3693 +
 12.3694 +      # First remove it from the list of overridden variables, so we can test
 12.3695 +      # for unknown variables in the end.
 12.3696 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.3697 +
 12.3698 +      # Check if the provided tool contains a complete path.
 12.3699 +      tool_specified="$FILE"
 12.3700 +      tool_basename="${tool_specified##*/}"
 12.3701 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.3702 +        # A command without a complete path is provided, search $PATH.
 12.3703 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool FILE=$tool_basename" >&5
 12.3704 +$as_echo "$as_me: Will search for user supplied tool FILE=$tool_basename" >&6;}
 12.3705 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.3706 +set dummy $tool_basename; ac_word=$2
 12.3707 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3708 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3709 +if ${ac_cv_path_FILE+:} false; then :
 12.3710 +  $as_echo_n "(cached) " >&6
 12.3711 +else
 12.3712 +  case $FILE in
 12.3713 +  [\\/]* | ?:[\\/]*)
 12.3714 +  ac_cv_path_FILE="$FILE" # Let the user override the test with a path.
 12.3715 +  ;;
 12.3716 +  *)
 12.3717 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3718 +for as_dir in $PATH
 12.3719 +do
 12.3720 +  IFS=$as_save_IFS
 12.3721 +  test -z "$as_dir" && as_dir=.
 12.3722 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.3723 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.3724 +    ac_cv_path_FILE="$as_dir/$ac_word$ac_exec_ext"
 12.3725 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.3726 +    break 2
 12.3727 +  fi
 12.3728 +done
 12.3729 +  done
 12.3730 +IFS=$as_save_IFS
 12.3731 +
 12.3732 +  ;;
 12.3733 +esac
 12.3734 +fi
 12.3735 +FILE=$ac_cv_path_FILE
 12.3736 +if test -n "$FILE"; then
 12.3737 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FILE" >&5
 12.3738 +$as_echo "$FILE" >&6; }
 12.3739 +else
 12.3740 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3741 +$as_echo "no" >&6; }
 12.3742 +fi
 12.3743 +
 12.3744 +
 12.3745 +        if test "x$FILE" = x; then
 12.3746 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.3747 +        fi
 12.3748 +      else
 12.3749 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.3750 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool FILE=$tool_specified" >&5
 12.3751 +$as_echo "$as_me: Will use user supplied tool FILE=$tool_specified" >&6;}
 12.3752 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FILE" >&5
 12.3753 +$as_echo_n "checking for FILE... " >&6; }
 12.3754 +        if test ! -x "$tool_specified"; then
 12.3755 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.3756 +$as_echo "not found" >&6; }
 12.3757 +          as_fn_error $? "User supplied tool FILE=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.3758 +        fi
 12.3759 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.3760 +$as_echo "$tool_specified" >&6; }
 12.3761 +      fi
 12.3762 +    fi
 12.3763 +  fi
 12.3764 +
 12.3765 +
 12.3766  
 12.3767    if test "x$FILE" = x; then
 12.3768 -    if test "xfile" = x; then
 12.3769 -      PROG_NAME=file
 12.3770 -    else
 12.3771 -      PROG_NAME=file
 12.3772 -    fi
 12.3773 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.3774 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.3775 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.3776 -  fi
 12.3777 -
 12.3778 -
 12.3779 -
 12.3780 -  for ac_prog in find
 12.3781 +    as_fn_error $? "Could not find required tool for FILE" "$LINENO" 5
 12.3782 +  fi
 12.3783 +
 12.3784 +
 12.3785 +
 12.3786 +
 12.3787 +
 12.3788 +  # Publish this variable in the help.
 12.3789 +
 12.3790 +
 12.3791 +  if test "x$FIND" = x; then
 12.3792 +    # The variable is not set by user, try to locate tool using the code snippet
 12.3793 +    for ac_prog in find
 12.3794  do
 12.3795    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3796  set dummy $ac_prog; ac_word=$2
 12.3797 @@ -4874,21 +7139,155 @@
 12.3798    test -n "$FIND" && break
 12.3799  done
 12.3800  
 12.3801 +  else
 12.3802 +    # The variable is set, but is it from the command line or the environment?
 12.3803 +
 12.3804 +    # Try to remove the string !FIND! from our list.
 12.3805 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!FIND!/}
 12.3806 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.3807 +      # If it failed, the variable was not from the command line. Ignore it,
 12.3808 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.3809 +      if test "xFIND" != xBASH; then
 12.3810 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of FIND from the environment. Use command line variables instead." >&5
 12.3811 +$as_echo "$as_me: WARNING: Ignoring value of FIND from the environment. Use command line variables instead." >&2;}
 12.3812 +      fi
 12.3813 +      # Try to locate tool using the code snippet
 12.3814 +      for ac_prog in find
 12.3815 +do
 12.3816 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3817 +set dummy $ac_prog; ac_word=$2
 12.3818 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3819 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3820 +if ${ac_cv_path_FIND+:} false; then :
 12.3821 +  $as_echo_n "(cached) " >&6
 12.3822 +else
 12.3823 +  case $FIND in
 12.3824 +  [\\/]* | ?:[\\/]*)
 12.3825 +  ac_cv_path_FIND="$FIND" # Let the user override the test with a path.
 12.3826 +  ;;
 12.3827 +  *)
 12.3828 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3829 +for as_dir in $PATH
 12.3830 +do
 12.3831 +  IFS=$as_save_IFS
 12.3832 +  test -z "$as_dir" && as_dir=.
 12.3833 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.3834 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.3835 +    ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
 12.3836 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.3837 +    break 2
 12.3838 +  fi
 12.3839 +done
 12.3840 +  done
 12.3841 +IFS=$as_save_IFS
 12.3842 +
 12.3843 +  ;;
 12.3844 +esac
 12.3845 +fi
 12.3846 +FIND=$ac_cv_path_FIND
 12.3847 +if test -n "$FIND"; then
 12.3848 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIND" >&5
 12.3849 +$as_echo "$FIND" >&6; }
 12.3850 +else
 12.3851 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3852 +$as_echo "no" >&6; }
 12.3853 +fi
 12.3854 +
 12.3855 +
 12.3856 +  test -n "$FIND" && break
 12.3857 +done
 12.3858 +
 12.3859 +    else
 12.3860 +      # If it succeeded, then it was overridden by the user. We will use it
 12.3861 +      # for the tool.
 12.3862 +
 12.3863 +      # First remove it from the list of overridden variables, so we can test
 12.3864 +      # for unknown variables in the end.
 12.3865 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.3866 +
 12.3867 +      # Check if the provided tool contains a complete path.
 12.3868 +      tool_specified="$FIND"
 12.3869 +      tool_basename="${tool_specified##*/}"
 12.3870 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.3871 +        # A command without a complete path is provided, search $PATH.
 12.3872 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool FIND=$tool_basename" >&5
 12.3873 +$as_echo "$as_me: Will search for user supplied tool FIND=$tool_basename" >&6;}
 12.3874 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.3875 +set dummy $tool_basename; ac_word=$2
 12.3876 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3877 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3878 +if ${ac_cv_path_FIND+:} false; then :
 12.3879 +  $as_echo_n "(cached) " >&6
 12.3880 +else
 12.3881 +  case $FIND in
 12.3882 +  [\\/]* | ?:[\\/]*)
 12.3883 +  ac_cv_path_FIND="$FIND" # Let the user override the test with a path.
 12.3884 +  ;;
 12.3885 +  *)
 12.3886 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3887 +for as_dir in $PATH
 12.3888 +do
 12.3889 +  IFS=$as_save_IFS
 12.3890 +  test -z "$as_dir" && as_dir=.
 12.3891 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.3892 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.3893 +    ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
 12.3894 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.3895 +    break 2
 12.3896 +  fi
 12.3897 +done
 12.3898 +  done
 12.3899 +IFS=$as_save_IFS
 12.3900 +
 12.3901 +  ;;
 12.3902 +esac
 12.3903 +fi
 12.3904 +FIND=$ac_cv_path_FIND
 12.3905 +if test -n "$FIND"; then
 12.3906 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIND" >&5
 12.3907 +$as_echo "$FIND" >&6; }
 12.3908 +else
 12.3909 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.3910 +$as_echo "no" >&6; }
 12.3911 +fi
 12.3912 +
 12.3913 +
 12.3914 +        if test "x$FIND" = x; then
 12.3915 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.3916 +        fi
 12.3917 +      else
 12.3918 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.3919 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool FIND=$tool_specified" >&5
 12.3920 +$as_echo "$as_me: Will use user supplied tool FIND=$tool_specified" >&6;}
 12.3921 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FIND" >&5
 12.3922 +$as_echo_n "checking for FIND... " >&6; }
 12.3923 +        if test ! -x "$tool_specified"; then
 12.3924 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.3925 +$as_echo "not found" >&6; }
 12.3926 +          as_fn_error $? "User supplied tool FIND=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.3927 +        fi
 12.3928 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.3929 +$as_echo "$tool_specified" >&6; }
 12.3930 +      fi
 12.3931 +    fi
 12.3932 +  fi
 12.3933 +
 12.3934 +
 12.3935  
 12.3936    if test "x$FIND" = x; then
 12.3937 -    if test "xfind" = x; then
 12.3938 -      PROG_NAME=find
 12.3939 -    else
 12.3940 -      PROG_NAME=find
 12.3941 -    fi
 12.3942 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.3943 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.3944 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.3945 -  fi
 12.3946 -
 12.3947 -
 12.3948 -
 12.3949 -  for ac_prog in head
 12.3950 +    as_fn_error $? "Could not find required tool for FIND" "$LINENO" 5
 12.3951 +  fi
 12.3952 +
 12.3953 +
 12.3954 +
 12.3955 +
 12.3956 +
 12.3957 +  # Publish this variable in the help.
 12.3958 +
 12.3959 +
 12.3960 +  if test "x$HEAD" = x; then
 12.3961 +    # The variable is not set by user, try to locate tool using the code snippet
 12.3962 +    for ac_prog in head
 12.3963  do
 12.3964    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3965  set dummy $ac_prog; ac_word=$2
 12.3966 @@ -4933,21 +7332,155 @@
 12.3967    test -n "$HEAD" && break
 12.3968  done
 12.3969  
 12.3970 +  else
 12.3971 +    # The variable is set, but is it from the command line or the environment?
 12.3972 +
 12.3973 +    # Try to remove the string !HEAD! from our list.
 12.3974 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!HEAD!/}
 12.3975 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.3976 +      # If it failed, the variable was not from the command line. Ignore it,
 12.3977 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.3978 +      if test "xHEAD" != xBASH; then
 12.3979 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of HEAD from the environment. Use command line variables instead." >&5
 12.3980 +$as_echo "$as_me: WARNING: Ignoring value of HEAD from the environment. Use command line variables instead." >&2;}
 12.3981 +      fi
 12.3982 +      # Try to locate tool using the code snippet
 12.3983 +      for ac_prog in head
 12.3984 +do
 12.3985 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.3986 +set dummy $ac_prog; ac_word=$2
 12.3987 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.3988 +$as_echo_n "checking for $ac_word... " >&6; }
 12.3989 +if ${ac_cv_path_HEAD+:} false; then :
 12.3990 +  $as_echo_n "(cached) " >&6
 12.3991 +else
 12.3992 +  case $HEAD in
 12.3993 +  [\\/]* | ?:[\\/]*)
 12.3994 +  ac_cv_path_HEAD="$HEAD" # Let the user override the test with a path.
 12.3995 +  ;;
 12.3996 +  *)
 12.3997 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.3998 +for as_dir in $PATH
 12.3999 +do
 12.4000 +  IFS=$as_save_IFS
 12.4001 +  test -z "$as_dir" && as_dir=.
 12.4002 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4003 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4004 +    ac_cv_path_HEAD="$as_dir/$ac_word$ac_exec_ext"
 12.4005 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4006 +    break 2
 12.4007 +  fi
 12.4008 +done
 12.4009 +  done
 12.4010 +IFS=$as_save_IFS
 12.4011 +
 12.4012 +  ;;
 12.4013 +esac
 12.4014 +fi
 12.4015 +HEAD=$ac_cv_path_HEAD
 12.4016 +if test -n "$HEAD"; then
 12.4017 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HEAD" >&5
 12.4018 +$as_echo "$HEAD" >&6; }
 12.4019 +else
 12.4020 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4021 +$as_echo "no" >&6; }
 12.4022 +fi
 12.4023 +
 12.4024 +
 12.4025 +  test -n "$HEAD" && break
 12.4026 +done
 12.4027 +
 12.4028 +    else
 12.4029 +      # If it succeeded, then it was overridden by the user. We will use it
 12.4030 +      # for the tool.
 12.4031 +
 12.4032 +      # First remove it from the list of overridden variables, so we can test
 12.4033 +      # for unknown variables in the end.
 12.4034 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.4035 +
 12.4036 +      # Check if the provided tool contains a complete path.
 12.4037 +      tool_specified="$HEAD"
 12.4038 +      tool_basename="${tool_specified##*/}"
 12.4039 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.4040 +        # A command without a complete path is provided, search $PATH.
 12.4041 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool HEAD=$tool_basename" >&5
 12.4042 +$as_echo "$as_me: Will search for user supplied tool HEAD=$tool_basename" >&6;}
 12.4043 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.4044 +set dummy $tool_basename; ac_word=$2
 12.4045 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4046 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4047 +if ${ac_cv_path_HEAD+:} false; then :
 12.4048 +  $as_echo_n "(cached) " >&6
 12.4049 +else
 12.4050 +  case $HEAD in
 12.4051 +  [\\/]* | ?:[\\/]*)
 12.4052 +  ac_cv_path_HEAD="$HEAD" # Let the user override the test with a path.
 12.4053 +  ;;
 12.4054 +  *)
 12.4055 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4056 +for as_dir in $PATH
 12.4057 +do
 12.4058 +  IFS=$as_save_IFS
 12.4059 +  test -z "$as_dir" && as_dir=.
 12.4060 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4061 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4062 +    ac_cv_path_HEAD="$as_dir/$ac_word$ac_exec_ext"
 12.4063 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4064 +    break 2
 12.4065 +  fi
 12.4066 +done
 12.4067 +  done
 12.4068 +IFS=$as_save_IFS
 12.4069 +
 12.4070 +  ;;
 12.4071 +esac
 12.4072 +fi
 12.4073 +HEAD=$ac_cv_path_HEAD
 12.4074 +if test -n "$HEAD"; then
 12.4075 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HEAD" >&5
 12.4076 +$as_echo "$HEAD" >&6; }
 12.4077 +else
 12.4078 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4079 +$as_echo "no" >&6; }
 12.4080 +fi
 12.4081 +
 12.4082 +
 12.4083 +        if test "x$HEAD" = x; then
 12.4084 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.4085 +        fi
 12.4086 +      else
 12.4087 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.4088 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool HEAD=$tool_specified" >&5
 12.4089 +$as_echo "$as_me: Will use user supplied tool HEAD=$tool_specified" >&6;}
 12.4090 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HEAD" >&5
 12.4091 +$as_echo_n "checking for HEAD... " >&6; }
 12.4092 +        if test ! -x "$tool_specified"; then
 12.4093 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.4094 +$as_echo "not found" >&6; }
 12.4095 +          as_fn_error $? "User supplied tool HEAD=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.4096 +        fi
 12.4097 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.4098 +$as_echo "$tool_specified" >&6; }
 12.4099 +      fi
 12.4100 +    fi
 12.4101 +  fi
 12.4102 +
 12.4103 +
 12.4104  
 12.4105    if test "x$HEAD" = x; then
 12.4106 -    if test "xhead" = x; then
 12.4107 -      PROG_NAME=head
 12.4108 -    else
 12.4109 -      PROG_NAME=head
 12.4110 -    fi
 12.4111 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.4112 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.4113 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.4114 -  fi
 12.4115 -
 12.4116 -
 12.4117 -
 12.4118 -  for ac_prog in ln
 12.4119 +    as_fn_error $? "Could not find required tool for HEAD" "$LINENO" 5
 12.4120 +  fi
 12.4121 +
 12.4122 +
 12.4123 +
 12.4124 +
 12.4125 +
 12.4126 +  # Publish this variable in the help.
 12.4127 +
 12.4128 +
 12.4129 +  if test "x$LN" = x; then
 12.4130 +    # The variable is not set by user, try to locate tool using the code snippet
 12.4131 +    for ac_prog in ln
 12.4132  do
 12.4133    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.4134  set dummy $ac_prog; ac_word=$2
 12.4135 @@ -4992,21 +7525,155 @@
 12.4136    test -n "$LN" && break
 12.4137  done
 12.4138  
 12.4139 +  else
 12.4140 +    # The variable is set, but is it from the command line or the environment?
 12.4141 +
 12.4142 +    # Try to remove the string !LN! from our list.
 12.4143 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!LN!/}
 12.4144 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.4145 +      # If it failed, the variable was not from the command line. Ignore it,
 12.4146 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.4147 +      if test "xLN" != xBASH; then
 12.4148 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of LN from the environment. Use command line variables instead." >&5
 12.4149 +$as_echo "$as_me: WARNING: Ignoring value of LN from the environment. Use command line variables instead." >&2;}
 12.4150 +      fi
 12.4151 +      # Try to locate tool using the code snippet
 12.4152 +      for ac_prog in ln
 12.4153 +do
 12.4154 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.4155 +set dummy $ac_prog; ac_word=$2
 12.4156 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4157 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4158 +if ${ac_cv_path_LN+:} false; then :
 12.4159 +  $as_echo_n "(cached) " >&6
 12.4160 +else
 12.4161 +  case $LN in
 12.4162 +  [\\/]* | ?:[\\/]*)
 12.4163 +  ac_cv_path_LN="$LN" # Let the user override the test with a path.
 12.4164 +  ;;
 12.4165 +  *)
 12.4166 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4167 +for as_dir in $PATH
 12.4168 +do
 12.4169 +  IFS=$as_save_IFS
 12.4170 +  test -z "$as_dir" && as_dir=.
 12.4171 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4172 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4173 +    ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
 12.4174 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4175 +    break 2
 12.4176 +  fi
 12.4177 +done
 12.4178 +  done
 12.4179 +IFS=$as_save_IFS
 12.4180 +
 12.4181 +  ;;
 12.4182 +esac
 12.4183 +fi
 12.4184 +LN=$ac_cv_path_LN
 12.4185 +if test -n "$LN"; then
 12.4186 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5
 12.4187 +$as_echo "$LN" >&6; }
 12.4188 +else
 12.4189 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4190 +$as_echo "no" >&6; }
 12.4191 +fi
 12.4192 +
 12.4193 +
 12.4194 +  test -n "$LN" && break
 12.4195 +done
 12.4196 +
 12.4197 +    else
 12.4198 +      # If it succeeded, then it was overridden by the user. We will use it
 12.4199 +      # for the tool.
 12.4200 +
 12.4201 +      # First remove it from the list of overridden variables, so we can test
 12.4202 +      # for unknown variables in the end.
 12.4203 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.4204 +
 12.4205 +      # Check if the provided tool contains a complete path.
 12.4206 +      tool_specified="$LN"
 12.4207 +      tool_basename="${tool_specified##*/}"
 12.4208 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.4209 +        # A command without a complete path is provided, search $PATH.
 12.4210 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool LN=$tool_basename" >&5
 12.4211 +$as_echo "$as_me: Will search for user supplied tool LN=$tool_basename" >&6;}
 12.4212 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.4213 +set dummy $tool_basename; ac_word=$2
 12.4214 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4215 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4216 +if ${ac_cv_path_LN+:} false; then :
 12.4217 +  $as_echo_n "(cached) " >&6
 12.4218 +else
 12.4219 +  case $LN in
 12.4220 +  [\\/]* | ?:[\\/]*)
 12.4221 +  ac_cv_path_LN="$LN" # Let the user override the test with a path.
 12.4222 +  ;;
 12.4223 +  *)
 12.4224 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4225 +for as_dir in $PATH
 12.4226 +do
 12.4227 +  IFS=$as_save_IFS
 12.4228 +  test -z "$as_dir" && as_dir=.
 12.4229 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4230 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4231 +    ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
 12.4232 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4233 +    break 2
 12.4234 +  fi
 12.4235 +done
 12.4236 +  done
 12.4237 +IFS=$as_save_IFS
 12.4238 +
 12.4239 +  ;;
 12.4240 +esac
 12.4241 +fi
 12.4242 +LN=$ac_cv_path_LN
 12.4243 +if test -n "$LN"; then
 12.4244 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5
 12.4245 +$as_echo "$LN" >&6; }
 12.4246 +else
 12.4247 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4248 +$as_echo "no" >&6; }
 12.4249 +fi
 12.4250 +
 12.4251 +
 12.4252 +        if test "x$LN" = x; then
 12.4253 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.4254 +        fi
 12.4255 +      else
 12.4256 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.4257 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool LN=$tool_specified" >&5
 12.4258 +$as_echo "$as_me: Will use user supplied tool LN=$tool_specified" >&6;}
 12.4259 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LN" >&5
 12.4260 +$as_echo_n "checking for LN... " >&6; }
 12.4261 +        if test ! -x "$tool_specified"; then
 12.4262 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.4263 +$as_echo "not found" >&6; }
 12.4264 +          as_fn_error $? "User supplied tool LN=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.4265 +        fi
 12.4266 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.4267 +$as_echo "$tool_specified" >&6; }
 12.4268 +      fi
 12.4269 +    fi
 12.4270 +  fi
 12.4271 +
 12.4272 +
 12.4273  
 12.4274    if test "x$LN" = x; then
 12.4275 -    if test "xln" = x; then
 12.4276 -      PROG_NAME=ln
 12.4277 -    else
 12.4278 -      PROG_NAME=ln
 12.4279 -    fi
 12.4280 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.4281 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.4282 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.4283 -  fi
 12.4284 -
 12.4285 -
 12.4286 -
 12.4287 -  for ac_prog in ls
 12.4288 +    as_fn_error $? "Could not find required tool for LN" "$LINENO" 5
 12.4289 +  fi
 12.4290 +
 12.4291 +
 12.4292 +
 12.4293 +
 12.4294 +
 12.4295 +  # Publish this variable in the help.
 12.4296 +
 12.4297 +
 12.4298 +  if test "x$LS" = x; then
 12.4299 +    # The variable is not set by user, try to locate tool using the code snippet
 12.4300 +    for ac_prog in ls
 12.4301  do
 12.4302    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.4303  set dummy $ac_prog; ac_word=$2
 12.4304 @@ -5051,21 +7718,155 @@
 12.4305    test -n "$LS" && break
 12.4306  done
 12.4307  
 12.4308 +  else
 12.4309 +    # The variable is set, but is it from the command line or the environment?
 12.4310 +
 12.4311 +    # Try to remove the string !LS! from our list.
 12.4312 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!LS!/}
 12.4313 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.4314 +      # If it failed, the variable was not from the command line. Ignore it,
 12.4315 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.4316 +      if test "xLS" != xBASH; then
 12.4317 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of LS from the environment. Use command line variables instead." >&5
 12.4318 +$as_echo "$as_me: WARNING: Ignoring value of LS from the environment. Use command line variables instead." >&2;}
 12.4319 +      fi
 12.4320 +      # Try to locate tool using the code snippet
 12.4321 +      for ac_prog in ls
 12.4322 +do
 12.4323 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.4324 +set dummy $ac_prog; ac_word=$2
 12.4325 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4326 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4327 +if ${ac_cv_path_LS+:} false; then :
 12.4328 +  $as_echo_n "(cached) " >&6
 12.4329 +else
 12.4330 +  case $LS in
 12.4331 +  [\\/]* | ?:[\\/]*)
 12.4332 +  ac_cv_path_LS="$LS" # Let the user override the test with a path.
 12.4333 +  ;;
 12.4334 +  *)
 12.4335 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4336 +for as_dir in $PATH
 12.4337 +do
 12.4338 +  IFS=$as_save_IFS
 12.4339 +  test -z "$as_dir" && as_dir=.
 12.4340 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4341 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4342 +    ac_cv_path_LS="$as_dir/$ac_word$ac_exec_ext"
 12.4343 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4344 +    break 2
 12.4345 +  fi
 12.4346 +done
 12.4347 +  done
 12.4348 +IFS=$as_save_IFS
 12.4349 +
 12.4350 +  ;;
 12.4351 +esac
 12.4352 +fi
 12.4353 +LS=$ac_cv_path_LS
 12.4354 +if test -n "$LS"; then
 12.4355 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LS" >&5
 12.4356 +$as_echo "$LS" >&6; }
 12.4357 +else
 12.4358 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4359 +$as_echo "no" >&6; }
 12.4360 +fi
 12.4361 +
 12.4362 +
 12.4363 +  test -n "$LS" && break
 12.4364 +done
 12.4365 +
 12.4366 +    else
 12.4367 +      # If it succeeded, then it was overridden by the user. We will use it
 12.4368 +      # for the tool.
 12.4369 +
 12.4370 +      # First remove it from the list of overridden variables, so we can test
 12.4371 +      # for unknown variables in the end.
 12.4372 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.4373 +
 12.4374 +      # Check if the provided tool contains a complete path.
 12.4375 +      tool_specified="$LS"
 12.4376 +      tool_basename="${tool_specified##*/}"
 12.4377 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.4378 +        # A command without a complete path is provided, search $PATH.
 12.4379 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool LS=$tool_basename" >&5
 12.4380 +$as_echo "$as_me: Will search for user supplied tool LS=$tool_basename" >&6;}
 12.4381 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.4382 +set dummy $tool_basename; ac_word=$2
 12.4383 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4384 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4385 +if ${ac_cv_path_LS+:} false; then :
 12.4386 +  $as_echo_n "(cached) " >&6
 12.4387 +else
 12.4388 +  case $LS in
 12.4389 +  [\\/]* | ?:[\\/]*)
 12.4390 +  ac_cv_path_LS="$LS" # Let the user override the test with a path.
 12.4391 +  ;;
 12.4392 +  *)
 12.4393 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4394 +for as_dir in $PATH
 12.4395 +do
 12.4396 +  IFS=$as_save_IFS
 12.4397 +  test -z "$as_dir" && as_dir=.
 12.4398 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4399 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4400 +    ac_cv_path_LS="$as_dir/$ac_word$ac_exec_ext"
 12.4401 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4402 +    break 2
 12.4403 +  fi
 12.4404 +done
 12.4405 +  done
 12.4406 +IFS=$as_save_IFS
 12.4407 +
 12.4408 +  ;;
 12.4409 +esac
 12.4410 +fi
 12.4411 +LS=$ac_cv_path_LS
 12.4412 +if test -n "$LS"; then
 12.4413 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LS" >&5
 12.4414 +$as_echo "$LS" >&6; }
 12.4415 +else
 12.4416 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4417 +$as_echo "no" >&6; }
 12.4418 +fi
 12.4419 +
 12.4420 +
 12.4421 +        if test "x$LS" = x; then
 12.4422 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.4423 +        fi
 12.4424 +      else
 12.4425 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.4426 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool LS=$tool_specified" >&5
 12.4427 +$as_echo "$as_me: Will use user supplied tool LS=$tool_specified" >&6;}
 12.4428 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LS" >&5
 12.4429 +$as_echo_n "checking for LS... " >&6; }
 12.4430 +        if test ! -x "$tool_specified"; then
 12.4431 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.4432 +$as_echo "not found" >&6; }
 12.4433 +          as_fn_error $? "User supplied tool LS=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.4434 +        fi
 12.4435 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.4436 +$as_echo "$tool_specified" >&6; }
 12.4437 +      fi
 12.4438 +    fi
 12.4439 +  fi
 12.4440 +
 12.4441 +
 12.4442  
 12.4443    if test "x$LS" = x; then
 12.4444 -    if test "xls" = x; then
 12.4445 -      PROG_NAME=ls
 12.4446 -    else
 12.4447 -      PROG_NAME=ls
 12.4448 -    fi
 12.4449 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.4450 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.4451 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.4452 -  fi
 12.4453 -
 12.4454 -
 12.4455 -
 12.4456 -  for ac_prog in mkdir
 12.4457 +    as_fn_error $? "Could not find required tool for LS" "$LINENO" 5
 12.4458 +  fi
 12.4459 +
 12.4460 +
 12.4461 +
 12.4462 +
 12.4463 +
 12.4464 +  # Publish this variable in the help.
 12.4465 +
 12.4466 +
 12.4467 +  if test "x$MKDIR" = x; then
 12.4468 +    # The variable is not set by user, try to locate tool using the code snippet
 12.4469 +    for ac_prog in mkdir
 12.4470  do
 12.4471    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.4472  set dummy $ac_prog; ac_word=$2
 12.4473 @@ -5110,21 +7911,155 @@
 12.4474    test -n "$MKDIR" && break
 12.4475  done
 12.4476  
 12.4477 +  else
 12.4478 +    # The variable is set, but is it from the command line or the environment?
 12.4479 +
 12.4480 +    # Try to remove the string !MKDIR! from our list.
 12.4481 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!MKDIR!/}
 12.4482 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.4483 +      # If it failed, the variable was not from the command line. Ignore it,
 12.4484 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.4485 +      if test "xMKDIR" != xBASH; then
 12.4486 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of MKDIR from the environment. Use command line variables instead." >&5
 12.4487 +$as_echo "$as_me: WARNING: Ignoring value of MKDIR from the environment. Use command line variables instead." >&2;}
 12.4488 +      fi
 12.4489 +      # Try to locate tool using the code snippet
 12.4490 +      for ac_prog in mkdir
 12.4491 +do
 12.4492 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.4493 +set dummy $ac_prog; ac_word=$2
 12.4494 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4495 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4496 +if ${ac_cv_path_MKDIR+:} false; then :
 12.4497 +  $as_echo_n "(cached) " >&6
 12.4498 +else
 12.4499 +  case $MKDIR in
 12.4500 +  [\\/]* | ?:[\\/]*)
 12.4501 +  ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path.
 12.4502 +  ;;
 12.4503 +  *)
 12.4504 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4505 +for as_dir in $PATH
 12.4506 +do
 12.4507 +  IFS=$as_save_IFS
 12.4508 +  test -z "$as_dir" && as_dir=.
 12.4509 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4510 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4511 +    ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
 12.4512 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4513 +    break 2
 12.4514 +  fi
 12.4515 +done
 12.4516 +  done
 12.4517 +IFS=$as_save_IFS
 12.4518 +
 12.4519 +  ;;
 12.4520 +esac
 12.4521 +fi
 12.4522 +MKDIR=$ac_cv_path_MKDIR
 12.4523 +if test -n "$MKDIR"; then
 12.4524 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR" >&5
 12.4525 +$as_echo "$MKDIR" >&6; }
 12.4526 +else
 12.4527 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4528 +$as_echo "no" >&6; }
 12.4529 +fi
 12.4530 +
 12.4531 +
 12.4532 +  test -n "$MKDIR" && break
 12.4533 +done
 12.4534 +
 12.4535 +    else
 12.4536 +      # If it succeeded, then it was overridden by the user. We will use it
 12.4537 +      # for the tool.
 12.4538 +
 12.4539 +      # First remove it from the list of overridden variables, so we can test
 12.4540 +      # for unknown variables in the end.
 12.4541 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.4542 +
 12.4543 +      # Check if the provided tool contains a complete path.
 12.4544 +      tool_specified="$MKDIR"
 12.4545 +      tool_basename="${tool_specified##*/}"
 12.4546 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.4547 +        # A command without a complete path is provided, search $PATH.
 12.4548 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool MKDIR=$tool_basename" >&5
 12.4549 +$as_echo "$as_me: Will search for user supplied tool MKDIR=$tool_basename" >&6;}
 12.4550 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.4551 +set dummy $tool_basename; ac_word=$2
 12.4552 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4553 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4554 +if ${ac_cv_path_MKDIR+:} false; then :
 12.4555 +  $as_echo_n "(cached) " >&6
 12.4556 +else
 12.4557 +  case $MKDIR in
 12.4558 +  [\\/]* | ?:[\\/]*)
 12.4559 +  ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path.
 12.4560 +  ;;
 12.4561 +  *)
 12.4562 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4563 +for as_dir in $PATH
 12.4564 +do
 12.4565 +  IFS=$as_save_IFS
 12.4566 +  test -z "$as_dir" && as_dir=.
 12.4567 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4568 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4569 +    ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
 12.4570 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4571 +    break 2
 12.4572 +  fi
 12.4573 +done
 12.4574 +  done
 12.4575 +IFS=$as_save_IFS
 12.4576 +
 12.4577 +  ;;
 12.4578 +esac
 12.4579 +fi
 12.4580 +MKDIR=$ac_cv_path_MKDIR
 12.4581 +if test -n "$MKDIR"; then
 12.4582 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR" >&5
 12.4583 +$as_echo "$MKDIR" >&6; }
 12.4584 +else
 12.4585 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4586 +$as_echo "no" >&6; }
 12.4587 +fi
 12.4588 +
 12.4589 +
 12.4590 +        if test "x$MKDIR" = x; then
 12.4591 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.4592 +        fi
 12.4593 +      else
 12.4594 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.4595 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool MKDIR=$tool_specified" >&5
 12.4596 +$as_echo "$as_me: Will use user supplied tool MKDIR=$tool_specified" >&6;}
 12.4597 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MKDIR" >&5
 12.4598 +$as_echo_n "checking for MKDIR... " >&6; }
 12.4599 +        if test ! -x "$tool_specified"; then
 12.4600 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.4601 +$as_echo "not found" >&6; }
 12.4602 +          as_fn_error $? "User supplied tool MKDIR=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.4603 +        fi
 12.4604 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.4605 +$as_echo "$tool_specified" >&6; }
 12.4606 +      fi
 12.4607 +    fi
 12.4608 +  fi
 12.4609 +
 12.4610 +
 12.4611  
 12.4612    if test "x$MKDIR" = x; then
 12.4613 -    if test "xmkdir" = x; then
 12.4614 -      PROG_NAME=mkdir
 12.4615 -    else
 12.4616 -      PROG_NAME=mkdir
 12.4617 -    fi
 12.4618 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.4619 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.4620 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.4621 -  fi
 12.4622 -
 12.4623 -
 12.4624 -
 12.4625 -  for ac_prog in mktemp
 12.4626 +    as_fn_error $? "Could not find required tool for MKDIR" "$LINENO" 5
 12.4627 +  fi
 12.4628 +
 12.4629 +
 12.4630 +
 12.4631 +
 12.4632 +
 12.4633 +  # Publish this variable in the help.
 12.4634 +
 12.4635 +
 12.4636 +  if test "x$MKTEMP" = x; then
 12.4637 +    # The variable is not set by user, try to locate tool using the code snippet
 12.4638 +    for ac_prog in mktemp
 12.4639  do
 12.4640    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.4641  set dummy $ac_prog; ac_word=$2
 12.4642 @@ -5169,21 +8104,155 @@
 12.4643    test -n "$MKTEMP" && break
 12.4644  done
 12.4645  
 12.4646 +  else
 12.4647 +    # The variable is set, but is it from the command line or the environment?
 12.4648 +
 12.4649 +    # Try to remove the string !MKTEMP! from our list.
 12.4650 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!MKTEMP!/}
 12.4651 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.4652 +      # If it failed, the variable was not from the command line. Ignore it,
 12.4653 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.4654 +      if test "xMKTEMP" != xBASH; then
 12.4655 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of MKTEMP from the environment. Use command line variables instead." >&5
 12.4656 +$as_echo "$as_me: WARNING: Ignoring value of MKTEMP from the environment. Use command line variables instead." >&2;}
 12.4657 +      fi
 12.4658 +      # Try to locate tool using the code snippet
 12.4659 +      for ac_prog in mktemp
 12.4660 +do
 12.4661 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.4662 +set dummy $ac_prog; ac_word=$2
 12.4663 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4664 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4665 +if ${ac_cv_path_MKTEMP+:} false; then :
 12.4666 +  $as_echo_n "(cached) " >&6
 12.4667 +else
 12.4668 +  case $MKTEMP in
 12.4669 +  [\\/]* | ?:[\\/]*)
 12.4670 +  ac_cv_path_MKTEMP="$MKTEMP" # Let the user override the test with a path.
 12.4671 +  ;;
 12.4672 +  *)
 12.4673 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4674 +for as_dir in $PATH
 12.4675 +do
 12.4676 +  IFS=$as_save_IFS
 12.4677 +  test -z "$as_dir" && as_dir=.
 12.4678 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4679 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4680 +    ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext"
 12.4681 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4682 +    break 2
 12.4683 +  fi
 12.4684 +done
 12.4685 +  done
 12.4686 +IFS=$as_save_IFS
 12.4687 +
 12.4688 +  ;;
 12.4689 +esac
 12.4690 +fi
 12.4691 +MKTEMP=$ac_cv_path_MKTEMP
 12.4692 +if test -n "$MKTEMP"; then
 12.4693 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKTEMP" >&5
 12.4694 +$as_echo "$MKTEMP" >&6; }
 12.4695 +else
 12.4696 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4697 +$as_echo "no" >&6; }
 12.4698 +fi
 12.4699 +
 12.4700 +
 12.4701 +  test -n "$MKTEMP" && break
 12.4702 +done
 12.4703 +
 12.4704 +    else
 12.4705 +      # If it succeeded, then it was overridden by the user. We will use it
 12.4706 +      # for the tool.
 12.4707 +
 12.4708 +      # First remove it from the list of overridden variables, so we can test
 12.4709 +      # for unknown variables in the end.
 12.4710 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.4711 +
 12.4712 +      # Check if the provided tool contains a complete path.
 12.4713 +      tool_specified="$MKTEMP"
 12.4714 +      tool_basename="${tool_specified##*/}"
 12.4715 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.4716 +        # A command without a complete path is provided, search $PATH.
 12.4717 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool MKTEMP=$tool_basename" >&5
 12.4718 +$as_echo "$as_me: Will search for user supplied tool MKTEMP=$tool_basename" >&6;}
 12.4719 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.4720 +set dummy $tool_basename; ac_word=$2
 12.4721 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4722 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4723 +if ${ac_cv_path_MKTEMP+:} false; then :
 12.4724 +  $as_echo_n "(cached) " >&6
 12.4725 +else
 12.4726 +  case $MKTEMP in
 12.4727 +  [\\/]* | ?:[\\/]*)
 12.4728 +  ac_cv_path_MKTEMP="$MKTEMP" # Let the user override the test with a path.
 12.4729 +  ;;
 12.4730 +  *)
 12.4731 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4732 +for as_dir in $PATH
 12.4733 +do
 12.4734 +  IFS=$as_save_IFS
 12.4735 +  test -z "$as_dir" && as_dir=.
 12.4736 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4737 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4738 +    ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext"
 12.4739 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4740 +    break 2
 12.4741 +  fi
 12.4742 +done
 12.4743 +  done
 12.4744 +IFS=$as_save_IFS
 12.4745 +
 12.4746 +  ;;
 12.4747 +esac
 12.4748 +fi
 12.4749 +MKTEMP=$ac_cv_path_MKTEMP
 12.4750 +if test -n "$MKTEMP"; then
 12.4751 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKTEMP" >&5
 12.4752 +$as_echo "$MKTEMP" >&6; }
 12.4753 +else
 12.4754 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4755 +$as_echo "no" >&6; }
 12.4756 +fi
 12.4757 +
 12.4758 +
 12.4759 +        if test "x$MKTEMP" = x; then
 12.4760 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.4761 +        fi
 12.4762 +      else
 12.4763 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.4764 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool MKTEMP=$tool_specified" >&5
 12.4765 +$as_echo "$as_me: Will use user supplied tool MKTEMP=$tool_specified" >&6;}
 12.4766 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MKTEMP" >&5
 12.4767 +$as_echo_n "checking for MKTEMP... " >&6; }
 12.4768 +        if test ! -x "$tool_specified"; then
 12.4769 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.4770 +$as_echo "not found" >&6; }
 12.4771 +          as_fn_error $? "User supplied tool MKTEMP=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.4772 +        fi
 12.4773 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.4774 +$as_echo "$tool_specified" >&6; }
 12.4775 +      fi
 12.4776 +    fi
 12.4777 +  fi
 12.4778 +
 12.4779 +
 12.4780  
 12.4781    if test "x$MKTEMP" = x; then
 12.4782 -    if test "xmktemp" = x; then
 12.4783 -      PROG_NAME=mktemp
 12.4784 -    else
 12.4785 -      PROG_NAME=mktemp
 12.4786 -    fi
 12.4787 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.4788 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.4789 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.4790 -  fi
 12.4791 -
 12.4792 -
 12.4793 -
 12.4794 -  for ac_prog in mv
 12.4795 +    as_fn_error $? "Could not find required tool for MKTEMP" "$LINENO" 5
 12.4796 +  fi
 12.4797 +
 12.4798 +
 12.4799 +
 12.4800 +
 12.4801 +
 12.4802 +  # Publish this variable in the help.
 12.4803 +
 12.4804 +
 12.4805 +  if test "x$MV" = x; then
 12.4806 +    # The variable is not set by user, try to locate tool using the code snippet
 12.4807 +    for ac_prog in mv
 12.4808  do
 12.4809    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.4810  set dummy $ac_prog; ac_word=$2
 12.4811 @@ -5228,21 +8297,348 @@
 12.4812    test -n "$MV" && break
 12.4813  done
 12.4814  
 12.4815 +  else
 12.4816 +    # The variable is set, but is it from the command line or the environment?
 12.4817 +
 12.4818 +    # Try to remove the string !MV! from our list.
 12.4819 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!MV!/}
 12.4820 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.4821 +      # If it failed, the variable was not from the command line. Ignore it,
 12.4822 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.4823 +      if test "xMV" != xBASH; then
 12.4824 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of MV from the environment. Use command line variables instead." >&5
 12.4825 +$as_echo "$as_me: WARNING: Ignoring value of MV from the environment. Use command line variables instead." >&2;}
 12.4826 +      fi
 12.4827 +      # Try to locate tool using the code snippet
 12.4828 +      for ac_prog in mv
 12.4829 +do
 12.4830 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.4831 +set dummy $ac_prog; ac_word=$2
 12.4832 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4833 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4834 +if ${ac_cv_path_MV+:} false; then :
 12.4835 +  $as_echo_n "(cached) " >&6
 12.4836 +else
 12.4837 +  case $MV in
 12.4838 +  [\\/]* | ?:[\\/]*)
 12.4839 +  ac_cv_path_MV="$MV" # Let the user override the test with a path.
 12.4840 +  ;;
 12.4841 +  *)
 12.4842 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4843 +for as_dir in $PATH
 12.4844 +do
 12.4845 +  IFS=$as_save_IFS
 12.4846 +  test -z "$as_dir" && as_dir=.
 12.4847 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4848 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4849 +    ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
 12.4850 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4851 +    break 2
 12.4852 +  fi
 12.4853 +done
 12.4854 +  done
 12.4855 +IFS=$as_save_IFS
 12.4856 +
 12.4857 +  ;;
 12.4858 +esac
 12.4859 +fi
 12.4860 +MV=$ac_cv_path_MV
 12.4861 +if test -n "$MV"; then
 12.4862 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5
 12.4863 +$as_echo "$MV" >&6; }
 12.4864 +else
 12.4865 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4866 +$as_echo "no" >&6; }
 12.4867 +fi
 12.4868 +
 12.4869 +
 12.4870 +  test -n "$MV" && break
 12.4871 +done
 12.4872 +
 12.4873 +    else
 12.4874 +      # If it succeeded, then it was overridden by the user. We will use it
 12.4875 +      # for the tool.
 12.4876 +
 12.4877 +      # First remove it from the list of overridden variables, so we can test
 12.4878 +      # for unknown variables in the end.
 12.4879 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.4880 +
 12.4881 +      # Check if the provided tool contains a complete path.
 12.4882 +      tool_specified="$MV"
 12.4883 +      tool_basename="${tool_specified##*/}"
 12.4884 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.4885 +        # A command without a complete path is provided, search $PATH.
 12.4886 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool MV=$tool_basename" >&5
 12.4887 +$as_echo "$as_me: Will search for user supplied tool MV=$tool_basename" >&6;}
 12.4888 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.4889 +set dummy $tool_basename; ac_word=$2
 12.4890 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4891 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4892 +if ${ac_cv_path_MV+:} false; then :
 12.4893 +  $as_echo_n "(cached) " >&6
 12.4894 +else
 12.4895 +  case $MV in
 12.4896 +  [\\/]* | ?:[\\/]*)
 12.4897 +  ac_cv_path_MV="$MV" # Let the user override the test with a path.
 12.4898 +  ;;
 12.4899 +  *)
 12.4900 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4901 +for as_dir in $PATH
 12.4902 +do
 12.4903 +  IFS=$as_save_IFS
 12.4904 +  test -z "$as_dir" && as_dir=.
 12.4905 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4906 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4907 +    ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
 12.4908 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4909 +    break 2
 12.4910 +  fi
 12.4911 +done
 12.4912 +  done
 12.4913 +IFS=$as_save_IFS
 12.4914 +
 12.4915 +  ;;
 12.4916 +esac
 12.4917 +fi
 12.4918 +MV=$ac_cv_path_MV
 12.4919 +if test -n "$MV"; then
 12.4920 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5
 12.4921 +$as_echo "$MV" >&6; }
 12.4922 +else
 12.4923 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.4924 +$as_echo "no" >&6; }
 12.4925 +fi
 12.4926 +
 12.4927 +
 12.4928 +        if test "x$MV" = x; then
 12.4929 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.4930 +        fi
 12.4931 +      else
 12.4932 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.4933 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool MV=$tool_specified" >&5
 12.4934 +$as_echo "$as_me: Will use user supplied tool MV=$tool_specified" >&6;}
 12.4935 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MV" >&5
 12.4936 +$as_echo_n "checking for MV... " >&6; }
 12.4937 +        if test ! -x "$tool_specified"; then
 12.4938 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.4939 +$as_echo "not found" >&6; }
 12.4940 +          as_fn_error $? "User supplied tool MV=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.4941 +        fi
 12.4942 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.4943 +$as_echo "$tool_specified" >&6; }
 12.4944 +      fi
 12.4945 +    fi
 12.4946 +  fi
 12.4947 +
 12.4948 +
 12.4949  
 12.4950    if test "x$MV" = x; then
 12.4951 -    if test "xmv" = x; then
 12.4952 -      PROG_NAME=mv
 12.4953 -    else
 12.4954 -      PROG_NAME=mv
 12.4955 -    fi
 12.4956 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.4957 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.4958 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.4959 -  fi
 12.4960 -
 12.4961 -
 12.4962 -
 12.4963 -  for ac_prog in printf
 12.4964 +    as_fn_error $? "Could not find required tool for MV" "$LINENO" 5
 12.4965 +  fi
 12.4966 +
 12.4967 +
 12.4968 +
 12.4969 +
 12.4970 +
 12.4971 +  # Publish this variable in the help.
 12.4972 +
 12.4973 +
 12.4974 +  if test "x$NAWK" = x; then
 12.4975 +    # The variable is not set by user, try to locate tool using the code snippet
 12.4976 +    for ac_prog in nawk gawk awk
 12.4977 +do
 12.4978 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.4979 +set dummy $ac_prog; ac_word=$2
 12.4980 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.4981 +$as_echo_n "checking for $ac_word... " >&6; }
 12.4982 +if ${ac_cv_path_NAWK+:} false; then :
 12.4983 +  $as_echo_n "(cached) " >&6
 12.4984 +else
 12.4985 +  case $NAWK in
 12.4986 +  [\\/]* | ?:[\\/]*)
 12.4987 +  ac_cv_path_NAWK="$NAWK" # Let the user override the test with a path.
 12.4988 +  ;;
 12.4989 +  *)
 12.4990 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.4991 +for as_dir in $PATH
 12.4992 +do
 12.4993 +  IFS=$as_save_IFS
 12.4994 +  test -z "$as_dir" && as_dir=.
 12.4995 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.4996 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.4997 +    ac_cv_path_NAWK="$as_dir/$ac_word$ac_exec_ext"
 12.4998 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.4999 +    break 2
 12.5000 +  fi
 12.5001 +done
 12.5002 +  done
 12.5003 +IFS=$as_save_IFS
 12.5004 +
 12.5005 +  ;;
 12.5006 +esac
 12.5007 +fi
 12.5008 +NAWK=$ac_cv_path_NAWK
 12.5009 +if test -n "$NAWK"; then
 12.5010 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NAWK" >&5
 12.5011 +$as_echo "$NAWK" >&6; }
 12.5012 +else
 12.5013 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5014 +$as_echo "no" >&6; }
 12.5015 +fi
 12.5016 +
 12.5017 +
 12.5018 +  test -n "$NAWK" && break
 12.5019 +done
 12.5020 +
 12.5021 +  else
 12.5022 +    # The variable is set, but is it from the command line or the environment?
 12.5023 +
 12.5024 +    # Try to remove the string !NAWK! from our list.
 12.5025 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!NAWK!/}
 12.5026 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.5027 +      # If it failed, the variable was not from the command line. Ignore it,
 12.5028 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.5029 +      if test "xNAWK" != xBASH; then
 12.5030 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of NAWK from the environment. Use command line variables instead." >&5
 12.5031 +$as_echo "$as_me: WARNING: Ignoring value of NAWK from the environment. Use command line variables instead." >&2;}
 12.5032 +      fi
 12.5033 +      # Try to locate tool using the code snippet
 12.5034 +      for ac_prog in nawk gawk awk
 12.5035 +do
 12.5036 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.5037 +set dummy $ac_prog; ac_word=$2
 12.5038 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5039 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5040 +if ${ac_cv_path_NAWK+:} false; then :
 12.5041 +  $as_echo_n "(cached) " >&6
 12.5042 +else
 12.5043 +  case $NAWK in
 12.5044 +  [\\/]* | ?:[\\/]*)
 12.5045 +  ac_cv_path_NAWK="$NAWK" # Let the user override the test with a path.
 12.5046 +  ;;
 12.5047 +  *)
 12.5048 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5049 +for as_dir in $PATH
 12.5050 +do
 12.5051 +  IFS=$as_save_IFS
 12.5052 +  test -z "$as_dir" && as_dir=.
 12.5053 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5054 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.5055 +    ac_cv_path_NAWK="$as_dir/$ac_word$ac_exec_ext"
 12.5056 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.5057 +    break 2
 12.5058 +  fi
 12.5059 +done
 12.5060 +  done
 12.5061 +IFS=$as_save_IFS
 12.5062 +
 12.5063 +  ;;
 12.5064 +esac
 12.5065 +fi
 12.5066 +NAWK=$ac_cv_path_NAWK
 12.5067 +if test -n "$NAWK"; then
 12.5068 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NAWK" >&5
 12.5069 +$as_echo "$NAWK" >&6; }
 12.5070 +else
 12.5071 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5072 +$as_echo "no" >&6; }
 12.5073 +fi
 12.5074 +
 12.5075 +
 12.5076 +  test -n "$NAWK" && break
 12.5077 +done
 12.5078 +
 12.5079 +    else
 12.5080 +      # If it succeeded, then it was overridden by the user. We will use it
 12.5081 +      # for the tool.
 12.5082 +
 12.5083 +      # First remove it from the list of overridden variables, so we can test
 12.5084 +      # for unknown variables in the end.
 12.5085 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.5086 +
 12.5087 +      # Check if the provided tool contains a complete path.
 12.5088 +      tool_specified="$NAWK"
 12.5089 +      tool_basename="${tool_specified##*/}"
 12.5090 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.5091 +        # A command without a complete path is provided, search $PATH.
 12.5092 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool NAWK=$tool_basename" >&5
 12.5093 +$as_echo "$as_me: Will search for user supplied tool NAWK=$tool_basename" >&6;}
 12.5094 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.5095 +set dummy $tool_basename; ac_word=$2
 12.5096 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5097 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5098 +if ${ac_cv_path_NAWK+:} false; then :
 12.5099 +  $as_echo_n "(cached) " >&6
 12.5100 +else
 12.5101 +  case $NAWK in
 12.5102 +  [\\/]* | ?:[\\/]*)
 12.5103 +  ac_cv_path_NAWK="$NAWK" # Let the user override the test with a path.
 12.5104 +  ;;
 12.5105 +  *)
 12.5106 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5107 +for as_dir in $PATH
 12.5108 +do
 12.5109 +  IFS=$as_save_IFS
 12.5110 +  test -z "$as_dir" && as_dir=.
 12.5111 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5112 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.5113 +    ac_cv_path_NAWK="$as_dir/$ac_word$ac_exec_ext"
 12.5114 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.5115 +    break 2
 12.5116 +  fi
 12.5117 +done
 12.5118 +  done
 12.5119 +IFS=$as_save_IFS
 12.5120 +
 12.5121 +  ;;
 12.5122 +esac
 12.5123 +fi
 12.5124 +NAWK=$ac_cv_path_NAWK
 12.5125 +if test -n "$NAWK"; then
 12.5126 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NAWK" >&5
 12.5127 +$as_echo "$NAWK" >&6; }
 12.5128 +else
 12.5129 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5130 +$as_echo "no" >&6; }
 12.5131 +fi
 12.5132 +
 12.5133 +
 12.5134 +        if test "x$NAWK" = x; then
 12.5135 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.5136 +        fi
 12.5137 +      else
 12.5138 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.5139 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool NAWK=$tool_specified" >&5
 12.5140 +$as_echo "$as_me: Will use user supplied tool NAWK=$tool_specified" >&6;}
 12.5141 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAWK" >&5
 12.5142 +$as_echo_n "checking for NAWK... " >&6; }
 12.5143 +        if test ! -x "$tool_specified"; then
 12.5144 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.5145 +$as_echo "not found" >&6; }
 12.5146 +          as_fn_error $? "User supplied tool NAWK=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.5147 +        fi
 12.5148 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.5149 +$as_echo "$tool_specified" >&6; }
 12.5150 +      fi
 12.5151 +    fi
 12.5152 +  fi
 12.5153 +
 12.5154 +
 12.5155 +
 12.5156 +  if test "x$NAWK" = x; then
 12.5157 +    as_fn_error $? "Could not find required tool for NAWK" "$LINENO" 5
 12.5158 +  fi
 12.5159 +
 12.5160 +
 12.5161 +
 12.5162 +
 12.5163 +
 12.5164 +  # Publish this variable in the help.
 12.5165 +
 12.5166 +
 12.5167 +  if test "x$PRINTF" = x; then
 12.5168 +    # The variable is not set by user, try to locate tool using the code snippet
 12.5169 +    for ac_prog in printf
 12.5170  do
 12.5171    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.5172  set dummy $ac_prog; ac_word=$2
 12.5173 @@ -5287,21 +8683,155 @@
 12.5174    test -n "$PRINTF" && break
 12.5175  done
 12.5176  
 12.5177 +  else
 12.5178 +    # The variable is set, but is it from the command line or the environment?
 12.5179 +
 12.5180 +    # Try to remove the string !PRINTF! from our list.
 12.5181 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!PRINTF!/}
 12.5182 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.5183 +      # If it failed, the variable was not from the command line. Ignore it,
 12.5184 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.5185 +      if test "xPRINTF" != xBASH; then
 12.5186 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of PRINTF from the environment. Use command line variables instead." >&5
 12.5187 +$as_echo "$as_me: WARNING: Ignoring value of PRINTF from the environment. Use command line variables instead." >&2;}
 12.5188 +      fi
 12.5189 +      # Try to locate tool using the code snippet
 12.5190 +      for ac_prog in printf
 12.5191 +do
 12.5192 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.5193 +set dummy $ac_prog; ac_word=$2
 12.5194 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5195 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5196 +if ${ac_cv_path_PRINTF+:} false; then :
 12.5197 +  $as_echo_n "(cached) " >&6
 12.5198 +else
 12.5199 +  case $PRINTF in
 12.5200 +  [\\/]* | ?:[\\/]*)
 12.5201 +  ac_cv_path_PRINTF="$PRINTF" # Let the user override the test with a path.
 12.5202 +  ;;
 12.5203 +  *)
 12.5204 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5205 +for as_dir in $PATH
 12.5206 +do
 12.5207 +  IFS=$as_save_IFS
 12.5208 +  test -z "$as_dir" && as_dir=.
 12.5209 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5210 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.5211 +    ac_cv_path_PRINTF="$as_dir/$ac_word$ac_exec_ext"
 12.5212 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.5213 +    break 2
 12.5214 +  fi
 12.5215 +done
 12.5216 +  done
 12.5217 +IFS=$as_save_IFS
 12.5218 +
 12.5219 +  ;;
 12.5220 +esac
 12.5221 +fi
 12.5222 +PRINTF=$ac_cv_path_PRINTF
 12.5223 +if test -n "$PRINTF"; then
 12.5224 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRINTF" >&5
 12.5225 +$as_echo "$PRINTF" >&6; }
 12.5226 +else
 12.5227 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5228 +$as_echo "no" >&6; }
 12.5229 +fi
 12.5230 +
 12.5231 +
 12.5232 +  test -n "$PRINTF" && break
 12.5233 +done
 12.5234 +
 12.5235 +    else
 12.5236 +      # If it succeeded, then it was overridden by the user. We will use it
 12.5237 +      # for the tool.
 12.5238 +
 12.5239 +      # First remove it from the list of overridden variables, so we can test
 12.5240 +      # for unknown variables in the end.
 12.5241 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.5242 +
 12.5243 +      # Check if the provided tool contains a complete path.
 12.5244 +      tool_specified="$PRINTF"
 12.5245 +      tool_basename="${tool_specified##*/}"
 12.5246 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.5247 +        # A command without a complete path is provided, search $PATH.
 12.5248 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool PRINTF=$tool_basename" >&5
 12.5249 +$as_echo "$as_me: Will search for user supplied tool PRINTF=$tool_basename" >&6;}
 12.5250 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.5251 +set dummy $tool_basename; ac_word=$2
 12.5252 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5253 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5254 +if ${ac_cv_path_PRINTF+:} false; then :
 12.5255 +  $as_echo_n "(cached) " >&6
 12.5256 +else
 12.5257 +  case $PRINTF in
 12.5258 +  [\\/]* | ?:[\\/]*)
 12.5259 +  ac_cv_path_PRINTF="$PRINTF" # Let the user override the test with a path.
 12.5260 +  ;;
 12.5261 +  *)
 12.5262 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5263 +for as_dir in $PATH
 12.5264 +do
 12.5265 +  IFS=$as_save_IFS
 12.5266 +  test -z "$as_dir" && as_dir=.
 12.5267 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5268 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.5269 +    ac_cv_path_PRINTF="$as_dir/$ac_word$ac_exec_ext"
 12.5270 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.5271 +    break 2
 12.5272 +  fi
 12.5273 +done
 12.5274 +  done
 12.5275 +IFS=$as_save_IFS
 12.5276 +
 12.5277 +  ;;
 12.5278 +esac
 12.5279 +fi
 12.5280 +PRINTF=$ac_cv_path_PRINTF
 12.5281 +if test -n "$PRINTF"; then
 12.5282 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRINTF" >&5
 12.5283 +$as_echo "$PRINTF" >&6; }
 12.5284 +else
 12.5285 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5286 +$as_echo "no" >&6; }
 12.5287 +fi
 12.5288 +
 12.5289 +
 12.5290 +        if test "x$PRINTF" = x; then
 12.5291 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.5292 +        fi
 12.5293 +      else
 12.5294 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.5295 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool PRINTF=$tool_specified" >&5
 12.5296 +$as_echo "$as_me: Will use user supplied tool PRINTF=$tool_specified" >&6;}
 12.5297 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PRINTF" >&5
 12.5298 +$as_echo_n "checking for PRINTF... " >&6; }
 12.5299 +        if test ! -x "$tool_specified"; then
 12.5300 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.5301 +$as_echo "not found" >&6; }
 12.5302 +          as_fn_error $? "User supplied tool PRINTF=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.5303 +        fi
 12.5304 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.5305 +$as_echo "$tool_specified" >&6; }
 12.5306 +      fi
 12.5307 +    fi
 12.5308 +  fi
 12.5309 +
 12.5310 +
 12.5311  
 12.5312    if test "x$PRINTF" = x; then
 12.5313 -    if test "xprintf" = x; then
 12.5314 -      PROG_NAME=printf
 12.5315 -    else
 12.5316 -      PROG_NAME=printf
 12.5317 -    fi
 12.5318 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.5319 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.5320 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.5321 -  fi
 12.5322 -
 12.5323 -
 12.5324 -
 12.5325 -  for ac_prog in rm
 12.5326 +    as_fn_error $? "Could not find required tool for PRINTF" "$LINENO" 5
 12.5327 +  fi
 12.5328 +
 12.5329 +
 12.5330 +
 12.5331 +
 12.5332 +
 12.5333 +  # Publish this variable in the help.
 12.5334 +
 12.5335 +
 12.5336 +  if test "x$RM" = x; then
 12.5337 +    # The variable is not set by user, try to locate tool using the code snippet
 12.5338 +    for ac_prog in rm
 12.5339  do
 12.5340    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.5341  set dummy $ac_prog; ac_word=$2
 12.5342 @@ -5346,21 +8876,155 @@
 12.5343    test -n "$RM" && break
 12.5344  done
 12.5345  
 12.5346 +  else
 12.5347 +    # The variable is set, but is it from the command line or the environment?
 12.5348 +
 12.5349 +    # Try to remove the string !RM! from our list.
 12.5350 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!RM!/}
 12.5351 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.5352 +      # If it failed, the variable was not from the command line. Ignore it,
 12.5353 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.5354 +      if test "xRM" != xBASH; then
 12.5355 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of RM from the environment. Use command line variables instead." >&5
 12.5356 +$as_echo "$as_me: WARNING: Ignoring value of RM from the environment. Use command line variables instead." >&2;}
 12.5357 +      fi
 12.5358 +      # Try to locate tool using the code snippet
 12.5359 +      for ac_prog in rm
 12.5360 +do
 12.5361 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.5362 +set dummy $ac_prog; ac_word=$2
 12.5363 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5364 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5365 +if ${ac_cv_path_RM+:} false; then :
 12.5366 +  $as_echo_n "(cached) " >&6
 12.5367 +else
 12.5368 +  case $RM in
 12.5369 +  [\\/]* | ?:[\\/]*)
 12.5370 +  ac_cv_path_RM="$RM" # Let the user override the test with a path.
 12.5371 +  ;;
 12.5372 +  *)
 12.5373 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5374 +for as_dir in $PATH
 12.5375 +do
 12.5376 +  IFS=$as_save_IFS
 12.5377 +  test -z "$as_dir" && as_dir=.
 12.5378 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5379 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.5380 +    ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
 12.5381 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.5382 +    break 2
 12.5383 +  fi
 12.5384 +done
 12.5385 +  done
 12.5386 +IFS=$as_save_IFS
 12.5387 +
 12.5388 +  ;;
 12.5389 +esac
 12.5390 +fi
 12.5391 +RM=$ac_cv_path_RM
 12.5392 +if test -n "$RM"; then
 12.5393 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
 12.5394 +$as_echo "$RM" >&6; }
 12.5395 +else
 12.5396 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5397 +$as_echo "no" >&6; }
 12.5398 +fi
 12.5399 +
 12.5400 +
 12.5401 +  test -n "$RM" && break
 12.5402 +done
 12.5403 +
 12.5404 +    else
 12.5405 +      # If it succeeded, then it was overridden by the user. We will use it
 12.5406 +      # for the tool.
 12.5407 +
 12.5408 +      # First remove it from the list of overridden variables, so we can test
 12.5409 +      # for unknown variables in the end.
 12.5410 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.5411 +
 12.5412 +      # Check if the provided tool contains a complete path.
 12.5413 +      tool_specified="$RM"
 12.5414 +      tool_basename="${tool_specified##*/}"
 12.5415 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.5416 +        # A command without a complete path is provided, search $PATH.
 12.5417 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool RM=$tool_basename" >&5
 12.5418 +$as_echo "$as_me: Will search for user supplied tool RM=$tool_basename" >&6;}
 12.5419 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.5420 +set dummy $tool_basename; ac_word=$2
 12.5421 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5422 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5423 +if ${ac_cv_path_RM+:} false; then :
 12.5424 +  $as_echo_n "(cached) " >&6
 12.5425 +else
 12.5426 +  case $RM in
 12.5427 +  [\\/]* | ?:[\\/]*)
 12.5428 +  ac_cv_path_RM="$RM" # Let the user override the test with a path.
 12.5429 +  ;;
 12.5430 +  *)
 12.5431 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5432 +for as_dir in $PATH
 12.5433 +do
 12.5434 +  IFS=$as_save_IFS
 12.5435 +  test -z "$as_dir" && as_dir=.
 12.5436 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5437 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.5438 +    ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
 12.5439 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.5440 +    break 2
 12.5441 +  fi
 12.5442 +done
 12.5443 +  done
 12.5444 +IFS=$as_save_IFS
 12.5445 +
 12.5446 +  ;;
 12.5447 +esac
 12.5448 +fi
 12.5449 +RM=$ac_cv_path_RM
 12.5450 +if test -n "$RM"; then
 12.5451 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
 12.5452 +$as_echo "$RM" >&6; }
 12.5453 +else
 12.5454 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5455 +$as_echo "no" >&6; }
 12.5456 +fi
 12.5457 +
 12.5458 +
 12.5459 +        if test "x$RM" = x; then
 12.5460 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.5461 +        fi
 12.5462 +      else
 12.5463 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.5464 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool RM=$tool_specified" >&5
 12.5465 +$as_echo "$as_me: Will use user supplied tool RM=$tool_specified" >&6;}
 12.5466 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RM" >&5
 12.5467 +$as_echo_n "checking for RM... " >&6; }
 12.5468 +        if test ! -x "$tool_specified"; then
 12.5469 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.5470 +$as_echo "not found" >&6; }
 12.5471 +          as_fn_error $? "User supplied tool RM=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.5472 +        fi
 12.5473 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.5474 +$as_echo "$tool_specified" >&6; }
 12.5475 +      fi
 12.5476 +    fi
 12.5477 +  fi
 12.5478 +
 12.5479 +
 12.5480  
 12.5481    if test "x$RM" = x; then
 12.5482 -    if test "xrm" = x; then
 12.5483 -      PROG_NAME=rm
 12.5484 -    else
 12.5485 -      PROG_NAME=rm
 12.5486 -    fi
 12.5487 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.5488 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.5489 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.5490 -  fi
 12.5491 -
 12.5492 -
 12.5493 -
 12.5494 -  for ac_prog in sh
 12.5495 +    as_fn_error $? "Could not find required tool for RM" "$LINENO" 5
 12.5496 +  fi
 12.5497 +
 12.5498 +
 12.5499 +
 12.5500 +
 12.5501 +
 12.5502 +  # Publish this variable in the help.
 12.5503 +
 12.5504 +
 12.5505 +  if test "x$SH" = x; then
 12.5506 +    # The variable is not set by user, try to locate tool using the code snippet
 12.5507 +    for ac_prog in sh
 12.5508  do
 12.5509    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.5510  set dummy $ac_prog; ac_word=$2
 12.5511 @@ -5405,21 +9069,155 @@
 12.5512    test -n "$SH" && break
 12.5513  done
 12.5514  
 12.5515 +  else
 12.5516 +    # The variable is set, but is it from the command line or the environment?
 12.5517 +
 12.5518 +    # Try to remove the string !SH! from our list.
 12.5519 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!SH!/}
 12.5520 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.5521 +      # If it failed, the variable was not from the command line. Ignore it,
 12.5522 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.5523 +      if test "xSH" != xBASH; then
 12.5524 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of SH from the environment. Use command line variables instead." >&5
 12.5525 +$as_echo "$as_me: WARNING: Ignoring value of SH from the environment. Use command line variables instead." >&2;}
 12.5526 +      fi
 12.5527 +      # Try to locate tool using the code snippet
 12.5528 +      for ac_prog in sh
 12.5529 +do
 12.5530 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.5531 +set dummy $ac_prog; ac_word=$2
 12.5532 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5533 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5534 +if ${ac_cv_path_SH+:} false; then :
 12.5535 +  $as_echo_n "(cached) " >&6
 12.5536 +else
 12.5537 +  case $SH in
 12.5538 +  [\\/]* | ?:[\\/]*)
 12.5539 +  ac_cv_path_SH="$SH" # Let the user override the test with a path.
 12.5540 +  ;;
 12.5541 +  *)
 12.5542 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5543 +for as_dir in $PATH
 12.5544 +do
 12.5545 +  IFS=$as_save_IFS
 12.5546 +  test -z "$as_dir" && as_dir=.
 12.5547 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5548 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.5549 +    ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext"
 12.5550 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.5551 +    break 2
 12.5552 +  fi
 12.5553 +done
 12.5554 +  done
 12.5555 +IFS=$as_save_IFS
 12.5556 +
 12.5557 +  ;;
 12.5558 +esac
 12.5559 +fi
 12.5560 +SH=$ac_cv_path_SH
 12.5561 +if test -n "$SH"; then
 12.5562 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SH" >&5
 12.5563 +$as_echo "$SH" >&6; }
 12.5564 +else
 12.5565 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5566 +$as_echo "no" >&6; }
 12.5567 +fi
 12.5568 +
 12.5569 +
 12.5570 +  test -n "$SH" && break
 12.5571 +done
 12.5572 +
 12.5573 +    else
 12.5574 +      # If it succeeded, then it was overridden by the user. We will use it
 12.5575 +      # for the tool.
 12.5576 +
 12.5577 +      # First remove it from the list of overridden variables, so we can test
 12.5578 +      # for unknown variables in the end.
 12.5579 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.5580 +
 12.5581 +      # Check if the provided tool contains a complete path.
 12.5582 +      tool_specified="$SH"
 12.5583 +      tool_basename="${tool_specified##*/}"
 12.5584 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.5585 +        # A command without a complete path is provided, search $PATH.
 12.5586 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool SH=$tool_basename" >&5
 12.5587 +$as_echo "$as_me: Will search for user supplied tool SH=$tool_basename" >&6;}
 12.5588 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.5589 +set dummy $tool_basename; ac_word=$2
 12.5590 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5591 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5592 +if ${ac_cv_path_SH+:} false; then :
 12.5593 +  $as_echo_n "(cached) " >&6
 12.5594 +else
 12.5595 +  case $SH in
 12.5596 +  [\\/]* | ?:[\\/]*)
 12.5597 +  ac_cv_path_SH="$SH" # Let the user override the test with a path.
 12.5598 +  ;;
 12.5599 +  *)
 12.5600 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5601 +for as_dir in $PATH
 12.5602 +do
 12.5603 +  IFS=$as_save_IFS
 12.5604 +  test -z "$as_dir" && as_dir=.
 12.5605 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5606 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.5607 +    ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext"
 12.5608 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.5609 +    break 2
 12.5610 +  fi
 12.5611 +done
 12.5612 +  done
 12.5613 +IFS=$as_save_IFS
 12.5614 +
 12.5615 +  ;;
 12.5616 +esac
 12.5617 +fi
 12.5618 +SH=$ac_cv_path_SH
 12.5619 +if test -n "$SH"; then
 12.5620 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SH" >&5
 12.5621 +$as_echo "$SH" >&6; }
 12.5622 +else
 12.5623 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5624 +$as_echo "no" >&6; }
 12.5625 +fi
 12.5626 +
 12.5627 +
 12.5628 +        if test "x$SH" = x; then
 12.5629 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.5630 +        fi
 12.5631 +      else
 12.5632 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.5633 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool SH=$tool_specified" >&5
 12.5634 +$as_echo "$as_me: Will use user supplied tool SH=$tool_specified" >&6;}
 12.5635 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SH" >&5
 12.5636 +$as_echo_n "checking for SH... " >&6; }
 12.5637 +        if test ! -x "$tool_specified"; then
 12.5638 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.5639 +$as_echo "not found" >&6; }
 12.5640 +          as_fn_error $? "User supplied tool SH=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.5641 +        fi
 12.5642 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.5643 +$as_echo "$tool_specified" >&6; }
 12.5644 +      fi
 12.5645 +    fi
 12.5646 +  fi
 12.5647 +
 12.5648 +
 12.5649  
 12.5650    if test "x$SH" = x; then
 12.5651 -    if test "xsh" = x; then
 12.5652 -      PROG_NAME=sh
 12.5653 -    else
 12.5654 -      PROG_NAME=sh
 12.5655 -    fi
 12.5656 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.5657 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.5658 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.5659 -  fi
 12.5660 -
 12.5661 -
 12.5662 -
 12.5663 -  for ac_prog in sort
 12.5664 +    as_fn_error $? "Could not find required tool for SH" "$LINENO" 5
 12.5665 +  fi
 12.5666 +
 12.5667 +
 12.5668 +
 12.5669 +
 12.5670 +
 12.5671 +  # Publish this variable in the help.
 12.5672 +
 12.5673 +
 12.5674 +  if test "x$SORT" = x; then
 12.5675 +    # The variable is not set by user, try to locate tool using the code snippet
 12.5676 +    for ac_prog in sort
 12.5677  do
 12.5678    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.5679  set dummy $ac_prog; ac_word=$2
 12.5680 @@ -5464,21 +9262,155 @@
 12.5681    test -n "$SORT" && break
 12.5682  done
 12.5683  
 12.5684 +  else
 12.5685 +    # The variable is set, but is it from the command line or the environment?
 12.5686 +
 12.5687 +    # Try to remove the string !SORT! from our list.
 12.5688 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!SORT!/}
 12.5689 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.5690 +      # If it failed, the variable was not from the command line. Ignore it,
 12.5691 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.5692 +      if test "xSORT" != xBASH; then
 12.5693 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of SORT from the environment. Use command line variables instead." >&5
 12.5694 +$as_echo "$as_me: WARNING: Ignoring value of SORT from the environment. Use command line variables instead." >&2;}
 12.5695 +      fi
 12.5696 +      # Try to locate tool using the code snippet
 12.5697 +      for ac_prog in sort
 12.5698 +do
 12.5699 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.5700 +set dummy $ac_prog; ac_word=$2
 12.5701 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5702 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5703 +if ${ac_cv_path_SORT+:} false; then :
 12.5704 +  $as_echo_n "(cached) " >&6
 12.5705 +else
 12.5706 +  case $SORT in
 12.5707 +  [\\/]* | ?:[\\/]*)
 12.5708 +  ac_cv_path_SORT="$SORT" # Let the user override the test with a path.
 12.5709 +  ;;
 12.5710 +  *)
 12.5711 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5712 +for as_dir in $PATH
 12.5713 +do
 12.5714 +  IFS=$as_save_IFS
 12.5715 +  test -z "$as_dir" && as_dir=.
 12.5716 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5717 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.5718 +    ac_cv_path_SORT="$as_dir/$ac_word$ac_exec_ext"
 12.5719 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.5720 +    break 2
 12.5721 +  fi
 12.5722 +done
 12.5723 +  done
 12.5724 +IFS=$as_save_IFS
 12.5725 +
 12.5726 +  ;;
 12.5727 +esac
 12.5728 +fi
 12.5729 +SORT=$ac_cv_path_SORT
 12.5730 +if test -n "$SORT"; then
 12.5731 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SORT" >&5
 12.5732 +$as_echo "$SORT" >&6; }
 12.5733 +else
 12.5734 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5735 +$as_echo "no" >&6; }
 12.5736 +fi
 12.5737 +
 12.5738 +
 12.5739 +  test -n "$SORT" && break
 12.5740 +done
 12.5741 +
 12.5742 +    else
 12.5743 +      # If it succeeded, then it was overridden by the user. We will use it
 12.5744 +      # for the tool.
 12.5745 +
 12.5746 +      # First remove it from the list of overridden variables, so we can test
 12.5747 +      # for unknown variables in the end.
 12.5748 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.5749 +
 12.5750 +      # Check if the provided tool contains a complete path.
 12.5751 +      tool_specified="$SORT"
 12.5752 +      tool_basename="${tool_specified##*/}"
 12.5753 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.5754 +        # A command without a complete path is provided, search $PATH.
 12.5755 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool SORT=$tool_basename" >&5
 12.5756 +$as_echo "$as_me: Will search for user supplied tool SORT=$tool_basename" >&6;}
 12.5757 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.5758 +set dummy $tool_basename; ac_word=$2
 12.5759 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5760 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5761 +if ${ac_cv_path_SORT+:} false; then :
 12.5762 +  $as_echo_n "(cached) " >&6
 12.5763 +else
 12.5764 +  case $SORT in
 12.5765 +  [\\/]* | ?:[\\/]*)
 12.5766 +  ac_cv_path_SORT="$SORT" # Let the user override the test with a path.
 12.5767 +  ;;
 12.5768 +  *)
 12.5769 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5770 +for as_dir in $PATH
 12.5771 +do
 12.5772 +  IFS=$as_save_IFS
 12.5773 +  test -z "$as_dir" && as_dir=.
 12.5774 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5775 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.5776 +    ac_cv_path_SORT="$as_dir/$ac_word$ac_exec_ext"
 12.5777 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.5778 +    break 2
 12.5779 +  fi
 12.5780 +done
 12.5781 +  done
 12.5782 +IFS=$as_save_IFS
 12.5783 +
 12.5784 +  ;;
 12.5785 +esac
 12.5786 +fi
 12.5787 +SORT=$ac_cv_path_SORT
 12.5788 +if test -n "$SORT"; then
 12.5789 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SORT" >&5
 12.5790 +$as_echo "$SORT" >&6; }
 12.5791 +else
 12.5792 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5793 +$as_echo "no" >&6; }
 12.5794 +fi
 12.5795 +
 12.5796 +
 12.5797 +        if test "x$SORT" = x; then
 12.5798 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 12.5799 +        fi
 12.5800 +      else
 12.5801 +        # Otherwise we believe it is a complete path. Use it as it is.
 12.5802 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool SORT=$tool_specified" >&5
 12.5803 +$as_echo "$as_me: Will use user supplied tool SORT=$tool_specified" >&6;}
 12.5804 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SORT" >&5
 12.5805 +$as_echo_n "checking for SORT... " >&6; }
 12.5806 +        if test ! -x "$tool_specified"; then
 12.5807 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 12.5808 +$as_echo "not found" >&6; }
 12.5809 +          as_fn_error $? "User supplied tool SORT=$tool_specified does not exist or is not executable" "$LINENO" 5
 12.5810 +        fi
 12.5811 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 12.5812 +$as_echo "$tool_specified" >&6; }
 12.5813 +      fi
 12.5814 +    fi
 12.5815 +  fi
 12.5816 +
 12.5817 +
 12.5818  
 12.5819    if test "x$SORT" = x; then
 12.5820 -    if test "xsort" = x; then
 12.5821 -      PROG_NAME=sort
 12.5822 -    else
 12.5823 -      PROG_NAME=sort
 12.5824 -    fi
 12.5825 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 12.5826 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 12.5827 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 12.5828 -  fi
 12.5829 -
 12.5830 -
 12.5831 -
 12.5832 -  for ac_prog in tail
 12.5833 +    as_fn_error $? "Could not find required tool for SORT" "$LINENO" 5
 12.5834 +  fi
 12.5835 +
 12.5836 +
 12.5837 +
 12.5838 +
 12.5839 +
 12.5840 +  # Publish this variable in the help.
 12.5841 +
 12.5842 +
 12.5843 +  if test "x$TAIL" = x; then
 12.5844 +    # The variable is not set by user, try to locate tool using the code snippet
 12.5845 +    for ac_prog in tail
 12.5846  do
 12.5847    # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.5848  set dummy $ac_prog; ac_word=$2
 12.5849 @@ -5523,21 +9455,155 @@
 12.5850    test -n "$TAIL" && break
 12.5851  done
 12.5852  
 12.5853 +  else
 12.5854 +    # The variable is set, but is it from the command line or the environment?
 12.5855 +
 12.5856 +    # Try to remove the string !TAIL! from our list.
 12.5857 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!TAIL!/}
 12.5858 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 12.5859 +      # If it failed, the variable was not from the command line. Ignore it,
 12.5860 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 12.5861 +      if test "xTAIL" != xBASH; then
 12.5862 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of TAIL from the environment. Use command line variables instead." >&5
 12.5863 +$as_echo "$as_me: WARNING: Ignoring value of TAIL from the environment. Use command line variables instead." >&2;}
 12.5864 +      fi
 12.5865 +      # Try to locate tool using the code snippet
 12.5866 +      for ac_prog in tail
 12.5867 +do
 12.5868 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 12.5869 +set dummy $ac_prog; ac_word=$2
 12.5870 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5871 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5872 +if ${ac_cv_path_TAIL+:} false; then :
 12.5873 +  $as_echo_n "(cached) " >&6
 12.5874 +else
 12.5875 +  case $TAIL in
 12.5876 +  [\\/]* | ?:[\\/]*)
 12.5877 +  ac_cv_path_TAIL="$TAIL" # Let the user override the test with a path.
 12.5878 +  ;;
 12.5879 +  *)
 12.5880 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5881 +for as_dir in $PATH
 12.5882 +do
 12.5883 +  IFS=$as_save_IFS
 12.5884 +  test -z "$as_dir" && as_dir=.
 12.5885 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5886 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 12.5887 +    ac_cv_path_TAIL="$as_dir/$ac_word$ac_exec_ext"
 12.5888 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 12.5889 +    break 2
 12.5890 +  fi
 12.5891 +done
 12.5892 +  done
 12.5893 +IFS=$as_save_IFS
 12.5894 +
 12.5895 +  ;;
 12.5896 +esac
 12.5897 +fi
 12.5898 +TAIL=$ac_cv_path_TAIL
 12.5899 +if test -n "$TAIL"; then
 12.5900 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAIL" >&5
 12.5901 +$as_echo "$TAIL" >&6; }
 12.5902 +else
 12.5903 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 12.5904 +$as_echo "no" >&6; }
 12.5905 +fi
 12.5906 +
 12.5907 +
 12.5908 +  test -n "$TAIL" && break
 12.5909 +done
 12.5910 +
 12.5911 +    else
 12.5912 +      # If it succeeded, then it was overridden by the user. We will use it
 12.5913 +      # for the tool.
 12.5914 +
 12.5915 +      # First remove it from the list of overridden variables, so we can test
 12.5916 +      # for unknown variables in the end.
 12.5917 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 12.5918 +
 12.5919 +      # Check if the provided tool contains a complete path.
 12.5920 +      tool_specified="$TAIL"
 12.5921 +      tool_basename="${tool_specified##*/}"
 12.5922 +      if test "x$tool_basename" = "x$tool_specified"; then
 12.5923 +        # A command without a complete path is provided, search $PATH.
 12.5924 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool TAIL=$tool_basename" >&5
 12.5925 +$as_echo "$as_me: Will search for user supplied tool TAIL=$tool_basename" >&6;}
 12.5926 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 12.5927 +set dummy $tool_basename; ac_word=$2
 12.5928 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 12.5929 +$as_echo_n "checking for $ac_word... " >&6; }
 12.5930 +if ${ac_cv_path_TAIL+:} false; then :
 12.5931 +  $as_echo_n "(cached) " >&6
 12.5932 +else
 12.5933 +  case $TAIL in
 12.5934 +  [\\/]* | ?:[\\/]*)
 12.5935 +  ac_cv_path_TAIL="$TAIL" # Let the user override the test with a path.
 12.5936 +  ;;
 12.5937 +  *)
 12.5938 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 12.5939 +for as_dir in $PATH
 12.5940 +do
 12.5941 +  IFS=$as_save_IFS
 12.5942 +  test -z "$as_dir" && as_dir=.
 12.5943 +    for ac_exec_ext in '' $ac_executable_extensions; do
 12.5944 +  if as_fn_executa