8031759: Improved tool overriding in configure

Tue, 20 Mar 2018 09:19:10 -0700

author
kevinw
date
Tue, 20 Mar 2018 09:19:10 -0700
changeset 2204
0e87966d7ff1
parent 2203
28b247535e18
child 2205
54eb4c29ece4

8031759: Improved tool overriding in configure
Reviewed-by: ihse, tbell, mduigou, erikj

common/autoconf/basics.m4 file | annotate | diff | comparison | revisions
common/autoconf/build-performance.m4 file | annotate | diff | comparison | revisions
common/autoconf/configure file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/toolchain.m4 file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/basics.m4	Sun Mar 18 15:15:36 2018 -0700
     1.2 +++ b/common/autoconf/basics.m4	Tue Mar 20 09:19:10 2018 -0700
     1.3 @@ -236,35 +236,119 @@
     1.4  
     1.5  # Test that variable $1 denoting a program is not empty. If empty, exit with an error.
     1.6  # $1: variable to check
     1.7 -# $2: executable name to print in warning (optional)
     1.8  AC_DEFUN([BASIC_CHECK_NONEMPTY],
     1.9  [
    1.10    if test "x[$]$1" = x; then
    1.11 -    if test "x$2" = x; then
    1.12 -      PROG_NAME=translit($1,A-Z,a-z)
    1.13 -    else
    1.14 -      PROG_NAME=$2
    1.15 -    fi
    1.16 -    AC_MSG_NOTICE([Could not find $PROG_NAME!])
    1.17 -    AC_MSG_ERROR([Cannot continue])
    1.18 +    AC_MSG_ERROR([Could not find required tool for $1])
    1.19    fi
    1.20  ])
    1.21  
    1.22 -# Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY.
    1.23 -# Arguments as AC_PATH_PROG:
    1.24 +# Check that there are no unprocessed overridden variables left.
    1.25 +# If so, they are an incorrect argument and we will exit with an error.
    1.26 +AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
    1.27 +[
    1.28 +  if test "x$CONFIGURE_OVERRIDDEN_VARIABLES" != x; then
    1.29 +    # Replace the separating ! with spaces before presenting for end user.
    1.30 +    unknown_variables=${CONFIGURE_OVERRIDDEN_VARIABLES//!/ }
    1.31 +    AC_MSG_ERROR([The following variables are unknown to configure: $unknown_variables])
    1.32 +  fi
    1.33 +])
    1.34 +
    1.35 +# Setup a tool for the given variable. If correctly specified by the user, 
    1.36 +# use that value, otherwise search for the tool using the supplied code snippet.
    1.37  # $1: variable to set
    1.38 -# $2: executable name to look for
    1.39 -AC_DEFUN([BASIC_REQUIRE_PROG],
    1.40 +# $2: code snippet to call to look for the tool
    1.41 +AC_DEFUN([BASIC_SETUP_TOOL],
    1.42  [
    1.43 -  AC_PATH_PROGS($1, $2)
    1.44 -  BASIC_CHECK_NONEMPTY($1, $2)
    1.45 +  # Publish this variable in the help.
    1.46 +  AC_ARG_VAR($1, [Override default value for $1])
    1.47 +
    1.48 +  if test "x[$]$1" = x; then
    1.49 +    # The variable is not set by user, try to locate tool using the code snippet
    1.50 +    $2
    1.51 +  else
    1.52 +    # The variable is set, but is it from the command line or the environment?
    1.53 +
    1.54 +    # Try to remove the string !$1! from our list.
    1.55 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!$1!/}
    1.56 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
    1.57 +      # If it failed, the variable was not from the command line. Ignore it,
    1.58 +      # but warn the user (except for BASH, which is always set by the calling BASH).
    1.59 +      if test "x$1" != xBASH; then
    1.60 +        AC_MSG_WARN([Ignoring value of $1 from the environment. Use command line variables instead.])
    1.61 +      fi
    1.62 +      # Try to locate tool using the code snippet
    1.63 +      $2
    1.64 +    else
    1.65 +      # If it succeeded, then it was overridden by the user. We will use it
    1.66 +      # for the tool.
    1.67 +
    1.68 +      # First remove it from the list of overridden variables, so we can test
    1.69 +      # for unknown variables in the end.
    1.70 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
    1.71 +
    1.72 +      # Check if the provided tool contains a complete path.
    1.73 +      tool_specified="[$]$1"
    1.74 +      tool_basename="${tool_specified##*/}"
    1.75 +      if test "x$tool_basename" = "x$tool_specified"; then
    1.76 +        # A command without a complete path is provided, search $PATH.
    1.77 +        AC_MSG_NOTICE([Will search for user supplied tool $1=$tool_basename])
    1.78 +        AC_PATH_PROG($1, $tool_basename)
    1.79 +        if test "x[$]$1" = x; then
    1.80 +          AC_MSG_ERROR([User supplied tool $tool_basename could not be found])
    1.81 +        fi
    1.82 +      else
    1.83 +        # Otherwise we believe it is a complete path. Use it as it is.
    1.84 +        AC_MSG_NOTICE([Will use user supplied tool $1=$tool_specified])
    1.85 +        AC_MSG_CHECKING([for $1])
    1.86 +        if test ! -x "$tool_specified"; then
    1.87 +          AC_MSG_RESULT([not found])
    1.88 +          AC_MSG_ERROR([User supplied tool $1=$tool_specified does not exist or is not executable])
    1.89 +        fi
    1.90 +        AC_MSG_RESULT([$tool_specified])
    1.91 +      fi
    1.92 +    fi
    1.93 +  fi
    1.94 +])
    1.95 +
    1.96 +# Call BASIC_SETUP_TOOL with AC_PATH_PROGS to locate the tool
    1.97 +# $1: variable to set
    1.98 +# $2: executable name (or list of names) to look for
    1.99 +AC_DEFUN([BASIC_PATH_PROGS],
   1.100 +[
   1.101 +  BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2)])
   1.102 +])
   1.103 +
   1.104 +# Call BASIC_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool
   1.105 +# $1: variable to set
   1.106 +# $2: executable name (or list of names) to look for
   1.107 +AC_DEFUN([BASIC_CHECK_TOOLS],
   1.108 +[
   1.109 +  BASIC_SETUP_TOOL($1, [AC_CHECK_TOOLS($1, $2)])
   1.110 +])
   1.111 +
   1.112 +# Like BASIC_PATH_PROGS but fails if no tool was found.
   1.113 +# $1: variable to set
   1.114 +# $2: executable name (or list of names) to look for
   1.115 +AC_DEFUN([BASIC_REQUIRE_PROGS],
   1.116 +[
   1.117 +  BASIC_PATH_PROGS($1, $2)
   1.118 +  BASIC_CHECK_NONEMPTY($1)
   1.119 +])
   1.120 +
   1.121 +# Like BASIC_SETUP_TOOL but fails if no tool was found.
   1.122 +# $1: variable to set
   1.123 +# $2: autoconf macro to call to look for the special tool
   1.124 +AC_DEFUN([BASIC_REQUIRE_SPECIAL],
   1.125 +[
   1.126 +  BASIC_SETUP_TOOL($1, [$2])
   1.127 +  BASIC_CHECK_NONEMPTY($1)
   1.128  ])
   1.129  
   1.130  # Setup the most fundamental tools that relies on not much else to set up,
   1.131  # but is used by much of the early bootstrap code.
   1.132  AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
   1.133  [
   1.134 -
   1.135    # Start with tools that do not need have cross compilation support
   1.136    # and can be expected to be found in the default PATH. These tools are
   1.137    # used by configure. Nor are these tools expected to be found in the
   1.138 @@ -272,57 +356,50 @@
   1.139    # needed to download the devkit.
   1.140  
   1.141    # First are all the simple required tools.
   1.142 -  BASIC_REQUIRE_PROG(BASENAME, basename)
   1.143 -  BASIC_REQUIRE_PROG(BASH, bash)
   1.144 -  BASIC_REQUIRE_PROG(CAT, cat)
   1.145 -  BASIC_REQUIRE_PROG(CHMOD, chmod)
   1.146 -  BASIC_REQUIRE_PROG(CMP, cmp)
   1.147 -  BASIC_REQUIRE_PROG(COMM, comm)
   1.148 -  BASIC_REQUIRE_PROG(CP, cp)
   1.149 -  BASIC_REQUIRE_PROG(CPIO, cpio)
   1.150 -  BASIC_REQUIRE_PROG(CUT, cut)
   1.151 -  BASIC_REQUIRE_PROG(DATE, date)
   1.152 -  BASIC_REQUIRE_PROG(DIFF, [gdiff diff])
   1.153 -  BASIC_REQUIRE_PROG(DIRNAME, dirname)
   1.154 -  BASIC_REQUIRE_PROG(ECHO, echo)
   1.155 -  BASIC_REQUIRE_PROG(EXPR, expr)
   1.156 -  BASIC_REQUIRE_PROG(FILE, file)
   1.157 -  BASIC_REQUIRE_PROG(FIND, find)
   1.158 -  BASIC_REQUIRE_PROG(HEAD, head)
   1.159 -  BASIC_REQUIRE_PROG(LN, ln)
   1.160 -  BASIC_REQUIRE_PROG(LS, ls)
   1.161 -  BASIC_REQUIRE_PROG(MKDIR, mkdir)
   1.162 -  BASIC_REQUIRE_PROG(MKTEMP, mktemp)
   1.163 -  BASIC_REQUIRE_PROG(MV, mv)
   1.164 -  BASIC_REQUIRE_PROG(PRINTF, printf)
   1.165 -  BASIC_REQUIRE_PROG(RM, rm)
   1.166 -  BASIC_REQUIRE_PROG(SH, sh)
   1.167 -  BASIC_REQUIRE_PROG(SORT, sort)
   1.168 -  BASIC_REQUIRE_PROG(TAIL, tail)
   1.169 -  BASIC_REQUIRE_PROG(TAR, tar)
   1.170 -  BASIC_REQUIRE_PROG(TEE, tee)
   1.171 -  BASIC_REQUIRE_PROG(TOUCH, touch)
   1.172 -  BASIC_REQUIRE_PROG(TR, tr)
   1.173 -  BASIC_REQUIRE_PROG(UNAME, uname)
   1.174 -  BASIC_REQUIRE_PROG(UNIQ, uniq)
   1.175 -  BASIC_REQUIRE_PROG(WC, wc)
   1.176 -  BASIC_REQUIRE_PROG(WHICH, which)
   1.177 -  BASIC_REQUIRE_PROG(XARGS, xargs)
   1.178 +  BASIC_REQUIRE_PROGS(BASENAME, basename)
   1.179 +  BASIC_REQUIRE_PROGS(BASH, bash)
   1.180 +  BASIC_REQUIRE_PROGS(CAT, cat)
   1.181 +  BASIC_REQUIRE_PROGS(CHMOD, chmod)
   1.182 +  BASIC_REQUIRE_PROGS(CMP, cmp)
   1.183 +  BASIC_REQUIRE_PROGS(COMM, comm)
   1.184 +  BASIC_REQUIRE_PROGS(CP, cp)
   1.185 +  BASIC_REQUIRE_PROGS(CPIO, cpio)
   1.186 +  BASIC_REQUIRE_PROGS(CUT, cut)
   1.187 +  BASIC_REQUIRE_PROGS(DATE, date)
   1.188 +  BASIC_REQUIRE_PROGS(DIFF, [gdiff diff])
   1.189 +  BASIC_REQUIRE_PROGS(DIRNAME, dirname)
   1.190 +  BASIC_REQUIRE_PROGS(ECHO, echo)
   1.191 +  BASIC_REQUIRE_PROGS(EXPR, expr)
   1.192 +  BASIC_REQUIRE_PROGS(FILE, file)
   1.193 +  BASIC_REQUIRE_PROGS(FIND, find)
   1.194 +  BASIC_REQUIRE_PROGS(HEAD, head)
   1.195 +  BASIC_REQUIRE_PROGS(LN, ln)
   1.196 +  BASIC_REQUIRE_PROGS(LS, ls)
   1.197 +  BASIC_REQUIRE_PROGS(MKDIR, mkdir)
   1.198 +  BASIC_REQUIRE_PROGS(MKTEMP, mktemp)
   1.199 +  BASIC_REQUIRE_PROGS(MV, mv)
   1.200 +  BASIC_REQUIRE_PROGS(NAWK, [nawk gawk awk])
   1.201 +  BASIC_REQUIRE_PROGS(PRINTF, printf)
   1.202 +  BASIC_REQUIRE_PROGS(RM, rm)
   1.203 +  BASIC_REQUIRE_PROGS(SH, sh)
   1.204 +  BASIC_REQUIRE_PROGS(SORT, sort)
   1.205 +  BASIC_REQUIRE_PROGS(TAIL, tail)
   1.206 +  BASIC_REQUIRE_PROGS(TAR, tar)
   1.207 +  BASIC_REQUIRE_PROGS(TEE, tee)
   1.208 +  BASIC_REQUIRE_PROGS(TOUCH, touch)
   1.209 +  BASIC_REQUIRE_PROGS(TR, tr)
   1.210 +  BASIC_REQUIRE_PROGS(UNAME, uname)
   1.211 +  BASIC_REQUIRE_PROGS(UNIQ, uniq)
   1.212 +  BASIC_REQUIRE_PROGS(WC, wc)
   1.213 +  BASIC_REQUIRE_PROGS(WHICH, which)
   1.214 +  BASIC_REQUIRE_PROGS(XARGS, xargs)
   1.215  
   1.216    # Then required tools that require some special treatment.
   1.217 -  AC_PROG_AWK
   1.218 -  BASIC_CHECK_NONEMPTY(AWK)
   1.219 -  AC_PROG_GREP
   1.220 -  BASIC_CHECK_NONEMPTY(GREP)
   1.221 -  AC_PROG_EGREP
   1.222 -  BASIC_CHECK_NONEMPTY(EGREP)
   1.223 -  AC_PROG_FGREP
   1.224 -  BASIC_CHECK_NONEMPTY(FGREP)
   1.225 -  AC_PROG_SED
   1.226 -  BASIC_CHECK_NONEMPTY(SED)
   1.227 -
   1.228 -  AC_PATH_PROGS(NAWK, [nawk gawk awk])
   1.229 -  BASIC_CHECK_NONEMPTY(NAWK)
   1.230 +  BASIC_REQUIRE_SPECIAL(AWK, [AC_PROG_AWK])
   1.231 +  BASIC_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
   1.232 +  BASIC_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
   1.233 +  BASIC_REQUIRE_SPECIAL(FGREP, [AC_PROG_FGREP])
   1.234 +  BASIC_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
   1.235  
   1.236    # Always force rm.
   1.237    RM="$RM -f"
   1.238 @@ -332,10 +409,10 @@
   1.239    THEPWDCMD=pwd
   1.240  
   1.241    # These are not required on all platforms
   1.242 -  AC_PATH_PROG(CYGPATH, cygpath)
   1.243 -  AC_PATH_PROG(READLINK, readlink)
   1.244 -  AC_PATH_PROG(DF, df)
   1.245 -  AC_PATH_PROG(SETFILE, SetFile)
   1.246 +  BASIC_PATH_PROGS(CYGPATH, cygpath)
   1.247 +  BASIC_PATH_PROGS(READLINK, [greadlink readlink])
   1.248 +  BASIC_PATH_PROGS(DF, df)
   1.249 +  BASIC_PATH_PROGS(SETFILE, SetFile)
   1.250  ])
   1.251  
   1.252  # Setup basic configuration paths, and platform-specific stuff related to PATHs.
   1.253 @@ -628,22 +705,22 @@
   1.254  
   1.255    # These tools might not be installed by default,
   1.256    # need hint on how to install them.
   1.257 -  BASIC_REQUIRE_PROG(UNZIP, unzip)
   1.258 -  BASIC_REQUIRE_PROG(ZIP, zip)
   1.259 +  BASIC_REQUIRE_PROGS(UNZIP, unzip)
   1.260 +  BASIC_REQUIRE_PROGS(ZIP, zip)
   1.261  
   1.262    # Non-required basic tools
   1.263  
   1.264 -  AC_PATH_PROG(LDD, ldd)
   1.265 +  BASIC_PATH_PROGS(LDD, ldd)
   1.266    if test "x$LDD" = "x"; then
   1.267      # List shared lib dependencies is used for
   1.268      # debug output and checking for forbidden dependencies.
   1.269      # We can build without it.
   1.270      LDD="true"
   1.271    fi
   1.272 -  AC_PATH_PROGS(READELF, [readelf greadelf])
   1.273 -  AC_PATH_PROG(HG, hg)
   1.274 -  AC_PATH_PROG(STAT, stat)
   1.275 -  AC_PATH_PROG(TIME, time)
   1.276 +  BASIC_PATH_PROGS(READELF, [readelf greadelf])
   1.277 +  BASIC_PATH_PROGS(HG, hg)
   1.278 +  BASIC_PATH_PROGS(STAT, stat)
   1.279 +  BASIC_PATH_PROGS(TIME, time)
   1.280    # Check if it's GNU time
   1.281    IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
   1.282    if test "x$IS_GNU_TIME" != x; then
   1.283 @@ -654,13 +731,13 @@
   1.284    AC_SUBST(IS_GNU_TIME)
   1.285  
   1.286    if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
   1.287 -    BASIC_REQUIRE_PROG(COMM, comm)
   1.288 +    BASIC_REQUIRE_PROGS(COMM, comm)
   1.289    fi
   1.290  
   1.291    if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
   1.292 -    BASIC_REQUIRE_PROG(DSYMUTIL, dsymutil)
   1.293 -    BASIC_REQUIRE_PROG(XATTR, xattr)
   1.294 -    AC_PATH_PROG(CODESIGN, codesign)
   1.295 +    BASIC_REQUIRE_PROGS(DSYMUTIL, dsymutil)
   1.296 +    BASIC_REQUIRE_PROGS(XATTR, xattr)
   1.297 +    BASIC_PATH_PROGS(CODESIGN, codesign)
   1.298      if test "x$CODESIGN" != "x"; then
   1.299        # Verify that the openjdk_codesign certificate is present
   1.300        AC_MSG_CHECKING([if openjdk_codesign certificate is present])
   1.301 @@ -722,6 +799,9 @@
   1.302  
   1.303  AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
   1.304  [
   1.305 +  # Did user specify any unknown variables?
   1.306 +  BASIC_CHECK_LEFTOVER_OVERRIDDEN
   1.307 +
   1.308    AC_MSG_CHECKING([if build directory is on local disk])
   1.309    BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT,
   1.310        [OUTPUT_DIR_IS_LOCAL="yes"],
     2.1 --- a/common/autoconf/build-performance.m4	Sun Mar 18 15:15:36 2018 -0700
     2.2 +++ b/common/autoconf/build-performance.m4	Tue Mar 20 09:19:10 2018 -0700
     2.3 @@ -172,7 +172,7 @@
     2.4      if test "x$TOOLS_DIR" != x; then
     2.5        PATH=$TOOLS_DIR:$PATH
     2.6      fi
     2.7 -    BASIC_REQUIRE_PROG(CCACHE, ccache)
     2.8 +    BASIC_REQUIRE_PROGS(CCACHE, ccache)
     2.9      CCACHE_STATUS="enabled"
    2.10      PATH="$OLD_PATH"
    2.11    elif test "x$enable_ccache" = xno; then
     3.1 --- a/common/autoconf/configure	Sun Mar 18 15:15:36 2018 -0700
     3.2 +++ b/common/autoconf/configure	Tue Mar 20 09:19:10 2018 -0700
     3.3 @@ -125,15 +125,23 @@
     3.4    case $conf_option in
     3.5      --openjdk-target=*)
     3.6        conf_openjdk_target=`expr "X$conf_option" : '[^=]*=\(.*\)'`
     3.7 -      continue ;;
     3.8 +      ;;
     3.9      --debug-configure)
    3.10        if test "x$conf_debug_configure" != xrecursive; then
    3.11          conf_debug_configure=true
    3.12          export conf_debug_configure
    3.13        fi
    3.14 -      continue ;;
    3.15 +      ;;
    3.16 +    [^-]*=*)
    3.17 +      # Add name of variable to CONFIGURE_OVERRIDDEN_VARIABLES list inside !...!.
    3.18 +      conf_env_var=`expr "x$conf_option" : 'x\([^=]*\)='`
    3.19 +      CONFIGURE_OVERRIDDEN_VARIABLES="$CONFIGURE_OVERRIDDEN_VARIABLES!$conf_env_var!"
    3.20 +      # ... and then process argument as usual
    3.21 +      conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option")
    3.22 +      ;;
    3.23      *)
    3.24 -      conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option") ;;
    3.25 +      conf_processed_arguments=("${conf_processed_arguments[@]}" "$conf_option")
    3.26 +      ;;
    3.27    esac
    3.28  
    3.29    case $conf_option in
    3.30 @@ -216,6 +224,9 @@
    3.31  
    3.32  Please be aware that, when cross-compiling, the OpenJDK configure script will
    3.33  generally use 'target' where autoconf traditionally uses 'host'.
    3.34 +
    3.35 +Also note that variables must be passed on the command line. Variables in the
    3.36 +environment will generally be ignored, unlike traditional autoconf scripts.
    3.37  EOT
    3.38    fi
    3.39  else
     4.1 --- a/common/autoconf/generated-configure.sh	Sun Mar 18 15:15:36 2018 -0700
     4.2 +++ b/common/autoconf/generated-configure.sh	Tue Mar 20 09:19:10 2018 -0700
     4.3 @@ -718,6 +718,8 @@
     4.4  OBJDUMP
     4.5  ac_ct_OBJCOPY
     4.6  OBJCOPY
     4.7 +ac_ct_STRIP
     4.8 +ac_ct_NM
     4.9  OTOOL
    4.10  MCS
    4.11  STRIP
    4.12 @@ -738,6 +740,7 @@
    4.13  HOTSPOT_LD
    4.14  HOTSPOT_CXX
    4.15  ARFLAGS
    4.16 +ac_ct_AR
    4.17  AR
    4.18  LDEXECXX
    4.19  LDCXX
    4.20 @@ -925,7 +928,6 @@
    4.21  DF
    4.22  READLINK
    4.23  CYGPATH
    4.24 -NAWK
    4.25  SED
    4.26  FGREP
    4.27  EGREP
    4.28 @@ -945,6 +947,7 @@
    4.29  SH
    4.30  RM
    4.31  PRINTF
    4.32 +NAWK
    4.33  MV
    4.34  MKTEMP
    4.35  MKDIR
    4.36 @@ -1086,7 +1089,66 @@
    4.37        ac_precious_vars='build_alias
    4.38  host_alias
    4.39  target_alias
    4.40 +BASENAME
    4.41 +BASH
    4.42 +CAT
    4.43 +CHMOD
    4.44 +CMP
    4.45 +COMM
    4.46 +CP
    4.47 +CPIO
    4.48 +CUT
    4.49 +DATE
    4.50 +DIFF
    4.51 +DIRNAME
    4.52 +ECHO
    4.53 +EXPR
    4.54 +FILE
    4.55 +FIND
    4.56 +HEAD
    4.57 +LN
    4.58 +LS
    4.59 +MKDIR
    4.60 +MKTEMP
    4.61 +MV
    4.62 +NAWK
    4.63 +PRINTF
    4.64 +RM
    4.65 +SH
    4.66 +SORT
    4.67 +TAIL
    4.68 +TAR
    4.69 +TEE
    4.70 +TOUCH
    4.71 +TR
    4.72 +UNAME
    4.73 +UNIQ
    4.74 +WC
    4.75 +WHICH
    4.76 +XARGS
    4.77 +AWK
    4.78 +GREP
    4.79 +EGREP
    4.80 +FGREP
    4.81 +SED
    4.82 +CYGPATH
    4.83 +READLINK
    4.84 +DF
    4.85 +SETFILE
    4.86 +UNZIP
    4.87 +ZIP
    4.88 +LDD
    4.89 +READELF
    4.90 +HG
    4.91 +STAT
    4.92 +TIME
    4.93 +DSYMUTIL
    4.94 +XATTR
    4.95 +CODESIGN
    4.96  PKG_CONFIG
    4.97 +BUILD_CC
    4.98 +BUILD_CXX
    4.99 +BUILD_LD
   4.100  CC
   4.101  CFLAGS
   4.102  LDFLAGS
   4.103 @@ -1097,15 +1159,25 @@
   4.104  CCC
   4.105  OBJC
   4.106  OBJCFLAGS
   4.107 +AR
   4.108  CPP
   4.109  CXXCPP
   4.110 +AS
   4.111 +NM
   4.112 +GNM
   4.113 +STRIP
   4.114 +MCS
   4.115 +OBJCOPY
   4.116 +OBJDUMP
   4.117 +JTREGEXE
   4.118  XMKMF
   4.119  FREETYPE_CFLAGS
   4.120  FREETYPE_LIBS
   4.121  ALSA_CFLAGS
   4.122  ALSA_LIBS
   4.123  LIBFFI_CFLAGS
   4.124 -LIBFFI_LIBS'
   4.125 +LIBFFI_LIBS
   4.126 +CCACHE'
   4.127  
   4.128  
   4.129  # Initialize some variables set by options.
   4.130 @@ -1864,7 +1936,66 @@
   4.131    --with-ccache-dir       where to store ccache files [~/.ccache]
   4.132  
   4.133  Some influential environment variables:
   4.134 +  BASENAME    Override default value for BASENAME
   4.135 +  BASH        Override default value for BASH
   4.136 +  CAT         Override default value for CAT
   4.137 +  CHMOD       Override default value for CHMOD
   4.138 +  CMP         Override default value for CMP
   4.139 +  COMM        Override default value for COMM
   4.140 +  CP          Override default value for CP
   4.141 +  CPIO        Override default value for CPIO
   4.142 +  CUT         Override default value for CUT
   4.143 +  DATE        Override default value for DATE
   4.144 +  DIFF        Override default value for DIFF
   4.145 +  DIRNAME     Override default value for DIRNAME
   4.146 +  ECHO        Override default value for ECHO
   4.147 +  EXPR        Override default value for EXPR
   4.148 +  FILE        Override default value for FILE
   4.149 +  FIND        Override default value for FIND
   4.150 +  HEAD        Override default value for HEAD
   4.151 +  LN          Override default value for LN
   4.152 +  LS          Override default value for LS
   4.153 +  MKDIR       Override default value for MKDIR
   4.154 +  MKTEMP      Override default value for MKTEMP
   4.155 +  MV          Override default value for MV
   4.156 +  NAWK        Override default value for NAWK
   4.157 +  PRINTF      Override default value for PRINTF
   4.158 +  RM          Override default value for RM
   4.159 +  SH          Override default value for SH
   4.160 +  SORT        Override default value for SORT
   4.161 +  TAIL        Override default value for TAIL
   4.162 +  TAR         Override default value for TAR
   4.163 +  TEE         Override default value for TEE
   4.164 +  TOUCH       Override default value for TOUCH
   4.165 +  TR          Override default value for TR
   4.166 +  UNAME       Override default value for UNAME
   4.167 +  UNIQ        Override default value for UNIQ
   4.168 +  WC          Override default value for WC
   4.169 +  WHICH       Override default value for WHICH
   4.170 +  XARGS       Override default value for XARGS
   4.171 +  AWK         Override default value for AWK
   4.172 +  GREP        Override default value for GREP
   4.173 +  EGREP       Override default value for EGREP
   4.174 +  FGREP       Override default value for FGREP
   4.175 +  SED         Override default value for SED
   4.176 +  CYGPATH     Override default value for CYGPATH
   4.177 +  READLINK    Override default value for READLINK
   4.178 +  DF          Override default value for DF
   4.179 +  SETFILE     Override default value for SETFILE
   4.180 +  UNZIP       Override default value for UNZIP
   4.181 +  ZIP         Override default value for ZIP
   4.182 +  LDD         Override default value for LDD
   4.183 +  READELF     Override default value for READELF
   4.184 +  HG          Override default value for HG
   4.185 +  STAT        Override default value for STAT
   4.186 +  TIME        Override default value for TIME
   4.187 +  DSYMUTIL    Override default value for DSYMUTIL
   4.188 +  XATTR       Override default value for XATTR
   4.189 +  CODESIGN    Override default value for CODESIGN
   4.190    PKG_CONFIG  path to pkg-config utility
   4.191 +  BUILD_CC    Override default value for BUILD_CC
   4.192 +  BUILD_CXX   Override default value for BUILD_CXX
   4.193 +  BUILD_LD    Override default value for BUILD_LD
   4.194    CC          C compiler command
   4.195    CFLAGS      C compiler flags
   4.196    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
   4.197 @@ -1876,8 +2007,17 @@
   4.198    CXXFLAGS    C++ compiler flags
   4.199    OBJC        Objective C compiler command
   4.200    OBJCFLAGS   Objective C compiler flags
   4.201 +  AR          Override default value for AR
   4.202    CPP         C preprocessor
   4.203    CXXCPP      C++ preprocessor
   4.204 +  AS          Override default value for AS
   4.205 +  NM          Override default value for NM
   4.206 +  GNM         Override default value for GNM
   4.207 +  STRIP       Override default value for STRIP
   4.208 +  MCS         Override default value for MCS
   4.209 +  OBJCOPY     Override default value for OBJCOPY
   4.210 +  OBJDUMP     Override default value for OBJDUMP
   4.211 +  JTREGEXE    Override default value for JTREGEXE
   4.212    XMKMF       Path to xmkmf, Makefile generator for X Window System
   4.213    FREETYPE_CFLAGS
   4.214                C compiler flags for FREETYPE, overriding pkg-config
   4.215 @@ -1888,6 +2028,7 @@
   4.216    LIBFFI_CFLAGS
   4.217                C compiler flags for LIBFFI, overriding pkg-config
   4.218    LIBFFI_LIBS linker flags for LIBFFI, overriding pkg-config
   4.219 +  CCACHE      Override default value for CCACHE
   4.220  
   4.221  Use these variables to override the choices made by `configure' or to help
   4.222  it to find libraries and programs with nonstandard names/locations.
   4.223 @@ -3190,13 +3331,36 @@
   4.224  
   4.225  # Test that variable $1 denoting a program is not empty. If empty, exit with an error.
   4.226  # $1: variable to check
   4.227 -# $2: executable name to print in warning (optional)
   4.228 -
   4.229 -
   4.230 -# Does AC_PATH_PROG followed by BASIC_CHECK_NONEMPTY.
   4.231 -# Arguments as AC_PATH_PROG:
   4.232 +
   4.233 +
   4.234 +# Check that there are no unprocessed overridden variables left.
   4.235 +# If so, they are an incorrect argument and we will exit with an error.
   4.236 +
   4.237 +
   4.238 +# Setup a tool for the given variable. If correctly specified by the user,
   4.239 +# use that value, otherwise search for the tool using the supplied code snippet.
   4.240  # $1: variable to set
   4.241 -# $2: executable name to look for
   4.242 +# $2: code snippet to call to look for the tool
   4.243 +
   4.244 +
   4.245 +# Call BASIC_SETUP_TOOL with AC_PATH_PROGS to locate the tool
   4.246 +# $1: variable to set
   4.247 +# $2: executable name (or list of names) to look for
   4.248 +
   4.249 +
   4.250 +# Call BASIC_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool
   4.251 +# $1: variable to set
   4.252 +# $2: executable name (or list of names) to look for
   4.253 +
   4.254 +
   4.255 +# Like BASIC_PATH_PROGS but fails if no tool was found.
   4.256 +# $1: variable to set
   4.257 +# $2: executable name (or list of names) to look for
   4.258 +
   4.259 +
   4.260 +# Like BASIC_SETUP_TOOL but fails if no tool was found.
   4.261 +# $1: variable to set
   4.262 +# $2: autoconf macro to call to look for the special tool
   4.263  
   4.264  
   4.265  # Setup the most fundamental tools that relies on not much else to set up,
   4.266 @@ -3912,7 +4076,7 @@
   4.267  #CUSTOM_AUTOCONF_INCLUDE
   4.268  
   4.269  # Do not change or remove the following line, it is needed for consistency checks:
   4.270 -DATE_WHEN_GENERATED=1521218818
   4.271 +DATE_WHEN_GENERATED=1521554908
   4.272  
   4.273  ###############################################################################
   4.274  #
   4.275 @@ -3935,7 +4099,6 @@
   4.276  $as_echo "$as_me: configure script generated at timestamp $DATE_WHEN_GENERATED." >&6;}
   4.277  
   4.278  
   4.279 -
   4.280    # Start with tools that do not need have cross compilation support
   4.281    # and can be expected to be found in the default PATH. These tools are
   4.282    # used by configure. Nor are these tools expected to be found in the
   4.283 @@ -3944,7 +4107,14 @@
   4.284  
   4.285    # First are all the simple required tools.
   4.286  
   4.287 -  for ac_prog in basename
   4.288 +
   4.289 +
   4.290 +  # Publish this variable in the help.
   4.291 +
   4.292 +
   4.293 +  if test "x$BASENAME" = x; then
   4.294 +    # The variable is not set by user, try to locate tool using the code snippet
   4.295 +    for ac_prog in basename
   4.296  do
   4.297    # Extract the first word of "$ac_prog", so it can be a program name with args.
   4.298  set dummy $ac_prog; ac_word=$2
   4.299 @@ -3989,21 +4159,155 @@
   4.300    test -n "$BASENAME" && break
   4.301  done
   4.302  
   4.303 +  else
   4.304 +    # The variable is set, but is it from the command line or the environment?
   4.305 +
   4.306 +    # Try to remove the string !BASENAME! from our list.
   4.307 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BASENAME!/}
   4.308 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
   4.309 +      # If it failed, the variable was not from the command line. Ignore it,
   4.310 +      # but warn the user (except for BASH, which is always set by the calling BASH).
   4.311 +      if test "xBASENAME" != xBASH; then
   4.312 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BASENAME from the environment. Use command line variables instead." >&5
   4.313 +$as_echo "$as_me: WARNING: Ignoring value of BASENAME from the environment. Use command line variables instead." >&2;}
   4.314 +      fi
   4.315 +      # Try to locate tool using the code snippet
   4.316 +      for ac_prog in basename
   4.317 +do
   4.318 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
   4.319 +set dummy $ac_prog; ac_word=$2
   4.320 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.321 +$as_echo_n "checking for $ac_word... " >&6; }
   4.322 +if ${ac_cv_path_BASENAME+:} false; then :
   4.323 +  $as_echo_n "(cached) " >&6
   4.324 +else
   4.325 +  case $BASENAME in
   4.326 +  [\\/]* | ?:[\\/]*)
   4.327 +  ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path.
   4.328 +  ;;
   4.329 +  *)
   4.330 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   4.331 +for as_dir in $PATH
   4.332 +do
   4.333 +  IFS=$as_save_IFS
   4.334 +  test -z "$as_dir" && as_dir=.
   4.335 +    for ac_exec_ext in '' $ac_executable_extensions; do
   4.336 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.337 +    ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext"
   4.338 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.339 +    break 2
   4.340 +  fi
   4.341 +done
   4.342 +  done
   4.343 +IFS=$as_save_IFS
   4.344 +
   4.345 +  ;;
   4.346 +esac
   4.347 +fi
   4.348 +BASENAME=$ac_cv_path_BASENAME
   4.349 +if test -n "$BASENAME"; then
   4.350 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5
   4.351 +$as_echo "$BASENAME" >&6; }
   4.352 +else
   4.353 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   4.354 +$as_echo "no" >&6; }
   4.355 +fi
   4.356 +
   4.357 +
   4.358 +  test -n "$BASENAME" && break
   4.359 +done
   4.360 +
   4.361 +    else
   4.362 +      # If it succeeded, then it was overridden by the user. We will use it
   4.363 +      # for the tool.
   4.364 +
   4.365 +      # First remove it from the list of overridden variables, so we can test
   4.366 +      # for unknown variables in the end.
   4.367 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
   4.368 +
   4.369 +      # Check if the provided tool contains a complete path.
   4.370 +      tool_specified="$BASENAME"
   4.371 +      tool_basename="${tool_specified##*/}"
   4.372 +      if test "x$tool_basename" = "x$tool_specified"; then
   4.373 +        # A command without a complete path is provided, search $PATH.
   4.374 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BASENAME=$tool_basename" >&5
   4.375 +$as_echo "$as_me: Will search for user supplied tool BASENAME=$tool_basename" >&6;}
   4.376 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
   4.377 +set dummy $tool_basename; ac_word=$2
   4.378 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.379 +$as_echo_n "checking for $ac_word... " >&6; }
   4.380 +if ${ac_cv_path_BASENAME+:} false; then :
   4.381 +  $as_echo_n "(cached) " >&6
   4.382 +else
   4.383 +  case $BASENAME in
   4.384 +  [\\/]* | ?:[\\/]*)
   4.385 +  ac_cv_path_BASENAME="$BASENAME" # Let the user override the test with a path.
   4.386 +  ;;
   4.387 +  *)
   4.388 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   4.389 +for as_dir in $PATH
   4.390 +do
   4.391 +  IFS=$as_save_IFS
   4.392 +  test -z "$as_dir" && as_dir=.
   4.393 +    for ac_exec_ext in '' $ac_executable_extensions; do
   4.394 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.395 +    ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext"
   4.396 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.397 +    break 2
   4.398 +  fi
   4.399 +done
   4.400 +  done
   4.401 +IFS=$as_save_IFS
   4.402 +
   4.403 +  ;;
   4.404 +esac
   4.405 +fi
   4.406 +BASENAME=$ac_cv_path_BASENAME
   4.407 +if test -n "$BASENAME"; then
   4.408 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASENAME" >&5
   4.409 +$as_echo "$BASENAME" >&6; }
   4.410 +else
   4.411 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   4.412 +$as_echo "no" >&6; }
   4.413 +fi
   4.414 +
   4.415 +
   4.416 +        if test "x$BASENAME" = x; then
   4.417 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
   4.418 +        fi
   4.419 +      else
   4.420 +        # Otherwise we believe it is a complete path. Use it as it is.
   4.421 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BASENAME=$tool_specified" >&5
   4.422 +$as_echo "$as_me: Will use user supplied tool BASENAME=$tool_specified" >&6;}
   4.423 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASENAME" >&5
   4.424 +$as_echo_n "checking for BASENAME... " >&6; }
   4.425 +        if test ! -x "$tool_specified"; then
   4.426 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
   4.427 +$as_echo "not found" >&6; }
   4.428 +          as_fn_error $? "User supplied tool BASENAME=$tool_specified does not exist or is not executable" "$LINENO" 5
   4.429 +        fi
   4.430 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
   4.431 +$as_echo "$tool_specified" >&6; }
   4.432 +      fi
   4.433 +    fi
   4.434 +  fi
   4.435 +
   4.436 +
   4.437  
   4.438    if test "x$BASENAME" = x; then
   4.439 -    if test "xbasename" = x; then
   4.440 -      PROG_NAME=basename
   4.441 -    else
   4.442 -      PROG_NAME=basename
   4.443 -    fi
   4.444 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
   4.445 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
   4.446 -    as_fn_error $? "Cannot continue" "$LINENO" 5
   4.447 -  fi
   4.448 -
   4.449 -
   4.450 -
   4.451 -  for ac_prog in bash
   4.452 +    as_fn_error $? "Could not find required tool for BASENAME" "$LINENO" 5
   4.453 +  fi
   4.454 +
   4.455 +
   4.456 +
   4.457 +
   4.458 +
   4.459 +  # Publish this variable in the help.
   4.460 +
   4.461 +
   4.462 +  if test "x$BASH" = x; then
   4.463 +    # The variable is not set by user, try to locate tool using the code snippet
   4.464 +    for ac_prog in bash
   4.465  do
   4.466    # Extract the first word of "$ac_prog", so it can be a program name with args.
   4.467  set dummy $ac_prog; ac_word=$2
   4.468 @@ -4048,21 +4352,155 @@
   4.469    test -n "$BASH" && break
   4.470  done
   4.471  
   4.472 +  else
   4.473 +    # The variable is set, but is it from the command line or the environment?
   4.474 +
   4.475 +    # Try to remove the string !BASH! from our list.
   4.476 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BASH!/}
   4.477 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
   4.478 +      # If it failed, the variable was not from the command line. Ignore it,
   4.479 +      # but warn the user (except for BASH, which is always set by the calling BASH).
   4.480 +      if test "xBASH" != xBASH; then
   4.481 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BASH from the environment. Use command line variables instead." >&5
   4.482 +$as_echo "$as_me: WARNING: Ignoring value of BASH from the environment. Use command line variables instead." >&2;}
   4.483 +      fi
   4.484 +      # Try to locate tool using the code snippet
   4.485 +      for ac_prog in bash
   4.486 +do
   4.487 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
   4.488 +set dummy $ac_prog; ac_word=$2
   4.489 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.490 +$as_echo_n "checking for $ac_word... " >&6; }
   4.491 +if ${ac_cv_path_BASH+:} false; then :
   4.492 +  $as_echo_n "(cached) " >&6
   4.493 +else
   4.494 +  case $BASH in
   4.495 +  [\\/]* | ?:[\\/]*)
   4.496 +  ac_cv_path_BASH="$BASH" # Let the user override the test with a path.
   4.497 +  ;;
   4.498 +  *)
   4.499 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   4.500 +for as_dir in $PATH
   4.501 +do
   4.502 +  IFS=$as_save_IFS
   4.503 +  test -z "$as_dir" && as_dir=.
   4.504 +    for ac_exec_ext in '' $ac_executable_extensions; do
   4.505 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.506 +    ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext"
   4.507 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.508 +    break 2
   4.509 +  fi
   4.510 +done
   4.511 +  done
   4.512 +IFS=$as_save_IFS
   4.513 +
   4.514 +  ;;
   4.515 +esac
   4.516 +fi
   4.517 +BASH=$ac_cv_path_BASH
   4.518 +if test -n "$BASH"; then
   4.519 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
   4.520 +$as_echo "$BASH" >&6; }
   4.521 +else
   4.522 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   4.523 +$as_echo "no" >&6; }
   4.524 +fi
   4.525 +
   4.526 +
   4.527 +  test -n "$BASH" && break
   4.528 +done
   4.529 +
   4.530 +    else
   4.531 +      # If it succeeded, then it was overridden by the user. We will use it
   4.532 +      # for the tool.
   4.533 +
   4.534 +      # First remove it from the list of overridden variables, so we can test
   4.535 +      # for unknown variables in the end.
   4.536 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
   4.537 +
   4.538 +      # Check if the provided tool contains a complete path.
   4.539 +      tool_specified="$BASH"
   4.540 +      tool_basename="${tool_specified##*/}"
   4.541 +      if test "x$tool_basename" = "x$tool_specified"; then
   4.542 +        # A command without a complete path is provided, search $PATH.
   4.543 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BASH=$tool_basename" >&5
   4.544 +$as_echo "$as_me: Will search for user supplied tool BASH=$tool_basename" >&6;}
   4.545 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
   4.546 +set dummy $tool_basename; ac_word=$2
   4.547 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.548 +$as_echo_n "checking for $ac_word... " >&6; }
   4.549 +if ${ac_cv_path_BASH+:} false; then :
   4.550 +  $as_echo_n "(cached) " >&6
   4.551 +else
   4.552 +  case $BASH in
   4.553 +  [\\/]* | ?:[\\/]*)
   4.554 +  ac_cv_path_BASH="$BASH" # Let the user override the test with a path.
   4.555 +  ;;
   4.556 +  *)
   4.557 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   4.558 +for as_dir in $PATH
   4.559 +do
   4.560 +  IFS=$as_save_IFS
   4.561 +  test -z "$as_dir" && as_dir=.
   4.562 +    for ac_exec_ext in '' $ac_executable_extensions; do
   4.563 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.564 +    ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext"
   4.565 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.566 +    break 2
   4.567 +  fi
   4.568 +done
   4.569 +  done
   4.570 +IFS=$as_save_IFS
   4.571 +
   4.572 +  ;;
   4.573 +esac
   4.574 +fi
   4.575 +BASH=$ac_cv_path_BASH
   4.576 +if test -n "$BASH"; then
   4.577 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BASH" >&5
   4.578 +$as_echo "$BASH" >&6; }
   4.579 +else
   4.580 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   4.581 +$as_echo "no" >&6; }
   4.582 +fi
   4.583 +
   4.584 +
   4.585 +        if test "x$BASH" = x; then
   4.586 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
   4.587 +        fi
   4.588 +      else
   4.589 +        # Otherwise we believe it is a complete path. Use it as it is.
   4.590 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BASH=$tool_specified" >&5
   4.591 +$as_echo "$as_me: Will use user supplied tool BASH=$tool_specified" >&6;}
   4.592 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASH" >&5
   4.593 +$as_echo_n "checking for BASH... " >&6; }
   4.594 +        if test ! -x "$tool_specified"; then
   4.595 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
   4.596 +$as_echo "not found" >&6; }
   4.597 +          as_fn_error $? "User supplied tool BASH=$tool_specified does not exist or is not executable" "$LINENO" 5
   4.598 +        fi
   4.599 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
   4.600 +$as_echo "$tool_specified" >&6; }
   4.601 +      fi
   4.602 +    fi
   4.603 +  fi
   4.604 +
   4.605 +
   4.606  
   4.607    if test "x$BASH" = x; then
   4.608 -    if test "xbash" = x; then
   4.609 -      PROG_NAME=bash
   4.610 -    else
   4.611 -      PROG_NAME=bash
   4.612 -    fi
   4.613 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
   4.614 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
   4.615 -    as_fn_error $? "Cannot continue" "$LINENO" 5
   4.616 -  fi
   4.617 -
   4.618 -
   4.619 -
   4.620 -  for ac_prog in cat
   4.621 +    as_fn_error $? "Could not find required tool for BASH" "$LINENO" 5
   4.622 +  fi
   4.623 +
   4.624 +
   4.625 +
   4.626 +
   4.627 +
   4.628 +  # Publish this variable in the help.
   4.629 +
   4.630 +
   4.631 +  if test "x$CAT" = x; then
   4.632 +    # The variable is not set by user, try to locate tool using the code snippet
   4.633 +    for ac_prog in cat
   4.634  do
   4.635    # Extract the first word of "$ac_prog", so it can be a program name with args.
   4.636  set dummy $ac_prog; ac_word=$2
   4.637 @@ -4107,21 +4545,155 @@
   4.638    test -n "$CAT" && break
   4.639  done
   4.640  
   4.641 +  else
   4.642 +    # The variable is set, but is it from the command line or the environment?
   4.643 +
   4.644 +    # Try to remove the string !CAT! from our list.
   4.645 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CAT!/}
   4.646 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
   4.647 +      # If it failed, the variable was not from the command line. Ignore it,
   4.648 +      # but warn the user (except for BASH, which is always set by the calling BASH).
   4.649 +      if test "xCAT" != xBASH; then
   4.650 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CAT from the environment. Use command line variables instead." >&5
   4.651 +$as_echo "$as_me: WARNING: Ignoring value of CAT from the environment. Use command line variables instead." >&2;}
   4.652 +      fi
   4.653 +      # Try to locate tool using the code snippet
   4.654 +      for ac_prog in cat
   4.655 +do
   4.656 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
   4.657 +set dummy $ac_prog; ac_word=$2
   4.658 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.659 +$as_echo_n "checking for $ac_word... " >&6; }
   4.660 +if ${ac_cv_path_CAT+:} false; then :
   4.661 +  $as_echo_n "(cached) " >&6
   4.662 +else
   4.663 +  case $CAT in
   4.664 +  [\\/]* | ?:[\\/]*)
   4.665 +  ac_cv_path_CAT="$CAT" # Let the user override the test with a path.
   4.666 +  ;;
   4.667 +  *)
   4.668 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   4.669 +for as_dir in $PATH
   4.670 +do
   4.671 +  IFS=$as_save_IFS
   4.672 +  test -z "$as_dir" && as_dir=.
   4.673 +    for ac_exec_ext in '' $ac_executable_extensions; do
   4.674 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.675 +    ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext"
   4.676 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.677 +    break 2
   4.678 +  fi
   4.679 +done
   4.680 +  done
   4.681 +IFS=$as_save_IFS
   4.682 +
   4.683 +  ;;
   4.684 +esac
   4.685 +fi
   4.686 +CAT=$ac_cv_path_CAT
   4.687 +if test -n "$CAT"; then
   4.688 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAT" >&5
   4.689 +$as_echo "$CAT" >&6; }
   4.690 +else
   4.691 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   4.692 +$as_echo "no" >&6; }
   4.693 +fi
   4.694 +
   4.695 +
   4.696 +  test -n "$CAT" && break
   4.697 +done
   4.698 +
   4.699 +    else
   4.700 +      # If it succeeded, then it was overridden by the user. We will use it
   4.701 +      # for the tool.
   4.702 +
   4.703 +      # First remove it from the list of overridden variables, so we can test
   4.704 +      # for unknown variables in the end.
   4.705 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
   4.706 +
   4.707 +      # Check if the provided tool contains a complete path.
   4.708 +      tool_specified="$CAT"
   4.709 +      tool_basename="${tool_specified##*/}"
   4.710 +      if test "x$tool_basename" = "x$tool_specified"; then
   4.711 +        # A command without a complete path is provided, search $PATH.
   4.712 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CAT=$tool_basename" >&5
   4.713 +$as_echo "$as_me: Will search for user supplied tool CAT=$tool_basename" >&6;}
   4.714 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
   4.715 +set dummy $tool_basename; ac_word=$2
   4.716 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.717 +$as_echo_n "checking for $ac_word... " >&6; }
   4.718 +if ${ac_cv_path_CAT+:} false; then :
   4.719 +  $as_echo_n "(cached) " >&6
   4.720 +else
   4.721 +  case $CAT in
   4.722 +  [\\/]* | ?:[\\/]*)
   4.723 +  ac_cv_path_CAT="$CAT" # Let the user override the test with a path.
   4.724 +  ;;
   4.725 +  *)
   4.726 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   4.727 +for as_dir in $PATH
   4.728 +do
   4.729 +  IFS=$as_save_IFS
   4.730 +  test -z "$as_dir" && as_dir=.
   4.731 +    for ac_exec_ext in '' $ac_executable_extensions; do
   4.732 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.733 +    ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext"
   4.734 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.735 +    break 2
   4.736 +  fi
   4.737 +done
   4.738 +  done
   4.739 +IFS=$as_save_IFS
   4.740 +
   4.741 +  ;;
   4.742 +esac
   4.743 +fi
   4.744 +CAT=$ac_cv_path_CAT
   4.745 +if test -n "$CAT"; then
   4.746 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAT" >&5
   4.747 +$as_echo "$CAT" >&6; }
   4.748 +else
   4.749 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   4.750 +$as_echo "no" >&6; }
   4.751 +fi
   4.752 +
   4.753 +
   4.754 +        if test "x$CAT" = x; then
   4.755 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
   4.756 +        fi
   4.757 +      else
   4.758 +        # Otherwise we believe it is a complete path. Use it as it is.
   4.759 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CAT=$tool_specified" >&5
   4.760 +$as_echo "$as_me: Will use user supplied tool CAT=$tool_specified" >&6;}
   4.761 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAT" >&5
   4.762 +$as_echo_n "checking for CAT... " >&6; }
   4.763 +        if test ! -x "$tool_specified"; then
   4.764 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
   4.765 +$as_echo "not found" >&6; }
   4.766 +          as_fn_error $? "User supplied tool CAT=$tool_specified does not exist or is not executable" "$LINENO" 5
   4.767 +        fi
   4.768 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
   4.769 +$as_echo "$tool_specified" >&6; }
   4.770 +      fi
   4.771 +    fi
   4.772 +  fi
   4.773 +
   4.774 +
   4.775  
   4.776    if test "x$CAT" = x; then
   4.777 -    if test "xcat" = x; then
   4.778 -      PROG_NAME=cat
   4.779 -    else
   4.780 -      PROG_NAME=cat
   4.781 -    fi
   4.782 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
   4.783 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
   4.784 -    as_fn_error $? "Cannot continue" "$LINENO" 5
   4.785 -  fi
   4.786 -
   4.787 -
   4.788 -
   4.789 -  for ac_prog in chmod
   4.790 +    as_fn_error $? "Could not find required tool for CAT" "$LINENO" 5
   4.791 +  fi
   4.792 +
   4.793 +
   4.794 +
   4.795 +
   4.796 +
   4.797 +  # Publish this variable in the help.
   4.798 +
   4.799 +
   4.800 +  if test "x$CHMOD" = x; then
   4.801 +    # The variable is not set by user, try to locate tool using the code snippet
   4.802 +    for ac_prog in chmod
   4.803  do
   4.804    # Extract the first word of "$ac_prog", so it can be a program name with args.
   4.805  set dummy $ac_prog; ac_word=$2
   4.806 @@ -4166,21 +4738,155 @@
   4.807    test -n "$CHMOD" && break
   4.808  done
   4.809  
   4.810 +  else
   4.811 +    # The variable is set, but is it from the command line or the environment?
   4.812 +
   4.813 +    # Try to remove the string !CHMOD! from our list.
   4.814 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CHMOD!/}
   4.815 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
   4.816 +      # If it failed, the variable was not from the command line. Ignore it,
   4.817 +      # but warn the user (except for BASH, which is always set by the calling BASH).
   4.818 +      if test "xCHMOD" != xBASH; then
   4.819 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CHMOD from the environment. Use command line variables instead." >&5
   4.820 +$as_echo "$as_me: WARNING: Ignoring value of CHMOD from the environment. Use command line variables instead." >&2;}
   4.821 +      fi
   4.822 +      # Try to locate tool using the code snippet
   4.823 +      for ac_prog in chmod
   4.824 +do
   4.825 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
   4.826 +set dummy $ac_prog; ac_word=$2
   4.827 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.828 +$as_echo_n "checking for $ac_word... " >&6; }
   4.829 +if ${ac_cv_path_CHMOD+:} false; then :
   4.830 +  $as_echo_n "(cached) " >&6
   4.831 +else
   4.832 +  case $CHMOD in
   4.833 +  [\\/]* | ?:[\\/]*)
   4.834 +  ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path.
   4.835 +  ;;
   4.836 +  *)
   4.837 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   4.838 +for as_dir in $PATH
   4.839 +do
   4.840 +  IFS=$as_save_IFS
   4.841 +  test -z "$as_dir" && as_dir=.
   4.842 +    for ac_exec_ext in '' $ac_executable_extensions; do
   4.843 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.844 +    ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
   4.845 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.846 +    break 2
   4.847 +  fi
   4.848 +done
   4.849 +  done
   4.850 +IFS=$as_save_IFS
   4.851 +
   4.852 +  ;;
   4.853 +esac
   4.854 +fi
   4.855 +CHMOD=$ac_cv_path_CHMOD
   4.856 +if test -n "$CHMOD"; then
   4.857 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHMOD" >&5
   4.858 +$as_echo "$CHMOD" >&6; }
   4.859 +else
   4.860 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   4.861 +$as_echo "no" >&6; }
   4.862 +fi
   4.863 +
   4.864 +
   4.865 +  test -n "$CHMOD" && break
   4.866 +done
   4.867 +
   4.868 +    else
   4.869 +      # If it succeeded, then it was overridden by the user. We will use it
   4.870 +      # for the tool.
   4.871 +
   4.872 +      # First remove it from the list of overridden variables, so we can test
   4.873 +      # for unknown variables in the end.
   4.874 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
   4.875 +
   4.876 +      # Check if the provided tool contains a complete path.
   4.877 +      tool_specified="$CHMOD"
   4.878 +      tool_basename="${tool_specified##*/}"
   4.879 +      if test "x$tool_basename" = "x$tool_specified"; then
   4.880 +        # A command without a complete path is provided, search $PATH.
   4.881 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CHMOD=$tool_basename" >&5
   4.882 +$as_echo "$as_me: Will search for user supplied tool CHMOD=$tool_basename" >&6;}
   4.883 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
   4.884 +set dummy $tool_basename; ac_word=$2
   4.885 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.886 +$as_echo_n "checking for $ac_word... " >&6; }
   4.887 +if ${ac_cv_path_CHMOD+:} false; then :
   4.888 +  $as_echo_n "(cached) " >&6
   4.889 +else
   4.890 +  case $CHMOD in
   4.891 +  [\\/]* | ?:[\\/]*)
   4.892 +  ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path.
   4.893 +  ;;
   4.894 +  *)
   4.895 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   4.896 +for as_dir in $PATH
   4.897 +do
   4.898 +  IFS=$as_save_IFS
   4.899 +  test -z "$as_dir" && as_dir=.
   4.900 +    for ac_exec_ext in '' $ac_executable_extensions; do
   4.901 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
   4.902 +    ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
   4.903 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   4.904 +    break 2
   4.905 +  fi
   4.906 +done
   4.907 +  done
   4.908 +IFS=$as_save_IFS
   4.909 +
   4.910 +  ;;
   4.911 +esac
   4.912 +fi
   4.913 +CHMOD=$ac_cv_path_CHMOD
   4.914 +if test -n "$CHMOD"; then
   4.915 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHMOD" >&5
   4.916 +$as_echo "$CHMOD" >&6; }
   4.917 +else
   4.918 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   4.919 +$as_echo "no" >&6; }
   4.920 +fi
   4.921 +
   4.922 +
   4.923 +        if test "x$CHMOD" = x; then
   4.924 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
   4.925 +        fi
   4.926 +      else
   4.927 +        # Otherwise we believe it is a complete path. Use it as it is.
   4.928 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CHMOD=$tool_specified" >&5
   4.929 +$as_echo "$as_me: Will use user supplied tool CHMOD=$tool_specified" >&6;}
   4.930 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CHMOD" >&5
   4.931 +$as_echo_n "checking for CHMOD... " >&6; }
   4.932 +        if test ! -x "$tool_specified"; then
   4.933 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
   4.934 +$as_echo "not found" >&6; }
   4.935 +          as_fn_error $? "User supplied tool CHMOD=$tool_specified does not exist or is not executable" "$LINENO" 5
   4.936 +        fi
   4.937 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
   4.938 +$as_echo "$tool_specified" >&6; }
   4.939 +      fi
   4.940 +    fi
   4.941 +  fi
   4.942 +
   4.943 +
   4.944  
   4.945    if test "x$CHMOD" = x; then
   4.946 -    if test "xchmod" = x; then
   4.947 -      PROG_NAME=chmod
   4.948 -    else
   4.949 -      PROG_NAME=chmod
   4.950 -    fi
   4.951 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
   4.952 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
   4.953 -    as_fn_error $? "Cannot continue" "$LINENO" 5
   4.954 -  fi
   4.955 -
   4.956 -
   4.957 -
   4.958 -  for ac_prog in cmp
   4.959 +    as_fn_error $? "Could not find required tool for CHMOD" "$LINENO" 5
   4.960 +  fi
   4.961 +
   4.962 +
   4.963 +
   4.964 +
   4.965 +
   4.966 +  # Publish this variable in the help.
   4.967 +
   4.968 +
   4.969 +  if test "x$CMP" = x; then
   4.970 +    # The variable is not set by user, try to locate tool using the code snippet
   4.971 +    for ac_prog in cmp
   4.972  do
   4.973    # Extract the first word of "$ac_prog", so it can be a program name with args.
   4.974  set dummy $ac_prog; ac_word=$2
   4.975 @@ -4225,21 +4931,155 @@
   4.976    test -n "$CMP" && break
   4.977  done
   4.978  
   4.979 +  else
   4.980 +    # The variable is set, but is it from the command line or the environment?
   4.981 +
   4.982 +    # Try to remove the string !CMP! from our list.
   4.983 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CMP!/}
   4.984 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
   4.985 +      # If it failed, the variable was not from the command line. Ignore it,
   4.986 +      # but warn the user (except for BASH, which is always set by the calling BASH).
   4.987 +      if test "xCMP" != xBASH; then
   4.988 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CMP from the environment. Use command line variables instead." >&5
   4.989 +$as_echo "$as_me: WARNING: Ignoring value of CMP from the environment. Use command line variables instead." >&2;}
   4.990 +      fi
   4.991 +      # Try to locate tool using the code snippet
   4.992 +      for ac_prog in cmp
   4.993 +do
   4.994 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
   4.995 +set dummy $ac_prog; ac_word=$2
   4.996 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   4.997 +$as_echo_n "checking for $ac_word... " >&6; }
   4.998 +if ${ac_cv_path_CMP+:} false; then :
   4.999 +  $as_echo_n "(cached) " >&6
  4.1000 +else
  4.1001 +  case $CMP in
  4.1002 +  [\\/]* | ?:[\\/]*)
  4.1003 +  ac_cv_path_CMP="$CMP" # Let the user override the test with a path.
  4.1004 +  ;;
  4.1005 +  *)
  4.1006 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1007 +for as_dir in $PATH
  4.1008 +do
  4.1009 +  IFS=$as_save_IFS
  4.1010 +  test -z "$as_dir" && as_dir=.
  4.1011 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1012 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1013 +    ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
  4.1014 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1015 +    break 2
  4.1016 +  fi
  4.1017 +done
  4.1018 +  done
  4.1019 +IFS=$as_save_IFS
  4.1020 +
  4.1021 +  ;;
  4.1022 +esac
  4.1023 +fi
  4.1024 +CMP=$ac_cv_path_CMP
  4.1025 +if test -n "$CMP"; then
  4.1026 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CMP" >&5
  4.1027 +$as_echo "$CMP" >&6; }
  4.1028 +else
  4.1029 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1030 +$as_echo "no" >&6; }
  4.1031 +fi
  4.1032 +
  4.1033 +
  4.1034 +  test -n "$CMP" && break
  4.1035 +done
  4.1036 +
  4.1037 +    else
  4.1038 +      # If it succeeded, then it was overridden by the user. We will use it
  4.1039 +      # for the tool.
  4.1040 +
  4.1041 +      # First remove it from the list of overridden variables, so we can test
  4.1042 +      # for unknown variables in the end.
  4.1043 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.1044 +
  4.1045 +      # Check if the provided tool contains a complete path.
  4.1046 +      tool_specified="$CMP"
  4.1047 +      tool_basename="${tool_specified##*/}"
  4.1048 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.1049 +        # A command without a complete path is provided, search $PATH.
  4.1050 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CMP=$tool_basename" >&5
  4.1051 +$as_echo "$as_me: Will search for user supplied tool CMP=$tool_basename" >&6;}
  4.1052 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.1053 +set dummy $tool_basename; ac_word=$2
  4.1054 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1055 +$as_echo_n "checking for $ac_word... " >&6; }
  4.1056 +if ${ac_cv_path_CMP+:} false; then :
  4.1057 +  $as_echo_n "(cached) " >&6
  4.1058 +else
  4.1059 +  case $CMP in
  4.1060 +  [\\/]* | ?:[\\/]*)
  4.1061 +  ac_cv_path_CMP="$CMP" # Let the user override the test with a path.
  4.1062 +  ;;
  4.1063 +  *)
  4.1064 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1065 +for as_dir in $PATH
  4.1066 +do
  4.1067 +  IFS=$as_save_IFS
  4.1068 +  test -z "$as_dir" && as_dir=.
  4.1069 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1070 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1071 +    ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
  4.1072 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1073 +    break 2
  4.1074 +  fi
  4.1075 +done
  4.1076 +  done
  4.1077 +IFS=$as_save_IFS
  4.1078 +
  4.1079 +  ;;
  4.1080 +esac
  4.1081 +fi
  4.1082 +CMP=$ac_cv_path_CMP
  4.1083 +if test -n "$CMP"; then
  4.1084 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CMP" >&5
  4.1085 +$as_echo "$CMP" >&6; }
  4.1086 +else
  4.1087 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1088 +$as_echo "no" >&6; }
  4.1089 +fi
  4.1090 +
  4.1091 +
  4.1092 +        if test "x$CMP" = x; then
  4.1093 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.1094 +        fi
  4.1095 +      else
  4.1096 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.1097 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CMP=$tool_specified" >&5
  4.1098 +$as_echo "$as_me: Will use user supplied tool CMP=$tool_specified" >&6;}
  4.1099 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CMP" >&5
  4.1100 +$as_echo_n "checking for CMP... " >&6; }
  4.1101 +        if test ! -x "$tool_specified"; then
  4.1102 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.1103 +$as_echo "not found" >&6; }
  4.1104 +          as_fn_error $? "User supplied tool CMP=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.1105 +        fi
  4.1106 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.1107 +$as_echo "$tool_specified" >&6; }
  4.1108 +      fi
  4.1109 +    fi
  4.1110 +  fi
  4.1111 +
  4.1112 +
  4.1113  
  4.1114    if test "x$CMP" = x; then
  4.1115 -    if test "xcmp" = x; then
  4.1116 -      PROG_NAME=cmp
  4.1117 -    else
  4.1118 -      PROG_NAME=cmp
  4.1119 -    fi
  4.1120 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.1121 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.1122 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.1123 -  fi
  4.1124 -
  4.1125 -
  4.1126 -
  4.1127 -  for ac_prog in comm
  4.1128 +    as_fn_error $? "Could not find required tool for CMP" "$LINENO" 5
  4.1129 +  fi
  4.1130 +
  4.1131 +
  4.1132 +
  4.1133 +
  4.1134 +
  4.1135 +  # Publish this variable in the help.
  4.1136 +
  4.1137 +
  4.1138 +  if test "x$COMM" = x; then
  4.1139 +    # The variable is not set by user, try to locate tool using the code snippet
  4.1140 +    for ac_prog in comm
  4.1141  do
  4.1142    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.1143  set dummy $ac_prog; ac_word=$2
  4.1144 @@ -4284,21 +5124,155 @@
  4.1145    test -n "$COMM" && break
  4.1146  done
  4.1147  
  4.1148 +  else
  4.1149 +    # The variable is set, but is it from the command line or the environment?
  4.1150 +
  4.1151 +    # Try to remove the string !COMM! from our list.
  4.1152 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!COMM!/}
  4.1153 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.1154 +      # If it failed, the variable was not from the command line. Ignore it,
  4.1155 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.1156 +      if test "xCOMM" != xBASH; then
  4.1157 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of COMM from the environment. Use command line variables instead." >&5
  4.1158 +$as_echo "$as_me: WARNING: Ignoring value of COMM from the environment. Use command line variables instead." >&2;}
  4.1159 +      fi
  4.1160 +      # Try to locate tool using the code snippet
  4.1161 +      for ac_prog in comm
  4.1162 +do
  4.1163 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.1164 +set dummy $ac_prog; ac_word=$2
  4.1165 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1166 +$as_echo_n "checking for $ac_word... " >&6; }
  4.1167 +if ${ac_cv_path_COMM+:} false; then :
  4.1168 +  $as_echo_n "(cached) " >&6
  4.1169 +else
  4.1170 +  case $COMM in
  4.1171 +  [\\/]* | ?:[\\/]*)
  4.1172 +  ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
  4.1173 +  ;;
  4.1174 +  *)
  4.1175 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1176 +for as_dir in $PATH
  4.1177 +do
  4.1178 +  IFS=$as_save_IFS
  4.1179 +  test -z "$as_dir" && as_dir=.
  4.1180 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1181 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1182 +    ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
  4.1183 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1184 +    break 2
  4.1185 +  fi
  4.1186 +done
  4.1187 +  done
  4.1188 +IFS=$as_save_IFS
  4.1189 +
  4.1190 +  ;;
  4.1191 +esac
  4.1192 +fi
  4.1193 +COMM=$ac_cv_path_COMM
  4.1194 +if test -n "$COMM"; then
  4.1195 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
  4.1196 +$as_echo "$COMM" >&6; }
  4.1197 +else
  4.1198 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1199 +$as_echo "no" >&6; }
  4.1200 +fi
  4.1201 +
  4.1202 +
  4.1203 +  test -n "$COMM" && break
  4.1204 +done
  4.1205 +
  4.1206 +    else
  4.1207 +      # If it succeeded, then it was overridden by the user. We will use it
  4.1208 +      # for the tool.
  4.1209 +
  4.1210 +      # First remove it from the list of overridden variables, so we can test
  4.1211 +      # for unknown variables in the end.
  4.1212 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.1213 +
  4.1214 +      # Check if the provided tool contains a complete path.
  4.1215 +      tool_specified="$COMM"
  4.1216 +      tool_basename="${tool_specified##*/}"
  4.1217 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.1218 +        # A command without a complete path is provided, search $PATH.
  4.1219 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool COMM=$tool_basename" >&5
  4.1220 +$as_echo "$as_me: Will search for user supplied tool COMM=$tool_basename" >&6;}
  4.1221 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.1222 +set dummy $tool_basename; ac_word=$2
  4.1223 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1224 +$as_echo_n "checking for $ac_word... " >&6; }
  4.1225 +if ${ac_cv_path_COMM+:} false; then :
  4.1226 +  $as_echo_n "(cached) " >&6
  4.1227 +else
  4.1228 +  case $COMM in
  4.1229 +  [\\/]* | ?:[\\/]*)
  4.1230 +  ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
  4.1231 +  ;;
  4.1232 +  *)
  4.1233 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1234 +for as_dir in $PATH
  4.1235 +do
  4.1236 +  IFS=$as_save_IFS
  4.1237 +  test -z "$as_dir" && as_dir=.
  4.1238 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1239 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1240 +    ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
  4.1241 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1242 +    break 2
  4.1243 +  fi
  4.1244 +done
  4.1245 +  done
  4.1246 +IFS=$as_save_IFS
  4.1247 +
  4.1248 +  ;;
  4.1249 +esac
  4.1250 +fi
  4.1251 +COMM=$ac_cv_path_COMM
  4.1252 +if test -n "$COMM"; then
  4.1253 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
  4.1254 +$as_echo "$COMM" >&6; }
  4.1255 +else
  4.1256 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1257 +$as_echo "no" >&6; }
  4.1258 +fi
  4.1259 +
  4.1260 +
  4.1261 +        if test "x$COMM" = x; then
  4.1262 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.1263 +        fi
  4.1264 +      else
  4.1265 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.1266 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool COMM=$tool_specified" >&5
  4.1267 +$as_echo "$as_me: Will use user supplied tool COMM=$tool_specified" >&6;}
  4.1268 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMM" >&5
  4.1269 +$as_echo_n "checking for COMM... " >&6; }
  4.1270 +        if test ! -x "$tool_specified"; then
  4.1271 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.1272 +$as_echo "not found" >&6; }
  4.1273 +          as_fn_error $? "User supplied tool COMM=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.1274 +        fi
  4.1275 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.1276 +$as_echo "$tool_specified" >&6; }
  4.1277 +      fi
  4.1278 +    fi
  4.1279 +  fi
  4.1280 +
  4.1281 +
  4.1282  
  4.1283    if test "x$COMM" = x; then
  4.1284 -    if test "xcomm" = x; then
  4.1285 -      PROG_NAME=comm
  4.1286 -    else
  4.1287 -      PROG_NAME=comm
  4.1288 -    fi
  4.1289 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.1290 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.1291 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.1292 -  fi
  4.1293 -
  4.1294 -
  4.1295 -
  4.1296 -  for ac_prog in cp
  4.1297 +    as_fn_error $? "Could not find required tool for COMM" "$LINENO" 5
  4.1298 +  fi
  4.1299 +
  4.1300 +
  4.1301 +
  4.1302 +
  4.1303 +
  4.1304 +  # Publish this variable in the help.
  4.1305 +
  4.1306 +
  4.1307 +  if test "x$CP" = x; then
  4.1308 +    # The variable is not set by user, try to locate tool using the code snippet
  4.1309 +    for ac_prog in cp
  4.1310  do
  4.1311    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.1312  set dummy $ac_prog; ac_word=$2
  4.1313 @@ -4343,21 +5317,155 @@
  4.1314    test -n "$CP" && break
  4.1315  done
  4.1316  
  4.1317 +  else
  4.1318 +    # The variable is set, but is it from the command line or the environment?
  4.1319 +
  4.1320 +    # Try to remove the string !CP! from our list.
  4.1321 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CP!/}
  4.1322 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.1323 +      # If it failed, the variable was not from the command line. Ignore it,
  4.1324 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.1325 +      if test "xCP" != xBASH; then
  4.1326 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CP from the environment. Use command line variables instead." >&5
  4.1327 +$as_echo "$as_me: WARNING: Ignoring value of CP from the environment. Use command line variables instead." >&2;}
  4.1328 +      fi
  4.1329 +      # Try to locate tool using the code snippet
  4.1330 +      for ac_prog in cp
  4.1331 +do
  4.1332 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.1333 +set dummy $ac_prog; ac_word=$2
  4.1334 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1335 +$as_echo_n "checking for $ac_word... " >&6; }
  4.1336 +if ${ac_cv_path_CP+:} false; then :
  4.1337 +  $as_echo_n "(cached) " >&6
  4.1338 +else
  4.1339 +  case $CP in
  4.1340 +  [\\/]* | ?:[\\/]*)
  4.1341 +  ac_cv_path_CP="$CP" # Let the user override the test with a path.
  4.1342 +  ;;
  4.1343 +  *)
  4.1344 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1345 +for as_dir in $PATH
  4.1346 +do
  4.1347 +  IFS=$as_save_IFS
  4.1348 +  test -z "$as_dir" && as_dir=.
  4.1349 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1350 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1351 +    ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
  4.1352 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1353 +    break 2
  4.1354 +  fi
  4.1355 +done
  4.1356 +  done
  4.1357 +IFS=$as_save_IFS
  4.1358 +
  4.1359 +  ;;
  4.1360 +esac
  4.1361 +fi
  4.1362 +CP=$ac_cv_path_CP
  4.1363 +if test -n "$CP"; then
  4.1364 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
  4.1365 +$as_echo "$CP" >&6; }
  4.1366 +else
  4.1367 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1368 +$as_echo "no" >&6; }
  4.1369 +fi
  4.1370 +
  4.1371 +
  4.1372 +  test -n "$CP" && break
  4.1373 +done
  4.1374 +
  4.1375 +    else
  4.1376 +      # If it succeeded, then it was overridden by the user. We will use it
  4.1377 +      # for the tool.
  4.1378 +
  4.1379 +      # First remove it from the list of overridden variables, so we can test
  4.1380 +      # for unknown variables in the end.
  4.1381 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.1382 +
  4.1383 +      # Check if the provided tool contains a complete path.
  4.1384 +      tool_specified="$CP"
  4.1385 +      tool_basename="${tool_specified##*/}"
  4.1386 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.1387 +        # A command without a complete path is provided, search $PATH.
  4.1388 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CP=$tool_basename" >&5
  4.1389 +$as_echo "$as_me: Will search for user supplied tool CP=$tool_basename" >&6;}
  4.1390 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.1391 +set dummy $tool_basename; ac_word=$2
  4.1392 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1393 +$as_echo_n "checking for $ac_word... " >&6; }
  4.1394 +if ${ac_cv_path_CP+:} false; then :
  4.1395 +  $as_echo_n "(cached) " >&6
  4.1396 +else
  4.1397 +  case $CP in
  4.1398 +  [\\/]* | ?:[\\/]*)
  4.1399 +  ac_cv_path_CP="$CP" # Let the user override the test with a path.
  4.1400 +  ;;
  4.1401 +  *)
  4.1402 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1403 +for as_dir in $PATH
  4.1404 +do
  4.1405 +  IFS=$as_save_IFS
  4.1406 +  test -z "$as_dir" && as_dir=.
  4.1407 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1408 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1409 +    ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
  4.1410 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1411 +    break 2
  4.1412 +  fi
  4.1413 +done
  4.1414 +  done
  4.1415 +IFS=$as_save_IFS
  4.1416 +
  4.1417 +  ;;
  4.1418 +esac
  4.1419 +fi
  4.1420 +CP=$ac_cv_path_CP
  4.1421 +if test -n "$CP"; then
  4.1422 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
  4.1423 +$as_echo "$CP" >&6; }
  4.1424 +else
  4.1425 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1426 +$as_echo "no" >&6; }
  4.1427 +fi
  4.1428 +
  4.1429 +
  4.1430 +        if test "x$CP" = x; then
  4.1431 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.1432 +        fi
  4.1433 +      else
  4.1434 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.1435 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CP=$tool_specified" >&5
  4.1436 +$as_echo "$as_me: Will use user supplied tool CP=$tool_specified" >&6;}
  4.1437 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CP" >&5
  4.1438 +$as_echo_n "checking for CP... " >&6; }
  4.1439 +        if test ! -x "$tool_specified"; then
  4.1440 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.1441 +$as_echo "not found" >&6; }
  4.1442 +          as_fn_error $? "User supplied tool CP=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.1443 +        fi
  4.1444 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.1445 +$as_echo "$tool_specified" >&6; }
  4.1446 +      fi
  4.1447 +    fi
  4.1448 +  fi
  4.1449 +
  4.1450 +
  4.1451  
  4.1452    if test "x$CP" = x; then
  4.1453 -    if test "xcp" = x; then
  4.1454 -      PROG_NAME=cp
  4.1455 -    else
  4.1456 -      PROG_NAME=cp
  4.1457 -    fi
  4.1458 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.1459 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.1460 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.1461 -  fi
  4.1462 -
  4.1463 -
  4.1464 -
  4.1465 -  for ac_prog in cpio
  4.1466 +    as_fn_error $? "Could not find required tool for CP" "$LINENO" 5
  4.1467 +  fi
  4.1468 +
  4.1469 +
  4.1470 +
  4.1471 +
  4.1472 +
  4.1473 +  # Publish this variable in the help.
  4.1474 +
  4.1475 +
  4.1476 +  if test "x$CPIO" = x; then
  4.1477 +    # The variable is not set by user, try to locate tool using the code snippet
  4.1478 +    for ac_prog in cpio
  4.1479  do
  4.1480    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.1481  set dummy $ac_prog; ac_word=$2
  4.1482 @@ -4402,21 +5510,155 @@
  4.1483    test -n "$CPIO" && break
  4.1484  done
  4.1485  
  4.1486 +  else
  4.1487 +    # The variable is set, but is it from the command line or the environment?
  4.1488 +
  4.1489 +    # Try to remove the string !CPIO! from our list.
  4.1490 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CPIO!/}
  4.1491 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.1492 +      # If it failed, the variable was not from the command line. Ignore it,
  4.1493 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.1494 +      if test "xCPIO" != xBASH; then
  4.1495 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&5
  4.1496 +$as_echo "$as_me: WARNING: Ignoring value of CPIO from the environment. Use command line variables instead." >&2;}
  4.1497 +      fi
  4.1498 +      # Try to locate tool using the code snippet
  4.1499 +      for ac_prog in cpio
  4.1500 +do
  4.1501 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.1502 +set dummy $ac_prog; ac_word=$2
  4.1503 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1504 +$as_echo_n "checking for $ac_word... " >&6; }
  4.1505 +if ${ac_cv_path_CPIO+:} false; then :
  4.1506 +  $as_echo_n "(cached) " >&6
  4.1507 +else
  4.1508 +  case $CPIO in
  4.1509 +  [\\/]* | ?:[\\/]*)
  4.1510 +  ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
  4.1511 +  ;;
  4.1512 +  *)
  4.1513 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1514 +for as_dir in $PATH
  4.1515 +do
  4.1516 +  IFS=$as_save_IFS
  4.1517 +  test -z "$as_dir" && as_dir=.
  4.1518 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1519 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1520 +    ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
  4.1521 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1522 +    break 2
  4.1523 +  fi
  4.1524 +done
  4.1525 +  done
  4.1526 +IFS=$as_save_IFS
  4.1527 +
  4.1528 +  ;;
  4.1529 +esac
  4.1530 +fi
  4.1531 +CPIO=$ac_cv_path_CPIO
  4.1532 +if test -n "$CPIO"; then
  4.1533 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
  4.1534 +$as_echo "$CPIO" >&6; }
  4.1535 +else
  4.1536 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1537 +$as_echo "no" >&6; }
  4.1538 +fi
  4.1539 +
  4.1540 +
  4.1541 +  test -n "$CPIO" && break
  4.1542 +done
  4.1543 +
  4.1544 +    else
  4.1545 +      # If it succeeded, then it was overridden by the user. We will use it
  4.1546 +      # for the tool.
  4.1547 +
  4.1548 +      # First remove it from the list of overridden variables, so we can test
  4.1549 +      # for unknown variables in the end.
  4.1550 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.1551 +
  4.1552 +      # Check if the provided tool contains a complete path.
  4.1553 +      tool_specified="$CPIO"
  4.1554 +      tool_basename="${tool_specified##*/}"
  4.1555 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.1556 +        # A command without a complete path is provided, search $PATH.
  4.1557 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CPIO=$tool_basename" >&5
  4.1558 +$as_echo "$as_me: Will search for user supplied tool CPIO=$tool_basename" >&6;}
  4.1559 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.1560 +set dummy $tool_basename; ac_word=$2
  4.1561 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1562 +$as_echo_n "checking for $ac_word... " >&6; }
  4.1563 +if ${ac_cv_path_CPIO+:} false; then :
  4.1564 +  $as_echo_n "(cached) " >&6
  4.1565 +else
  4.1566 +  case $CPIO in
  4.1567 +  [\\/]* | ?:[\\/]*)
  4.1568 +  ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
  4.1569 +  ;;
  4.1570 +  *)
  4.1571 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1572 +for as_dir in $PATH
  4.1573 +do
  4.1574 +  IFS=$as_save_IFS
  4.1575 +  test -z "$as_dir" && as_dir=.
  4.1576 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1577 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1578 +    ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
  4.1579 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1580 +    break 2
  4.1581 +  fi
  4.1582 +done
  4.1583 +  done
  4.1584 +IFS=$as_save_IFS
  4.1585 +
  4.1586 +  ;;
  4.1587 +esac
  4.1588 +fi
  4.1589 +CPIO=$ac_cv_path_CPIO
  4.1590 +if test -n "$CPIO"; then
  4.1591 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
  4.1592 +$as_echo "$CPIO" >&6; }
  4.1593 +else
  4.1594 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1595 +$as_echo "no" >&6; }
  4.1596 +fi
  4.1597 +
  4.1598 +
  4.1599 +        if test "x$CPIO" = x; then
  4.1600 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.1601 +        fi
  4.1602 +      else
  4.1603 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.1604 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CPIO=$tool_specified" >&5
  4.1605 +$as_echo "$as_me: Will use user supplied tool CPIO=$tool_specified" >&6;}
  4.1606 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CPIO" >&5
  4.1607 +$as_echo_n "checking for CPIO... " >&6; }
  4.1608 +        if test ! -x "$tool_specified"; then
  4.1609 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.1610 +$as_echo "not found" >&6; }
  4.1611 +          as_fn_error $? "User supplied tool CPIO=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.1612 +        fi
  4.1613 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.1614 +$as_echo "$tool_specified" >&6; }
  4.1615 +      fi
  4.1616 +    fi
  4.1617 +  fi
  4.1618 +
  4.1619 +
  4.1620  
  4.1621    if test "x$CPIO" = x; then
  4.1622 -    if test "xcpio" = x; then
  4.1623 -      PROG_NAME=cpio
  4.1624 -    else
  4.1625 -      PROG_NAME=cpio
  4.1626 -    fi
  4.1627 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.1628 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.1629 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.1630 -  fi
  4.1631 -
  4.1632 -
  4.1633 -
  4.1634 -  for ac_prog in cut
  4.1635 +    as_fn_error $? "Could not find required tool for CPIO" "$LINENO" 5
  4.1636 +  fi
  4.1637 +
  4.1638 +
  4.1639 +
  4.1640 +
  4.1641 +
  4.1642 +  # Publish this variable in the help.
  4.1643 +
  4.1644 +
  4.1645 +  if test "x$CUT" = x; then
  4.1646 +    # The variable is not set by user, try to locate tool using the code snippet
  4.1647 +    for ac_prog in cut
  4.1648  do
  4.1649    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.1650  set dummy $ac_prog; ac_word=$2
  4.1651 @@ -4461,21 +5703,155 @@
  4.1652    test -n "$CUT" && break
  4.1653  done
  4.1654  
  4.1655 +  else
  4.1656 +    # The variable is set, but is it from the command line or the environment?
  4.1657 +
  4.1658 +    # Try to remove the string !CUT! from our list.
  4.1659 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CUT!/}
  4.1660 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.1661 +      # If it failed, the variable was not from the command line. Ignore it,
  4.1662 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.1663 +      if test "xCUT" != xBASH; then
  4.1664 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CUT from the environment. Use command line variables instead." >&5
  4.1665 +$as_echo "$as_me: WARNING: Ignoring value of CUT from the environment. Use command line variables instead." >&2;}
  4.1666 +      fi
  4.1667 +      # Try to locate tool using the code snippet
  4.1668 +      for ac_prog in cut
  4.1669 +do
  4.1670 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.1671 +set dummy $ac_prog; ac_word=$2
  4.1672 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1673 +$as_echo_n "checking for $ac_word... " >&6; }
  4.1674 +if ${ac_cv_path_CUT+:} false; then :
  4.1675 +  $as_echo_n "(cached) " >&6
  4.1676 +else
  4.1677 +  case $CUT in
  4.1678 +  [\\/]* | ?:[\\/]*)
  4.1679 +  ac_cv_path_CUT="$CUT" # Let the user override the test with a path.
  4.1680 +  ;;
  4.1681 +  *)
  4.1682 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1683 +for as_dir in $PATH
  4.1684 +do
  4.1685 +  IFS=$as_save_IFS
  4.1686 +  test -z "$as_dir" && as_dir=.
  4.1687 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1688 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1689 +    ac_cv_path_CUT="$as_dir/$ac_word$ac_exec_ext"
  4.1690 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1691 +    break 2
  4.1692 +  fi
  4.1693 +done
  4.1694 +  done
  4.1695 +IFS=$as_save_IFS
  4.1696 +
  4.1697 +  ;;
  4.1698 +esac
  4.1699 +fi
  4.1700 +CUT=$ac_cv_path_CUT
  4.1701 +if test -n "$CUT"; then
  4.1702 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUT" >&5
  4.1703 +$as_echo "$CUT" >&6; }
  4.1704 +else
  4.1705 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1706 +$as_echo "no" >&6; }
  4.1707 +fi
  4.1708 +
  4.1709 +
  4.1710 +  test -n "$CUT" && break
  4.1711 +done
  4.1712 +
  4.1713 +    else
  4.1714 +      # If it succeeded, then it was overridden by the user. We will use it
  4.1715 +      # for the tool.
  4.1716 +
  4.1717 +      # First remove it from the list of overridden variables, so we can test
  4.1718 +      # for unknown variables in the end.
  4.1719 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.1720 +
  4.1721 +      # Check if the provided tool contains a complete path.
  4.1722 +      tool_specified="$CUT"
  4.1723 +      tool_basename="${tool_specified##*/}"
  4.1724 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.1725 +        # A command without a complete path is provided, search $PATH.
  4.1726 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CUT=$tool_basename" >&5
  4.1727 +$as_echo "$as_me: Will search for user supplied tool CUT=$tool_basename" >&6;}
  4.1728 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.1729 +set dummy $tool_basename; ac_word=$2
  4.1730 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1731 +$as_echo_n "checking for $ac_word... " >&6; }
  4.1732 +if ${ac_cv_path_CUT+:} false; then :
  4.1733 +  $as_echo_n "(cached) " >&6
  4.1734 +else
  4.1735 +  case $CUT in
  4.1736 +  [\\/]* | ?:[\\/]*)
  4.1737 +  ac_cv_path_CUT="$CUT" # Let the user override the test with a path.
  4.1738 +  ;;
  4.1739 +  *)
  4.1740 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1741 +for as_dir in $PATH
  4.1742 +do
  4.1743 +  IFS=$as_save_IFS
  4.1744 +  test -z "$as_dir" && as_dir=.
  4.1745 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1746 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1747 +    ac_cv_path_CUT="$as_dir/$ac_word$ac_exec_ext"
  4.1748 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1749 +    break 2
  4.1750 +  fi
  4.1751 +done
  4.1752 +  done
  4.1753 +IFS=$as_save_IFS
  4.1754 +
  4.1755 +  ;;
  4.1756 +esac
  4.1757 +fi
  4.1758 +CUT=$ac_cv_path_CUT
  4.1759 +if test -n "$CUT"; then
  4.1760 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CUT" >&5
  4.1761 +$as_echo "$CUT" >&6; }
  4.1762 +else
  4.1763 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1764 +$as_echo "no" >&6; }
  4.1765 +fi
  4.1766 +
  4.1767 +
  4.1768 +        if test "x$CUT" = x; then
  4.1769 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.1770 +        fi
  4.1771 +      else
  4.1772 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.1773 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CUT=$tool_specified" >&5
  4.1774 +$as_echo "$as_me: Will use user supplied tool CUT=$tool_specified" >&6;}
  4.1775 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUT" >&5
  4.1776 +$as_echo_n "checking for CUT... " >&6; }
  4.1777 +        if test ! -x "$tool_specified"; then
  4.1778 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.1779 +$as_echo "not found" >&6; }
  4.1780 +          as_fn_error $? "User supplied tool CUT=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.1781 +        fi
  4.1782 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.1783 +$as_echo "$tool_specified" >&6; }
  4.1784 +      fi
  4.1785 +    fi
  4.1786 +  fi
  4.1787 +
  4.1788 +
  4.1789  
  4.1790    if test "x$CUT" = x; then
  4.1791 -    if test "xcut" = x; then
  4.1792 -      PROG_NAME=cut
  4.1793 -    else
  4.1794 -      PROG_NAME=cut
  4.1795 -    fi
  4.1796 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.1797 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.1798 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.1799 -  fi
  4.1800 -
  4.1801 -
  4.1802 -
  4.1803 -  for ac_prog in date
  4.1804 +    as_fn_error $? "Could not find required tool for CUT" "$LINENO" 5
  4.1805 +  fi
  4.1806 +
  4.1807 +
  4.1808 +
  4.1809 +
  4.1810 +
  4.1811 +  # Publish this variable in the help.
  4.1812 +
  4.1813 +
  4.1814 +  if test "x$DATE" = x; then
  4.1815 +    # The variable is not set by user, try to locate tool using the code snippet
  4.1816 +    for ac_prog in date
  4.1817  do
  4.1818    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.1819  set dummy $ac_prog; ac_word=$2
  4.1820 @@ -4520,21 +5896,155 @@
  4.1821    test -n "$DATE" && break
  4.1822  done
  4.1823  
  4.1824 +  else
  4.1825 +    # The variable is set, but is it from the command line or the environment?
  4.1826 +
  4.1827 +    # Try to remove the string !DATE! from our list.
  4.1828 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!DATE!/}
  4.1829 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.1830 +      # If it failed, the variable was not from the command line. Ignore it,
  4.1831 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.1832 +      if test "xDATE" != xBASH; then
  4.1833 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of DATE from the environment. Use command line variables instead." >&5
  4.1834 +$as_echo "$as_me: WARNING: Ignoring value of DATE from the environment. Use command line variables instead." >&2;}
  4.1835 +      fi
  4.1836 +      # Try to locate tool using the code snippet
  4.1837 +      for ac_prog in date
  4.1838 +do
  4.1839 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.1840 +set dummy $ac_prog; ac_word=$2
  4.1841 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1842 +$as_echo_n "checking for $ac_word... " >&6; }
  4.1843 +if ${ac_cv_path_DATE+:} false; then :
  4.1844 +  $as_echo_n "(cached) " >&6
  4.1845 +else
  4.1846 +  case $DATE in
  4.1847 +  [\\/]* | ?:[\\/]*)
  4.1848 +  ac_cv_path_DATE="$DATE" # Let the user override the test with a path.
  4.1849 +  ;;
  4.1850 +  *)
  4.1851 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1852 +for as_dir in $PATH
  4.1853 +do
  4.1854 +  IFS=$as_save_IFS
  4.1855 +  test -z "$as_dir" && as_dir=.
  4.1856 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1857 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1858 +    ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext"
  4.1859 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1860 +    break 2
  4.1861 +  fi
  4.1862 +done
  4.1863 +  done
  4.1864 +IFS=$as_save_IFS
  4.1865 +
  4.1866 +  ;;
  4.1867 +esac
  4.1868 +fi
  4.1869 +DATE=$ac_cv_path_DATE
  4.1870 +if test -n "$DATE"; then
  4.1871 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DATE" >&5
  4.1872 +$as_echo "$DATE" >&6; }
  4.1873 +else
  4.1874 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1875 +$as_echo "no" >&6; }
  4.1876 +fi
  4.1877 +
  4.1878 +
  4.1879 +  test -n "$DATE" && break
  4.1880 +done
  4.1881 +
  4.1882 +    else
  4.1883 +      # If it succeeded, then it was overridden by the user. We will use it
  4.1884 +      # for the tool.
  4.1885 +
  4.1886 +      # First remove it from the list of overridden variables, so we can test
  4.1887 +      # for unknown variables in the end.
  4.1888 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.1889 +
  4.1890 +      # Check if the provided tool contains a complete path.
  4.1891 +      tool_specified="$DATE"
  4.1892 +      tool_basename="${tool_specified##*/}"
  4.1893 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.1894 +        # A command without a complete path is provided, search $PATH.
  4.1895 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool DATE=$tool_basename" >&5
  4.1896 +$as_echo "$as_me: Will search for user supplied tool DATE=$tool_basename" >&6;}
  4.1897 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.1898 +set dummy $tool_basename; ac_word=$2
  4.1899 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.1900 +$as_echo_n "checking for $ac_word... " >&6; }
  4.1901 +if ${ac_cv_path_DATE+:} false; then :
  4.1902 +  $as_echo_n "(cached) " >&6
  4.1903 +else
  4.1904 +  case $DATE in
  4.1905 +  [\\/]* | ?:[\\/]*)
  4.1906 +  ac_cv_path_DATE="$DATE" # Let the user override the test with a path.
  4.1907 +  ;;
  4.1908 +  *)
  4.1909 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.1910 +for as_dir in $PATH
  4.1911 +do
  4.1912 +  IFS=$as_save_IFS
  4.1913 +  test -z "$as_dir" && as_dir=.
  4.1914 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.1915 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.1916 +    ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext"
  4.1917 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.1918 +    break 2
  4.1919 +  fi
  4.1920 +done
  4.1921 +  done
  4.1922 +IFS=$as_save_IFS
  4.1923 +
  4.1924 +  ;;
  4.1925 +esac
  4.1926 +fi
  4.1927 +DATE=$ac_cv_path_DATE
  4.1928 +if test -n "$DATE"; then
  4.1929 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DATE" >&5
  4.1930 +$as_echo "$DATE" >&6; }
  4.1931 +else
  4.1932 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.1933 +$as_echo "no" >&6; }
  4.1934 +fi
  4.1935 +
  4.1936 +
  4.1937 +        if test "x$DATE" = x; then
  4.1938 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.1939 +        fi
  4.1940 +      else
  4.1941 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.1942 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool DATE=$tool_specified" >&5
  4.1943 +$as_echo "$as_me: Will use user supplied tool DATE=$tool_specified" >&6;}
  4.1944 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DATE" >&5
  4.1945 +$as_echo_n "checking for DATE... " >&6; }
  4.1946 +        if test ! -x "$tool_specified"; then
  4.1947 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.1948 +$as_echo "not found" >&6; }
  4.1949 +          as_fn_error $? "User supplied tool DATE=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.1950 +        fi
  4.1951 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.1952 +$as_echo "$tool_specified" >&6; }
  4.1953 +      fi
  4.1954 +    fi
  4.1955 +  fi
  4.1956 +
  4.1957 +
  4.1958  
  4.1959    if test "x$DATE" = x; then
  4.1960 -    if test "xdate" = x; then
  4.1961 -      PROG_NAME=date
  4.1962 -    else
  4.1963 -      PROG_NAME=date
  4.1964 -    fi
  4.1965 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.1966 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.1967 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.1968 -  fi
  4.1969 -
  4.1970 -
  4.1971 -
  4.1972 -  for ac_prog in gdiff diff
  4.1973 +    as_fn_error $? "Could not find required tool for DATE" "$LINENO" 5
  4.1974 +  fi
  4.1975 +
  4.1976 +
  4.1977 +
  4.1978 +
  4.1979 +
  4.1980 +  # Publish this variable in the help.
  4.1981 +
  4.1982 +
  4.1983 +  if test "x$DIFF" = x; then
  4.1984 +    # The variable is not set by user, try to locate tool using the code snippet
  4.1985 +    for ac_prog in gdiff diff
  4.1986  do
  4.1987    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.1988  set dummy $ac_prog; ac_word=$2
  4.1989 @@ -4579,21 +6089,155 @@
  4.1990    test -n "$DIFF" && break
  4.1991  done
  4.1992  
  4.1993 +  else
  4.1994 +    # The variable is set, but is it from the command line or the environment?
  4.1995 +
  4.1996 +    # Try to remove the string !DIFF! from our list.
  4.1997 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!DIFF!/}
  4.1998 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.1999 +      # If it failed, the variable was not from the command line. Ignore it,
  4.2000 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.2001 +      if test "xDIFF" != xBASH; then
  4.2002 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of DIFF from the environment. Use command line variables instead." >&5
  4.2003 +$as_echo "$as_me: WARNING: Ignoring value of DIFF from the environment. Use command line variables instead." >&2;}
  4.2004 +      fi
  4.2005 +      # Try to locate tool using the code snippet
  4.2006 +      for ac_prog in gdiff diff
  4.2007 +do
  4.2008 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.2009 +set dummy $ac_prog; ac_word=$2
  4.2010 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2011 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2012 +if ${ac_cv_path_DIFF+:} false; then :
  4.2013 +  $as_echo_n "(cached) " >&6
  4.2014 +else
  4.2015 +  case $DIFF in
  4.2016 +  [\\/]* | ?:[\\/]*)
  4.2017 +  ac_cv_path_DIFF="$DIFF" # Let the user override the test with a path.
  4.2018 +  ;;
  4.2019 +  *)
  4.2020 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2021 +for as_dir in $PATH
  4.2022 +do
  4.2023 +  IFS=$as_save_IFS
  4.2024 +  test -z "$as_dir" && as_dir=.
  4.2025 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2026 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2027 +    ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext"
  4.2028 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2029 +    break 2
  4.2030 +  fi
  4.2031 +done
  4.2032 +  done
  4.2033 +IFS=$as_save_IFS
  4.2034 +
  4.2035 +  ;;
  4.2036 +esac
  4.2037 +fi
  4.2038 +DIFF=$ac_cv_path_DIFF
  4.2039 +if test -n "$DIFF"; then
  4.2040 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIFF" >&5
  4.2041 +$as_echo "$DIFF" >&6; }
  4.2042 +else
  4.2043 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2044 +$as_echo "no" >&6; }
  4.2045 +fi
  4.2046 +
  4.2047 +
  4.2048 +  test -n "$DIFF" && break
  4.2049 +done
  4.2050 +
  4.2051 +    else
  4.2052 +      # If it succeeded, then it was overridden by the user. We will use it
  4.2053 +      # for the tool.
  4.2054 +
  4.2055 +      # First remove it from the list of overridden variables, so we can test
  4.2056 +      # for unknown variables in the end.
  4.2057 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.2058 +
  4.2059 +      # Check if the provided tool contains a complete path.
  4.2060 +      tool_specified="$DIFF"
  4.2061 +      tool_basename="${tool_specified##*/}"
  4.2062 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.2063 +        # A command without a complete path is provided, search $PATH.
  4.2064 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool DIFF=$tool_basename" >&5
  4.2065 +$as_echo "$as_me: Will search for user supplied tool DIFF=$tool_basename" >&6;}
  4.2066 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.2067 +set dummy $tool_basename; ac_word=$2
  4.2068 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2069 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2070 +if ${ac_cv_path_DIFF+:} false; then :
  4.2071 +  $as_echo_n "(cached) " >&6
  4.2072 +else
  4.2073 +  case $DIFF in
  4.2074 +  [\\/]* | ?:[\\/]*)
  4.2075 +  ac_cv_path_DIFF="$DIFF" # Let the user override the test with a path.
  4.2076 +  ;;
  4.2077 +  *)
  4.2078 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2079 +for as_dir in $PATH
  4.2080 +do
  4.2081 +  IFS=$as_save_IFS
  4.2082 +  test -z "$as_dir" && as_dir=.
  4.2083 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2084 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2085 +    ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext"
  4.2086 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2087 +    break 2
  4.2088 +  fi
  4.2089 +done
  4.2090 +  done
  4.2091 +IFS=$as_save_IFS
  4.2092 +
  4.2093 +  ;;
  4.2094 +esac
  4.2095 +fi
  4.2096 +DIFF=$ac_cv_path_DIFF
  4.2097 +if test -n "$DIFF"; then
  4.2098 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIFF" >&5
  4.2099 +$as_echo "$DIFF" >&6; }
  4.2100 +else
  4.2101 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2102 +$as_echo "no" >&6; }
  4.2103 +fi
  4.2104 +
  4.2105 +
  4.2106 +        if test "x$DIFF" = x; then
  4.2107 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.2108 +        fi
  4.2109 +      else
  4.2110 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.2111 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool DIFF=$tool_specified" >&5
  4.2112 +$as_echo "$as_me: Will use user supplied tool DIFF=$tool_specified" >&6;}
  4.2113 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIFF" >&5
  4.2114 +$as_echo_n "checking for DIFF... " >&6; }
  4.2115 +        if test ! -x "$tool_specified"; then
  4.2116 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.2117 +$as_echo "not found" >&6; }
  4.2118 +          as_fn_error $? "User supplied tool DIFF=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.2119 +        fi
  4.2120 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.2121 +$as_echo "$tool_specified" >&6; }
  4.2122 +      fi
  4.2123 +    fi
  4.2124 +  fi
  4.2125 +
  4.2126 +
  4.2127  
  4.2128    if test "x$DIFF" = x; then
  4.2129 -    if test "xgdiff diff" = x; then
  4.2130 -      PROG_NAME=diff
  4.2131 -    else
  4.2132 -      PROG_NAME=gdiff diff
  4.2133 -    fi
  4.2134 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.2135 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.2136 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.2137 -  fi
  4.2138 -
  4.2139 -
  4.2140 -
  4.2141 -  for ac_prog in dirname
  4.2142 +    as_fn_error $? "Could not find required tool for DIFF" "$LINENO" 5
  4.2143 +  fi
  4.2144 +
  4.2145 +
  4.2146 +
  4.2147 +
  4.2148 +
  4.2149 +  # Publish this variable in the help.
  4.2150 +
  4.2151 +
  4.2152 +  if test "x$DIRNAME" = x; then
  4.2153 +    # The variable is not set by user, try to locate tool using the code snippet
  4.2154 +    for ac_prog in dirname
  4.2155  do
  4.2156    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.2157  set dummy $ac_prog; ac_word=$2
  4.2158 @@ -4638,21 +6282,155 @@
  4.2159    test -n "$DIRNAME" && break
  4.2160  done
  4.2161  
  4.2162 +  else
  4.2163 +    # The variable is set, but is it from the command line or the environment?
  4.2164 +
  4.2165 +    # Try to remove the string !DIRNAME! from our list.
  4.2166 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!DIRNAME!/}
  4.2167 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.2168 +      # If it failed, the variable was not from the command line. Ignore it,
  4.2169 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.2170 +      if test "xDIRNAME" != xBASH; then
  4.2171 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of DIRNAME from the environment. Use command line variables instead." >&5
  4.2172 +$as_echo "$as_me: WARNING: Ignoring value of DIRNAME from the environment. Use command line variables instead." >&2;}
  4.2173 +      fi
  4.2174 +      # Try to locate tool using the code snippet
  4.2175 +      for ac_prog in dirname
  4.2176 +do
  4.2177 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.2178 +set dummy $ac_prog; ac_word=$2
  4.2179 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2180 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2181 +if ${ac_cv_path_DIRNAME+:} false; then :
  4.2182 +  $as_echo_n "(cached) " >&6
  4.2183 +else
  4.2184 +  case $DIRNAME in
  4.2185 +  [\\/]* | ?:[\\/]*)
  4.2186 +  ac_cv_path_DIRNAME="$DIRNAME" # Let the user override the test with a path.
  4.2187 +  ;;
  4.2188 +  *)
  4.2189 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2190 +for as_dir in $PATH
  4.2191 +do
  4.2192 +  IFS=$as_save_IFS
  4.2193 +  test -z "$as_dir" && as_dir=.
  4.2194 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2195 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2196 +    ac_cv_path_DIRNAME="$as_dir/$ac_word$ac_exec_ext"
  4.2197 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2198 +    break 2
  4.2199 +  fi
  4.2200 +done
  4.2201 +  done
  4.2202 +IFS=$as_save_IFS
  4.2203 +
  4.2204 +  ;;
  4.2205 +esac
  4.2206 +fi
  4.2207 +DIRNAME=$ac_cv_path_DIRNAME
  4.2208 +if test -n "$DIRNAME"; then
  4.2209 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIRNAME" >&5
  4.2210 +$as_echo "$DIRNAME" >&6; }
  4.2211 +else
  4.2212 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2213 +$as_echo "no" >&6; }
  4.2214 +fi
  4.2215 +
  4.2216 +
  4.2217 +  test -n "$DIRNAME" && break
  4.2218 +done
  4.2219 +
  4.2220 +    else
  4.2221 +      # If it succeeded, then it was overridden by the user. We will use it
  4.2222 +      # for the tool.
  4.2223 +
  4.2224 +      # First remove it from the list of overridden variables, so we can test
  4.2225 +      # for unknown variables in the end.
  4.2226 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.2227 +
  4.2228 +      # Check if the provided tool contains a complete path.
  4.2229 +      tool_specified="$DIRNAME"
  4.2230 +      tool_basename="${tool_specified##*/}"
  4.2231 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.2232 +        # A command without a complete path is provided, search $PATH.
  4.2233 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool DIRNAME=$tool_basename" >&5
  4.2234 +$as_echo "$as_me: Will search for user supplied tool DIRNAME=$tool_basename" >&6;}
  4.2235 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.2236 +set dummy $tool_basename; ac_word=$2
  4.2237 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2238 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2239 +if ${ac_cv_path_DIRNAME+:} false; then :
  4.2240 +  $as_echo_n "(cached) " >&6
  4.2241 +else
  4.2242 +  case $DIRNAME in
  4.2243 +  [\\/]* | ?:[\\/]*)
  4.2244 +  ac_cv_path_DIRNAME="$DIRNAME" # Let the user override the test with a path.
  4.2245 +  ;;
  4.2246 +  *)
  4.2247 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2248 +for as_dir in $PATH
  4.2249 +do
  4.2250 +  IFS=$as_save_IFS
  4.2251 +  test -z "$as_dir" && as_dir=.
  4.2252 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2253 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2254 +    ac_cv_path_DIRNAME="$as_dir/$ac_word$ac_exec_ext"
  4.2255 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2256 +    break 2
  4.2257 +  fi
  4.2258 +done
  4.2259 +  done
  4.2260 +IFS=$as_save_IFS
  4.2261 +
  4.2262 +  ;;
  4.2263 +esac
  4.2264 +fi
  4.2265 +DIRNAME=$ac_cv_path_DIRNAME
  4.2266 +if test -n "$DIRNAME"; then
  4.2267 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DIRNAME" >&5
  4.2268 +$as_echo "$DIRNAME" >&6; }
  4.2269 +else
  4.2270 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2271 +$as_echo "no" >&6; }
  4.2272 +fi
  4.2273 +
  4.2274 +
  4.2275 +        if test "x$DIRNAME" = x; then
  4.2276 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.2277 +        fi
  4.2278 +      else
  4.2279 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.2280 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool DIRNAME=$tool_specified" >&5
  4.2281 +$as_echo "$as_me: Will use user supplied tool DIRNAME=$tool_specified" >&6;}
  4.2282 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRNAME" >&5
  4.2283 +$as_echo_n "checking for DIRNAME... " >&6; }
  4.2284 +        if test ! -x "$tool_specified"; then
  4.2285 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.2286 +$as_echo "not found" >&6; }
  4.2287 +          as_fn_error $? "User supplied tool DIRNAME=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.2288 +        fi
  4.2289 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.2290 +$as_echo "$tool_specified" >&6; }
  4.2291 +      fi
  4.2292 +    fi
  4.2293 +  fi
  4.2294 +
  4.2295 +
  4.2296  
  4.2297    if test "x$DIRNAME" = x; then
  4.2298 -    if test "xdirname" = x; then
  4.2299 -      PROG_NAME=dirname
  4.2300 -    else
  4.2301 -      PROG_NAME=dirname
  4.2302 -    fi
  4.2303 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.2304 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.2305 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.2306 -  fi
  4.2307 -
  4.2308 -
  4.2309 -
  4.2310 -  for ac_prog in echo
  4.2311 +    as_fn_error $? "Could not find required tool for DIRNAME" "$LINENO" 5
  4.2312 +  fi
  4.2313 +
  4.2314 +
  4.2315 +
  4.2316 +
  4.2317 +
  4.2318 +  # Publish this variable in the help.
  4.2319 +
  4.2320 +
  4.2321 +  if test "x$ECHO" = x; then
  4.2322 +    # The variable is not set by user, try to locate tool using the code snippet
  4.2323 +    for ac_prog in echo
  4.2324  do
  4.2325    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.2326  set dummy $ac_prog; ac_word=$2
  4.2327 @@ -4697,21 +6475,155 @@
  4.2328    test -n "$ECHO" && break
  4.2329  done
  4.2330  
  4.2331 +  else
  4.2332 +    # The variable is set, but is it from the command line or the environment?
  4.2333 +
  4.2334 +    # Try to remove the string !ECHO! from our list.
  4.2335 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!ECHO!/}
  4.2336 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.2337 +      # If it failed, the variable was not from the command line. Ignore it,
  4.2338 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.2339 +      if test "xECHO" != xBASH; then
  4.2340 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of ECHO from the environment. Use command line variables instead." >&5
  4.2341 +$as_echo "$as_me: WARNING: Ignoring value of ECHO from the environment. Use command line variables instead." >&2;}
  4.2342 +      fi
  4.2343 +      # Try to locate tool using the code snippet
  4.2344 +      for ac_prog in echo
  4.2345 +do
  4.2346 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.2347 +set dummy $ac_prog; ac_word=$2
  4.2348 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2349 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2350 +if ${ac_cv_path_ECHO+:} false; then :
  4.2351 +  $as_echo_n "(cached) " >&6
  4.2352 +else
  4.2353 +  case $ECHO in
  4.2354 +  [\\/]* | ?:[\\/]*)
  4.2355 +  ac_cv_path_ECHO="$ECHO" # Let the user override the test with a path.
  4.2356 +  ;;
  4.2357 +  *)
  4.2358 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2359 +for as_dir in $PATH
  4.2360 +do
  4.2361 +  IFS=$as_save_IFS
  4.2362 +  test -z "$as_dir" && as_dir=.
  4.2363 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2364 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2365 +    ac_cv_path_ECHO="$as_dir/$ac_word$ac_exec_ext"
  4.2366 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2367 +    break 2
  4.2368 +  fi
  4.2369 +done
  4.2370 +  done
  4.2371 +IFS=$as_save_IFS
  4.2372 +
  4.2373 +  ;;
  4.2374 +esac
  4.2375 +fi
  4.2376 +ECHO=$ac_cv_path_ECHO
  4.2377 +if test -n "$ECHO"; then
  4.2378 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ECHO" >&5
  4.2379 +$as_echo "$ECHO" >&6; }
  4.2380 +else
  4.2381 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2382 +$as_echo "no" >&6; }
  4.2383 +fi
  4.2384 +
  4.2385 +
  4.2386 +  test -n "$ECHO" && break
  4.2387 +done
  4.2388 +
  4.2389 +    else
  4.2390 +      # If it succeeded, then it was overridden by the user. We will use it
  4.2391 +      # for the tool.
  4.2392 +
  4.2393 +      # First remove it from the list of overridden variables, so we can test
  4.2394 +      # for unknown variables in the end.
  4.2395 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.2396 +
  4.2397 +      # Check if the provided tool contains a complete path.
  4.2398 +      tool_specified="$ECHO"
  4.2399 +      tool_basename="${tool_specified##*/}"
  4.2400 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.2401 +        # A command without a complete path is provided, search $PATH.
  4.2402 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool ECHO=$tool_basename" >&5
  4.2403 +$as_echo "$as_me: Will search for user supplied tool ECHO=$tool_basename" >&6;}
  4.2404 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.2405 +set dummy $tool_basename; ac_word=$2
  4.2406 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2407 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2408 +if ${ac_cv_path_ECHO+:} false; then :
  4.2409 +  $as_echo_n "(cached) " >&6
  4.2410 +else
  4.2411 +  case $ECHO in
  4.2412 +  [\\/]* | ?:[\\/]*)
  4.2413 +  ac_cv_path_ECHO="$ECHO" # Let the user override the test with a path.
  4.2414 +  ;;
  4.2415 +  *)
  4.2416 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2417 +for as_dir in $PATH
  4.2418 +do
  4.2419 +  IFS=$as_save_IFS
  4.2420 +  test -z "$as_dir" && as_dir=.
  4.2421 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2422 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2423 +    ac_cv_path_ECHO="$as_dir/$ac_word$ac_exec_ext"
  4.2424 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2425 +    break 2
  4.2426 +  fi
  4.2427 +done
  4.2428 +  done
  4.2429 +IFS=$as_save_IFS
  4.2430 +
  4.2431 +  ;;
  4.2432 +esac
  4.2433 +fi
  4.2434 +ECHO=$ac_cv_path_ECHO
  4.2435 +if test -n "$ECHO"; then
  4.2436 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ECHO" >&5
  4.2437 +$as_echo "$ECHO" >&6; }
  4.2438 +else
  4.2439 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2440 +$as_echo "no" >&6; }
  4.2441 +fi
  4.2442 +
  4.2443 +
  4.2444 +        if test "x$ECHO" = x; then
  4.2445 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.2446 +        fi
  4.2447 +      else
  4.2448 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.2449 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool ECHO=$tool_specified" >&5
  4.2450 +$as_echo "$as_me: Will use user supplied tool ECHO=$tool_specified" >&6;}
  4.2451 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ECHO" >&5
  4.2452 +$as_echo_n "checking for ECHO... " >&6; }
  4.2453 +        if test ! -x "$tool_specified"; then
  4.2454 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.2455 +$as_echo "not found" >&6; }
  4.2456 +          as_fn_error $? "User supplied tool ECHO=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.2457 +        fi
  4.2458 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.2459 +$as_echo "$tool_specified" >&6; }
  4.2460 +      fi
  4.2461 +    fi
  4.2462 +  fi
  4.2463 +
  4.2464 +
  4.2465  
  4.2466    if test "x$ECHO" = x; then
  4.2467 -    if test "xecho" = x; then
  4.2468 -      PROG_NAME=echo
  4.2469 -    else
  4.2470 -      PROG_NAME=echo
  4.2471 -    fi
  4.2472 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.2473 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.2474 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.2475 -  fi
  4.2476 -
  4.2477 -
  4.2478 -
  4.2479 -  for ac_prog in expr
  4.2480 +    as_fn_error $? "Could not find required tool for ECHO" "$LINENO" 5
  4.2481 +  fi
  4.2482 +
  4.2483 +
  4.2484 +
  4.2485 +
  4.2486 +
  4.2487 +  # Publish this variable in the help.
  4.2488 +
  4.2489 +
  4.2490 +  if test "x$EXPR" = x; then
  4.2491 +    # The variable is not set by user, try to locate tool using the code snippet
  4.2492 +    for ac_prog in expr
  4.2493  do
  4.2494    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.2495  set dummy $ac_prog; ac_word=$2
  4.2496 @@ -4756,21 +6668,155 @@
  4.2497    test -n "$EXPR" && break
  4.2498  done
  4.2499  
  4.2500 +  else
  4.2501 +    # The variable is set, but is it from the command line or the environment?
  4.2502 +
  4.2503 +    # Try to remove the string !EXPR! from our list.
  4.2504 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!EXPR!/}
  4.2505 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.2506 +      # If it failed, the variable was not from the command line. Ignore it,
  4.2507 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.2508 +      if test "xEXPR" != xBASH; then
  4.2509 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of EXPR from the environment. Use command line variables instead." >&5
  4.2510 +$as_echo "$as_me: WARNING: Ignoring value of EXPR from the environment. Use command line variables instead." >&2;}
  4.2511 +      fi
  4.2512 +      # Try to locate tool using the code snippet
  4.2513 +      for ac_prog in expr
  4.2514 +do
  4.2515 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.2516 +set dummy $ac_prog; ac_word=$2
  4.2517 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2518 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2519 +if ${ac_cv_path_EXPR+:} false; then :
  4.2520 +  $as_echo_n "(cached) " >&6
  4.2521 +else
  4.2522 +  case $EXPR in
  4.2523 +  [\\/]* | ?:[\\/]*)
  4.2524 +  ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path.
  4.2525 +  ;;
  4.2526 +  *)
  4.2527 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2528 +for as_dir in $PATH
  4.2529 +do
  4.2530 +  IFS=$as_save_IFS
  4.2531 +  test -z "$as_dir" && as_dir=.
  4.2532 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2533 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2534 +    ac_cv_path_EXPR="$as_dir/$ac_word$ac_exec_ext"
  4.2535 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2536 +    break 2
  4.2537 +  fi
  4.2538 +done
  4.2539 +  done
  4.2540 +IFS=$as_save_IFS
  4.2541 +
  4.2542 +  ;;
  4.2543 +esac
  4.2544 +fi
  4.2545 +EXPR=$ac_cv_path_EXPR
  4.2546 +if test -n "$EXPR"; then
  4.2547 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPR" >&5
  4.2548 +$as_echo "$EXPR" >&6; }
  4.2549 +else
  4.2550 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2551 +$as_echo "no" >&6; }
  4.2552 +fi
  4.2553 +
  4.2554 +
  4.2555 +  test -n "$EXPR" && break
  4.2556 +done
  4.2557 +
  4.2558 +    else
  4.2559 +      # If it succeeded, then it was overridden by the user. We will use it
  4.2560 +      # for the tool.
  4.2561 +
  4.2562 +      # First remove it from the list of overridden variables, so we can test
  4.2563 +      # for unknown variables in the end.
  4.2564 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.2565 +
  4.2566 +      # Check if the provided tool contains a complete path.
  4.2567 +      tool_specified="$EXPR"
  4.2568 +      tool_basename="${tool_specified##*/}"
  4.2569 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.2570 +        # A command without a complete path is provided, search $PATH.
  4.2571 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool EXPR=$tool_basename" >&5
  4.2572 +$as_echo "$as_me: Will search for user supplied tool EXPR=$tool_basename" >&6;}
  4.2573 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.2574 +set dummy $tool_basename; ac_word=$2
  4.2575 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2576 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2577 +if ${ac_cv_path_EXPR+:} false; then :
  4.2578 +  $as_echo_n "(cached) " >&6
  4.2579 +else
  4.2580 +  case $EXPR in
  4.2581 +  [\\/]* | ?:[\\/]*)
  4.2582 +  ac_cv_path_EXPR="$EXPR" # Let the user override the test with a path.
  4.2583 +  ;;
  4.2584 +  *)
  4.2585 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2586 +for as_dir in $PATH
  4.2587 +do
  4.2588 +  IFS=$as_save_IFS
  4.2589 +  test -z "$as_dir" && as_dir=.
  4.2590 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2591 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2592 +    ac_cv_path_EXPR="$as_dir/$ac_word$ac_exec_ext"
  4.2593 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2594 +    break 2
  4.2595 +  fi
  4.2596 +done
  4.2597 +  done
  4.2598 +IFS=$as_save_IFS
  4.2599 +
  4.2600 +  ;;
  4.2601 +esac
  4.2602 +fi
  4.2603 +EXPR=$ac_cv_path_EXPR
  4.2604 +if test -n "$EXPR"; then
  4.2605 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPR" >&5
  4.2606 +$as_echo "$EXPR" >&6; }
  4.2607 +else
  4.2608 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2609 +$as_echo "no" >&6; }
  4.2610 +fi
  4.2611 +
  4.2612 +
  4.2613 +        if test "x$EXPR" = x; then
  4.2614 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.2615 +        fi
  4.2616 +      else
  4.2617 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.2618 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool EXPR=$tool_specified" >&5
  4.2619 +$as_echo "$as_me: Will use user supplied tool EXPR=$tool_specified" >&6;}
  4.2620 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXPR" >&5
  4.2621 +$as_echo_n "checking for EXPR... " >&6; }
  4.2622 +        if test ! -x "$tool_specified"; then
  4.2623 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.2624 +$as_echo "not found" >&6; }
  4.2625 +          as_fn_error $? "User supplied tool EXPR=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.2626 +        fi
  4.2627 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.2628 +$as_echo "$tool_specified" >&6; }
  4.2629 +      fi
  4.2630 +    fi
  4.2631 +  fi
  4.2632 +
  4.2633 +
  4.2634  
  4.2635    if test "x$EXPR" = x; then
  4.2636 -    if test "xexpr" = x; then
  4.2637 -      PROG_NAME=expr
  4.2638 -    else
  4.2639 -      PROG_NAME=expr
  4.2640 -    fi
  4.2641 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.2642 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.2643 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.2644 -  fi
  4.2645 -
  4.2646 -
  4.2647 -
  4.2648 -  for ac_prog in file
  4.2649 +    as_fn_error $? "Could not find required tool for EXPR" "$LINENO" 5
  4.2650 +  fi
  4.2651 +
  4.2652 +
  4.2653 +
  4.2654 +
  4.2655 +
  4.2656 +  # Publish this variable in the help.
  4.2657 +
  4.2658 +
  4.2659 +  if test "x$FILE" = x; then
  4.2660 +    # The variable is not set by user, try to locate tool using the code snippet
  4.2661 +    for ac_prog in file
  4.2662  do
  4.2663    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.2664  set dummy $ac_prog; ac_word=$2
  4.2665 @@ -4815,21 +6861,155 @@
  4.2666    test -n "$FILE" && break
  4.2667  done
  4.2668  
  4.2669 +  else
  4.2670 +    # The variable is set, but is it from the command line or the environment?
  4.2671 +
  4.2672 +    # Try to remove the string !FILE! from our list.
  4.2673 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!FILE!/}
  4.2674 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.2675 +      # If it failed, the variable was not from the command line. Ignore it,
  4.2676 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.2677 +      if test "xFILE" != xBASH; then
  4.2678 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of FILE from the environment. Use command line variables instead." >&5
  4.2679 +$as_echo "$as_me: WARNING: Ignoring value of FILE from the environment. Use command line variables instead." >&2;}
  4.2680 +      fi
  4.2681 +      # Try to locate tool using the code snippet
  4.2682 +      for ac_prog in file
  4.2683 +do
  4.2684 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.2685 +set dummy $ac_prog; ac_word=$2
  4.2686 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2687 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2688 +if ${ac_cv_path_FILE+:} false; then :
  4.2689 +  $as_echo_n "(cached) " >&6
  4.2690 +else
  4.2691 +  case $FILE in
  4.2692 +  [\\/]* | ?:[\\/]*)
  4.2693 +  ac_cv_path_FILE="$FILE" # Let the user override the test with a path.
  4.2694 +  ;;
  4.2695 +  *)
  4.2696 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2697 +for as_dir in $PATH
  4.2698 +do
  4.2699 +  IFS=$as_save_IFS
  4.2700 +  test -z "$as_dir" && as_dir=.
  4.2701 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2702 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2703 +    ac_cv_path_FILE="$as_dir/$ac_word$ac_exec_ext"
  4.2704 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2705 +    break 2
  4.2706 +  fi
  4.2707 +done
  4.2708 +  done
  4.2709 +IFS=$as_save_IFS
  4.2710 +
  4.2711 +  ;;
  4.2712 +esac
  4.2713 +fi
  4.2714 +FILE=$ac_cv_path_FILE
  4.2715 +if test -n "$FILE"; then
  4.2716 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FILE" >&5
  4.2717 +$as_echo "$FILE" >&6; }
  4.2718 +else
  4.2719 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2720 +$as_echo "no" >&6; }
  4.2721 +fi
  4.2722 +
  4.2723 +
  4.2724 +  test -n "$FILE" && break
  4.2725 +done
  4.2726 +
  4.2727 +    else
  4.2728 +      # If it succeeded, then it was overridden by the user. We will use it
  4.2729 +      # for the tool.
  4.2730 +
  4.2731 +      # First remove it from the list of overridden variables, so we can test
  4.2732 +      # for unknown variables in the end.
  4.2733 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.2734 +
  4.2735 +      # Check if the provided tool contains a complete path.
  4.2736 +      tool_specified="$FILE"
  4.2737 +      tool_basename="${tool_specified##*/}"
  4.2738 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.2739 +        # A command without a complete path is provided, search $PATH.
  4.2740 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool FILE=$tool_basename" >&5
  4.2741 +$as_echo "$as_me: Will search for user supplied tool FILE=$tool_basename" >&6;}
  4.2742 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.2743 +set dummy $tool_basename; ac_word=$2
  4.2744 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2745 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2746 +if ${ac_cv_path_FILE+:} false; then :
  4.2747 +  $as_echo_n "(cached) " >&6
  4.2748 +else
  4.2749 +  case $FILE in
  4.2750 +  [\\/]* | ?:[\\/]*)
  4.2751 +  ac_cv_path_FILE="$FILE" # Let the user override the test with a path.
  4.2752 +  ;;
  4.2753 +  *)
  4.2754 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2755 +for as_dir in $PATH
  4.2756 +do
  4.2757 +  IFS=$as_save_IFS
  4.2758 +  test -z "$as_dir" && as_dir=.
  4.2759 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2760 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2761 +    ac_cv_path_FILE="$as_dir/$ac_word$ac_exec_ext"
  4.2762 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2763 +    break 2
  4.2764 +  fi
  4.2765 +done
  4.2766 +  done
  4.2767 +IFS=$as_save_IFS
  4.2768 +
  4.2769 +  ;;
  4.2770 +esac
  4.2771 +fi
  4.2772 +FILE=$ac_cv_path_FILE
  4.2773 +if test -n "$FILE"; then
  4.2774 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FILE" >&5
  4.2775 +$as_echo "$FILE" >&6; }
  4.2776 +else
  4.2777 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2778 +$as_echo "no" >&6; }
  4.2779 +fi
  4.2780 +
  4.2781 +
  4.2782 +        if test "x$FILE" = x; then
  4.2783 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.2784 +        fi
  4.2785 +      else
  4.2786 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.2787 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool FILE=$tool_specified" >&5
  4.2788 +$as_echo "$as_me: Will use user supplied tool FILE=$tool_specified" >&6;}
  4.2789 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FILE" >&5
  4.2790 +$as_echo_n "checking for FILE... " >&6; }
  4.2791 +        if test ! -x "$tool_specified"; then
  4.2792 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.2793 +$as_echo "not found" >&6; }
  4.2794 +          as_fn_error $? "User supplied tool FILE=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.2795 +        fi
  4.2796 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.2797 +$as_echo "$tool_specified" >&6; }
  4.2798 +      fi
  4.2799 +    fi
  4.2800 +  fi
  4.2801 +
  4.2802 +
  4.2803  
  4.2804    if test "x$FILE" = x; then
  4.2805 -    if test "xfile" = x; then
  4.2806 -      PROG_NAME=file
  4.2807 -    else
  4.2808 -      PROG_NAME=file
  4.2809 -    fi
  4.2810 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.2811 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.2812 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.2813 -  fi
  4.2814 -
  4.2815 -
  4.2816 -
  4.2817 -  for ac_prog in find
  4.2818 +    as_fn_error $? "Could not find required tool for FILE" "$LINENO" 5
  4.2819 +  fi
  4.2820 +
  4.2821 +
  4.2822 +
  4.2823 +
  4.2824 +
  4.2825 +  # Publish this variable in the help.
  4.2826 +
  4.2827 +
  4.2828 +  if test "x$FIND" = x; then
  4.2829 +    # The variable is not set by user, try to locate tool using the code snippet
  4.2830 +    for ac_prog in find
  4.2831  do
  4.2832    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.2833  set dummy $ac_prog; ac_word=$2
  4.2834 @@ -4874,21 +7054,155 @@
  4.2835    test -n "$FIND" && break
  4.2836  done
  4.2837  
  4.2838 +  else
  4.2839 +    # The variable is set, but is it from the command line or the environment?
  4.2840 +
  4.2841 +    # Try to remove the string !FIND! from our list.
  4.2842 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!FIND!/}
  4.2843 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.2844 +      # If it failed, the variable was not from the command line. Ignore it,
  4.2845 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.2846 +      if test "xFIND" != xBASH; then
  4.2847 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of FIND from the environment. Use command line variables instead." >&5
  4.2848 +$as_echo "$as_me: WARNING: Ignoring value of FIND from the environment. Use command line variables instead." >&2;}
  4.2849 +      fi
  4.2850 +      # Try to locate tool using the code snippet
  4.2851 +      for ac_prog in find
  4.2852 +do
  4.2853 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.2854 +set dummy $ac_prog; ac_word=$2
  4.2855 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2856 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2857 +if ${ac_cv_path_FIND+:} false; then :
  4.2858 +  $as_echo_n "(cached) " >&6
  4.2859 +else
  4.2860 +  case $FIND in
  4.2861 +  [\\/]* | ?:[\\/]*)
  4.2862 +  ac_cv_path_FIND="$FIND" # Let the user override the test with a path.
  4.2863 +  ;;
  4.2864 +  *)
  4.2865 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2866 +for as_dir in $PATH
  4.2867 +do
  4.2868 +  IFS=$as_save_IFS
  4.2869 +  test -z "$as_dir" && as_dir=.
  4.2870 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2871 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2872 +    ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
  4.2873 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2874 +    break 2
  4.2875 +  fi
  4.2876 +done
  4.2877 +  done
  4.2878 +IFS=$as_save_IFS
  4.2879 +
  4.2880 +  ;;
  4.2881 +esac
  4.2882 +fi
  4.2883 +FIND=$ac_cv_path_FIND
  4.2884 +if test -n "$FIND"; then
  4.2885 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIND" >&5
  4.2886 +$as_echo "$FIND" >&6; }
  4.2887 +else
  4.2888 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2889 +$as_echo "no" >&6; }
  4.2890 +fi
  4.2891 +
  4.2892 +
  4.2893 +  test -n "$FIND" && break
  4.2894 +done
  4.2895 +
  4.2896 +    else
  4.2897 +      # If it succeeded, then it was overridden by the user. We will use it
  4.2898 +      # for the tool.
  4.2899 +
  4.2900 +      # First remove it from the list of overridden variables, so we can test
  4.2901 +      # for unknown variables in the end.
  4.2902 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.2903 +
  4.2904 +      # Check if the provided tool contains a complete path.
  4.2905 +      tool_specified="$FIND"
  4.2906 +      tool_basename="${tool_specified##*/}"
  4.2907 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.2908 +        # A command without a complete path is provided, search $PATH.
  4.2909 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool FIND=$tool_basename" >&5
  4.2910 +$as_echo "$as_me: Will search for user supplied tool FIND=$tool_basename" >&6;}
  4.2911 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.2912 +set dummy $tool_basename; ac_word=$2
  4.2913 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.2914 +$as_echo_n "checking for $ac_word... " >&6; }
  4.2915 +if ${ac_cv_path_FIND+:} false; then :
  4.2916 +  $as_echo_n "(cached) " >&6
  4.2917 +else
  4.2918 +  case $FIND in
  4.2919 +  [\\/]* | ?:[\\/]*)
  4.2920 +  ac_cv_path_FIND="$FIND" # Let the user override the test with a path.
  4.2921 +  ;;
  4.2922 +  *)
  4.2923 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.2924 +for as_dir in $PATH
  4.2925 +do
  4.2926 +  IFS=$as_save_IFS
  4.2927 +  test -z "$as_dir" && as_dir=.
  4.2928 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.2929 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.2930 +    ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
  4.2931 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.2932 +    break 2
  4.2933 +  fi
  4.2934 +done
  4.2935 +  done
  4.2936 +IFS=$as_save_IFS
  4.2937 +
  4.2938 +  ;;
  4.2939 +esac
  4.2940 +fi
  4.2941 +FIND=$ac_cv_path_FIND
  4.2942 +if test -n "$FIND"; then
  4.2943 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FIND" >&5
  4.2944 +$as_echo "$FIND" >&6; }
  4.2945 +else
  4.2946 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.2947 +$as_echo "no" >&6; }
  4.2948 +fi
  4.2949 +
  4.2950 +
  4.2951 +        if test "x$FIND" = x; then
  4.2952 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.2953 +        fi
  4.2954 +      else
  4.2955 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.2956 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool FIND=$tool_specified" >&5
  4.2957 +$as_echo "$as_me: Will use user supplied tool FIND=$tool_specified" >&6;}
  4.2958 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FIND" >&5
  4.2959 +$as_echo_n "checking for FIND... " >&6; }
  4.2960 +        if test ! -x "$tool_specified"; then
  4.2961 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.2962 +$as_echo "not found" >&6; }
  4.2963 +          as_fn_error $? "User supplied tool FIND=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.2964 +        fi
  4.2965 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.2966 +$as_echo "$tool_specified" >&6; }
  4.2967 +      fi
  4.2968 +    fi
  4.2969 +  fi
  4.2970 +
  4.2971 +
  4.2972  
  4.2973    if test "x$FIND" = x; then
  4.2974 -    if test "xfind" = x; then
  4.2975 -      PROG_NAME=find
  4.2976 -    else
  4.2977 -      PROG_NAME=find
  4.2978 -    fi
  4.2979 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.2980 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.2981 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.2982 -  fi
  4.2983 -
  4.2984 -
  4.2985 -
  4.2986 -  for ac_prog in head
  4.2987 +    as_fn_error $? "Could not find required tool for FIND" "$LINENO" 5
  4.2988 +  fi
  4.2989 +
  4.2990 +
  4.2991 +
  4.2992 +
  4.2993 +
  4.2994 +  # Publish this variable in the help.
  4.2995 +
  4.2996 +
  4.2997 +  if test "x$HEAD" = x; then
  4.2998 +    # The variable is not set by user, try to locate tool using the code snippet
  4.2999 +    for ac_prog in head
  4.3000  do
  4.3001    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3002  set dummy $ac_prog; ac_word=$2
  4.3003 @@ -4933,21 +7247,155 @@
  4.3004    test -n "$HEAD" && break
  4.3005  done
  4.3006  
  4.3007 +  else
  4.3008 +    # The variable is set, but is it from the command line or the environment?
  4.3009 +
  4.3010 +    # Try to remove the string !HEAD! from our list.
  4.3011 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!HEAD!/}
  4.3012 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.3013 +      # If it failed, the variable was not from the command line. Ignore it,
  4.3014 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.3015 +      if test "xHEAD" != xBASH; then
  4.3016 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of HEAD from the environment. Use command line variables instead." >&5
  4.3017 +$as_echo "$as_me: WARNING: Ignoring value of HEAD from the environment. Use command line variables instead." >&2;}
  4.3018 +      fi
  4.3019 +      # Try to locate tool using the code snippet
  4.3020 +      for ac_prog in head
  4.3021 +do
  4.3022 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3023 +set dummy $ac_prog; ac_word=$2
  4.3024 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3025 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3026 +if ${ac_cv_path_HEAD+:} false; then :
  4.3027 +  $as_echo_n "(cached) " >&6
  4.3028 +else
  4.3029 +  case $HEAD in
  4.3030 +  [\\/]* | ?:[\\/]*)
  4.3031 +  ac_cv_path_HEAD="$HEAD" # Let the user override the test with a path.
  4.3032 +  ;;
  4.3033 +  *)
  4.3034 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3035 +for as_dir in $PATH
  4.3036 +do
  4.3037 +  IFS=$as_save_IFS
  4.3038 +  test -z "$as_dir" && as_dir=.
  4.3039 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3040 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3041 +    ac_cv_path_HEAD="$as_dir/$ac_word$ac_exec_ext"
  4.3042 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3043 +    break 2
  4.3044 +  fi
  4.3045 +done
  4.3046 +  done
  4.3047 +IFS=$as_save_IFS
  4.3048 +
  4.3049 +  ;;
  4.3050 +esac
  4.3051 +fi
  4.3052 +HEAD=$ac_cv_path_HEAD
  4.3053 +if test -n "$HEAD"; then
  4.3054 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HEAD" >&5
  4.3055 +$as_echo "$HEAD" >&6; }
  4.3056 +else
  4.3057 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3058 +$as_echo "no" >&6; }
  4.3059 +fi
  4.3060 +
  4.3061 +
  4.3062 +  test -n "$HEAD" && break
  4.3063 +done
  4.3064 +
  4.3065 +    else
  4.3066 +      # If it succeeded, then it was overridden by the user. We will use it
  4.3067 +      # for the tool.
  4.3068 +
  4.3069 +      # First remove it from the list of overridden variables, so we can test
  4.3070 +      # for unknown variables in the end.
  4.3071 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.3072 +
  4.3073 +      # Check if the provided tool contains a complete path.
  4.3074 +      tool_specified="$HEAD"
  4.3075 +      tool_basename="${tool_specified##*/}"
  4.3076 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.3077 +        # A command without a complete path is provided, search $PATH.
  4.3078 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool HEAD=$tool_basename" >&5
  4.3079 +$as_echo "$as_me: Will search for user supplied tool HEAD=$tool_basename" >&6;}
  4.3080 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.3081 +set dummy $tool_basename; ac_word=$2
  4.3082 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3083 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3084 +if ${ac_cv_path_HEAD+:} false; then :
  4.3085 +  $as_echo_n "(cached) " >&6
  4.3086 +else
  4.3087 +  case $HEAD in
  4.3088 +  [\\/]* | ?:[\\/]*)
  4.3089 +  ac_cv_path_HEAD="$HEAD" # Let the user override the test with a path.
  4.3090 +  ;;
  4.3091 +  *)
  4.3092 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3093 +for as_dir in $PATH
  4.3094 +do
  4.3095 +  IFS=$as_save_IFS
  4.3096 +  test -z "$as_dir" && as_dir=.
  4.3097 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3098 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3099 +    ac_cv_path_HEAD="$as_dir/$ac_word$ac_exec_ext"
  4.3100 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3101 +    break 2
  4.3102 +  fi
  4.3103 +done
  4.3104 +  done
  4.3105 +IFS=$as_save_IFS
  4.3106 +
  4.3107 +  ;;
  4.3108 +esac
  4.3109 +fi
  4.3110 +HEAD=$ac_cv_path_HEAD
  4.3111 +if test -n "$HEAD"; then
  4.3112 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HEAD" >&5
  4.3113 +$as_echo "$HEAD" >&6; }
  4.3114 +else
  4.3115 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3116 +$as_echo "no" >&6; }
  4.3117 +fi
  4.3118 +
  4.3119 +
  4.3120 +        if test "x$HEAD" = x; then
  4.3121 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.3122 +        fi
  4.3123 +      else
  4.3124 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.3125 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool HEAD=$tool_specified" >&5
  4.3126 +$as_echo "$as_me: Will use user supplied tool HEAD=$tool_specified" >&6;}
  4.3127 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HEAD" >&5
  4.3128 +$as_echo_n "checking for HEAD... " >&6; }
  4.3129 +        if test ! -x "$tool_specified"; then
  4.3130 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.3131 +$as_echo "not found" >&6; }
  4.3132 +          as_fn_error $? "User supplied tool HEAD=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.3133 +        fi
  4.3134 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.3135 +$as_echo "$tool_specified" >&6; }
  4.3136 +      fi
  4.3137 +    fi
  4.3138 +  fi
  4.3139 +
  4.3140 +
  4.3141  
  4.3142    if test "x$HEAD" = x; then
  4.3143 -    if test "xhead" = x; then
  4.3144 -      PROG_NAME=head
  4.3145 -    else
  4.3146 -      PROG_NAME=head
  4.3147 -    fi
  4.3148 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.3149 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.3150 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.3151 -  fi
  4.3152 -
  4.3153 -
  4.3154 -
  4.3155 -  for ac_prog in ln
  4.3156 +    as_fn_error $? "Could not find required tool for HEAD" "$LINENO" 5
  4.3157 +  fi
  4.3158 +
  4.3159 +
  4.3160 +
  4.3161 +
  4.3162 +
  4.3163 +  # Publish this variable in the help.
  4.3164 +
  4.3165 +
  4.3166 +  if test "x$LN" = x; then
  4.3167 +    # The variable is not set by user, try to locate tool using the code snippet
  4.3168 +    for ac_prog in ln
  4.3169  do
  4.3170    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3171  set dummy $ac_prog; ac_word=$2
  4.3172 @@ -4992,21 +7440,155 @@
  4.3173    test -n "$LN" && break
  4.3174  done
  4.3175  
  4.3176 +  else
  4.3177 +    # The variable is set, but is it from the command line or the environment?
  4.3178 +
  4.3179 +    # Try to remove the string !LN! from our list.
  4.3180 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!LN!/}
  4.3181 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.3182 +      # If it failed, the variable was not from the command line. Ignore it,
  4.3183 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.3184 +      if test "xLN" != xBASH; then
  4.3185 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of LN from the environment. Use command line variables instead." >&5
  4.3186 +$as_echo "$as_me: WARNING: Ignoring value of LN from the environment. Use command line variables instead." >&2;}
  4.3187 +      fi
  4.3188 +      # Try to locate tool using the code snippet
  4.3189 +      for ac_prog in ln
  4.3190 +do
  4.3191 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3192 +set dummy $ac_prog; ac_word=$2
  4.3193 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3194 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3195 +if ${ac_cv_path_LN+:} false; then :
  4.3196 +  $as_echo_n "(cached) " >&6
  4.3197 +else
  4.3198 +  case $LN in
  4.3199 +  [\\/]* | ?:[\\/]*)
  4.3200 +  ac_cv_path_LN="$LN" # Let the user override the test with a path.
  4.3201 +  ;;
  4.3202 +  *)
  4.3203 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3204 +for as_dir in $PATH
  4.3205 +do
  4.3206 +  IFS=$as_save_IFS
  4.3207 +  test -z "$as_dir" && as_dir=.
  4.3208 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3209 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3210 +    ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
  4.3211 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3212 +    break 2
  4.3213 +  fi
  4.3214 +done
  4.3215 +  done
  4.3216 +IFS=$as_save_IFS
  4.3217 +
  4.3218 +  ;;
  4.3219 +esac
  4.3220 +fi
  4.3221 +LN=$ac_cv_path_LN
  4.3222 +if test -n "$LN"; then
  4.3223 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5
  4.3224 +$as_echo "$LN" >&6; }
  4.3225 +else
  4.3226 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3227 +$as_echo "no" >&6; }
  4.3228 +fi
  4.3229 +
  4.3230 +
  4.3231 +  test -n "$LN" && break
  4.3232 +done
  4.3233 +
  4.3234 +    else
  4.3235 +      # If it succeeded, then it was overridden by the user. We will use it
  4.3236 +      # for the tool.
  4.3237 +
  4.3238 +      # First remove it from the list of overridden variables, so we can test
  4.3239 +      # for unknown variables in the end.
  4.3240 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.3241 +
  4.3242 +      # Check if the provided tool contains a complete path.
  4.3243 +      tool_specified="$LN"
  4.3244 +      tool_basename="${tool_specified##*/}"
  4.3245 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.3246 +        # A command without a complete path is provided, search $PATH.
  4.3247 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool LN=$tool_basename" >&5
  4.3248 +$as_echo "$as_me: Will search for user supplied tool LN=$tool_basename" >&6;}
  4.3249 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.3250 +set dummy $tool_basename; ac_word=$2
  4.3251 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3252 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3253 +if ${ac_cv_path_LN+:} false; then :
  4.3254 +  $as_echo_n "(cached) " >&6
  4.3255 +else
  4.3256 +  case $LN in
  4.3257 +  [\\/]* | ?:[\\/]*)
  4.3258 +  ac_cv_path_LN="$LN" # Let the user override the test with a path.
  4.3259 +  ;;
  4.3260 +  *)
  4.3261 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3262 +for as_dir in $PATH
  4.3263 +do
  4.3264 +  IFS=$as_save_IFS
  4.3265 +  test -z "$as_dir" && as_dir=.
  4.3266 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3267 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3268 +    ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
  4.3269 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3270 +    break 2
  4.3271 +  fi
  4.3272 +done
  4.3273 +  done
  4.3274 +IFS=$as_save_IFS
  4.3275 +
  4.3276 +  ;;
  4.3277 +esac
  4.3278 +fi
  4.3279 +LN=$ac_cv_path_LN
  4.3280 +if test -n "$LN"; then
  4.3281 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LN" >&5
  4.3282 +$as_echo "$LN" >&6; }
  4.3283 +else
  4.3284 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3285 +$as_echo "no" >&6; }
  4.3286 +fi
  4.3287 +
  4.3288 +
  4.3289 +        if test "x$LN" = x; then
  4.3290 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.3291 +        fi
  4.3292 +      else
  4.3293 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.3294 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool LN=$tool_specified" >&5
  4.3295 +$as_echo "$as_me: Will use user supplied tool LN=$tool_specified" >&6;}
  4.3296 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LN" >&5
  4.3297 +$as_echo_n "checking for LN... " >&6; }
  4.3298 +        if test ! -x "$tool_specified"; then
  4.3299 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.3300 +$as_echo "not found" >&6; }
  4.3301 +          as_fn_error $? "User supplied tool LN=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.3302 +        fi
  4.3303 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.3304 +$as_echo "$tool_specified" >&6; }
  4.3305 +      fi
  4.3306 +    fi
  4.3307 +  fi
  4.3308 +
  4.3309 +
  4.3310  
  4.3311    if test "x$LN" = x; then
  4.3312 -    if test "xln" = x; then
  4.3313 -      PROG_NAME=ln
  4.3314 -    else
  4.3315 -      PROG_NAME=ln
  4.3316 -    fi
  4.3317 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.3318 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.3319 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.3320 -  fi
  4.3321 -
  4.3322 -
  4.3323 -
  4.3324 -  for ac_prog in ls
  4.3325 +    as_fn_error $? "Could not find required tool for LN" "$LINENO" 5
  4.3326 +  fi
  4.3327 +
  4.3328 +
  4.3329 +
  4.3330 +
  4.3331 +
  4.3332 +  # Publish this variable in the help.
  4.3333 +
  4.3334 +
  4.3335 +  if test "x$LS" = x; then
  4.3336 +    # The variable is not set by user, try to locate tool using the code snippet
  4.3337 +    for ac_prog in ls
  4.3338  do
  4.3339    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3340  set dummy $ac_prog; ac_word=$2
  4.3341 @@ -5051,21 +7633,155 @@
  4.3342    test -n "$LS" && break
  4.3343  done
  4.3344  
  4.3345 +  else
  4.3346 +    # The variable is set, but is it from the command line or the environment?
  4.3347 +
  4.3348 +    # Try to remove the string !LS! from our list.
  4.3349 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!LS!/}
  4.3350 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.3351 +      # If it failed, the variable was not from the command line. Ignore it,
  4.3352 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.3353 +      if test "xLS" != xBASH; then
  4.3354 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of LS from the environment. Use command line variables instead." >&5
  4.3355 +$as_echo "$as_me: WARNING: Ignoring value of LS from the environment. Use command line variables instead." >&2;}
  4.3356 +      fi
  4.3357 +      # Try to locate tool using the code snippet
  4.3358 +      for ac_prog in ls
  4.3359 +do
  4.3360 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3361 +set dummy $ac_prog; ac_word=$2
  4.3362 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3363 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3364 +if ${ac_cv_path_LS+:} false; then :
  4.3365 +  $as_echo_n "(cached) " >&6
  4.3366 +else
  4.3367 +  case $LS in
  4.3368 +  [\\/]* | ?:[\\/]*)
  4.3369 +  ac_cv_path_LS="$LS" # Let the user override the test with a path.
  4.3370 +  ;;
  4.3371 +  *)
  4.3372 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3373 +for as_dir in $PATH
  4.3374 +do
  4.3375 +  IFS=$as_save_IFS
  4.3376 +  test -z "$as_dir" && as_dir=.
  4.3377 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3378 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3379 +    ac_cv_path_LS="$as_dir/$ac_word$ac_exec_ext"
  4.3380 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3381 +    break 2
  4.3382 +  fi
  4.3383 +done
  4.3384 +  done
  4.3385 +IFS=$as_save_IFS
  4.3386 +
  4.3387 +  ;;
  4.3388 +esac
  4.3389 +fi
  4.3390 +LS=$ac_cv_path_LS
  4.3391 +if test -n "$LS"; then
  4.3392 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LS" >&5
  4.3393 +$as_echo "$LS" >&6; }
  4.3394 +else
  4.3395 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3396 +$as_echo "no" >&6; }
  4.3397 +fi
  4.3398 +
  4.3399 +
  4.3400 +  test -n "$LS" && break
  4.3401 +done
  4.3402 +
  4.3403 +    else
  4.3404 +      # If it succeeded, then it was overridden by the user. We will use it
  4.3405 +      # for the tool.
  4.3406 +
  4.3407 +      # First remove it from the list of overridden variables, so we can test
  4.3408 +      # for unknown variables in the end.
  4.3409 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.3410 +
  4.3411 +      # Check if the provided tool contains a complete path.
  4.3412 +      tool_specified="$LS"
  4.3413 +      tool_basename="${tool_specified##*/}"
  4.3414 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.3415 +        # A command without a complete path is provided, search $PATH.
  4.3416 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool LS=$tool_basename" >&5
  4.3417 +$as_echo "$as_me: Will search for user supplied tool LS=$tool_basename" >&6;}
  4.3418 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.3419 +set dummy $tool_basename; ac_word=$2
  4.3420 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3421 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3422 +if ${ac_cv_path_LS+:} false; then :
  4.3423 +  $as_echo_n "(cached) " >&6
  4.3424 +else
  4.3425 +  case $LS in
  4.3426 +  [\\/]* | ?:[\\/]*)
  4.3427 +  ac_cv_path_LS="$LS" # Let the user override the test with a path.
  4.3428 +  ;;
  4.3429 +  *)
  4.3430 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3431 +for as_dir in $PATH
  4.3432 +do
  4.3433 +  IFS=$as_save_IFS
  4.3434 +  test -z "$as_dir" && as_dir=.
  4.3435 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3436 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3437 +    ac_cv_path_LS="$as_dir/$ac_word$ac_exec_ext"
  4.3438 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3439 +    break 2
  4.3440 +  fi
  4.3441 +done
  4.3442 +  done
  4.3443 +IFS=$as_save_IFS
  4.3444 +
  4.3445 +  ;;
  4.3446 +esac
  4.3447 +fi
  4.3448 +LS=$ac_cv_path_LS
  4.3449 +if test -n "$LS"; then
  4.3450 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LS" >&5
  4.3451 +$as_echo "$LS" >&6; }
  4.3452 +else
  4.3453 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3454 +$as_echo "no" >&6; }
  4.3455 +fi
  4.3456 +
  4.3457 +
  4.3458 +        if test "x$LS" = x; then
  4.3459 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.3460 +        fi
  4.3461 +      else
  4.3462 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.3463 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool LS=$tool_specified" >&5
  4.3464 +$as_echo "$as_me: Will use user supplied tool LS=$tool_specified" >&6;}
  4.3465 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LS" >&5
  4.3466 +$as_echo_n "checking for LS... " >&6; }
  4.3467 +        if test ! -x "$tool_specified"; then
  4.3468 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.3469 +$as_echo "not found" >&6; }
  4.3470 +          as_fn_error $? "User supplied tool LS=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.3471 +        fi
  4.3472 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.3473 +$as_echo "$tool_specified" >&6; }
  4.3474 +      fi
  4.3475 +    fi
  4.3476 +  fi
  4.3477 +
  4.3478 +
  4.3479  
  4.3480    if test "x$LS" = x; then
  4.3481 -    if test "xls" = x; then
  4.3482 -      PROG_NAME=ls
  4.3483 -    else
  4.3484 -      PROG_NAME=ls
  4.3485 -    fi
  4.3486 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.3487 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.3488 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.3489 -  fi
  4.3490 -
  4.3491 -
  4.3492 -
  4.3493 -  for ac_prog in mkdir
  4.3494 +    as_fn_error $? "Could not find required tool for LS" "$LINENO" 5
  4.3495 +  fi
  4.3496 +
  4.3497 +
  4.3498 +
  4.3499 +
  4.3500 +
  4.3501 +  # Publish this variable in the help.
  4.3502 +
  4.3503 +
  4.3504 +  if test "x$MKDIR" = x; then
  4.3505 +    # The variable is not set by user, try to locate tool using the code snippet
  4.3506 +    for ac_prog in mkdir
  4.3507  do
  4.3508    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3509  set dummy $ac_prog; ac_word=$2
  4.3510 @@ -5110,21 +7826,155 @@
  4.3511    test -n "$MKDIR" && break
  4.3512  done
  4.3513  
  4.3514 +  else
  4.3515 +    # The variable is set, but is it from the command line or the environment?
  4.3516 +
  4.3517 +    # Try to remove the string !MKDIR! from our list.
  4.3518 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!MKDIR!/}
  4.3519 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.3520 +      # If it failed, the variable was not from the command line. Ignore it,
  4.3521 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.3522 +      if test "xMKDIR" != xBASH; then
  4.3523 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of MKDIR from the environment. Use command line variables instead." >&5
  4.3524 +$as_echo "$as_me: WARNING: Ignoring value of MKDIR from the environment. Use command line variables instead." >&2;}
  4.3525 +      fi
  4.3526 +      # Try to locate tool using the code snippet
  4.3527 +      for ac_prog in mkdir
  4.3528 +do
  4.3529 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3530 +set dummy $ac_prog; ac_word=$2
  4.3531 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3532 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3533 +if ${ac_cv_path_MKDIR+:} false; then :
  4.3534 +  $as_echo_n "(cached) " >&6
  4.3535 +else
  4.3536 +  case $MKDIR in
  4.3537 +  [\\/]* | ?:[\\/]*)
  4.3538 +  ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path.
  4.3539 +  ;;
  4.3540 +  *)
  4.3541 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3542 +for as_dir in $PATH
  4.3543 +do
  4.3544 +  IFS=$as_save_IFS
  4.3545 +  test -z "$as_dir" && as_dir=.
  4.3546 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3547 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3548 +    ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
  4.3549 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3550 +    break 2
  4.3551 +  fi
  4.3552 +done
  4.3553 +  done
  4.3554 +IFS=$as_save_IFS
  4.3555 +
  4.3556 +  ;;
  4.3557 +esac
  4.3558 +fi
  4.3559 +MKDIR=$ac_cv_path_MKDIR
  4.3560 +if test -n "$MKDIR"; then
  4.3561 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR" >&5
  4.3562 +$as_echo "$MKDIR" >&6; }
  4.3563 +else
  4.3564 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3565 +$as_echo "no" >&6; }
  4.3566 +fi
  4.3567 +
  4.3568 +
  4.3569 +  test -n "$MKDIR" && break
  4.3570 +done
  4.3571 +
  4.3572 +    else
  4.3573 +      # If it succeeded, then it was overridden by the user. We will use it
  4.3574 +      # for the tool.
  4.3575 +
  4.3576 +      # First remove it from the list of overridden variables, so we can test
  4.3577 +      # for unknown variables in the end.
  4.3578 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.3579 +
  4.3580 +      # Check if the provided tool contains a complete path.
  4.3581 +      tool_specified="$MKDIR"
  4.3582 +      tool_basename="${tool_specified##*/}"
  4.3583 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.3584 +        # A command without a complete path is provided, search $PATH.
  4.3585 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool MKDIR=$tool_basename" >&5
  4.3586 +$as_echo "$as_me: Will search for user supplied tool MKDIR=$tool_basename" >&6;}
  4.3587 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.3588 +set dummy $tool_basename; ac_word=$2
  4.3589 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3590 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3591 +if ${ac_cv_path_MKDIR+:} false; then :
  4.3592 +  $as_echo_n "(cached) " >&6
  4.3593 +else
  4.3594 +  case $MKDIR in
  4.3595 +  [\\/]* | ?:[\\/]*)
  4.3596 +  ac_cv_path_MKDIR="$MKDIR" # Let the user override the test with a path.
  4.3597 +  ;;
  4.3598 +  *)
  4.3599 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3600 +for as_dir in $PATH
  4.3601 +do
  4.3602 +  IFS=$as_save_IFS
  4.3603 +  test -z "$as_dir" && as_dir=.
  4.3604 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3605 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3606 +    ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
  4.3607 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3608 +    break 2
  4.3609 +  fi
  4.3610 +done
  4.3611 +  done
  4.3612 +IFS=$as_save_IFS
  4.3613 +
  4.3614 +  ;;
  4.3615 +esac
  4.3616 +fi
  4.3617 +MKDIR=$ac_cv_path_MKDIR
  4.3618 +if test -n "$MKDIR"; then
  4.3619 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR" >&5
  4.3620 +$as_echo "$MKDIR" >&6; }
  4.3621 +else
  4.3622 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3623 +$as_echo "no" >&6; }
  4.3624 +fi
  4.3625 +
  4.3626 +
  4.3627 +        if test "x$MKDIR" = x; then
  4.3628 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.3629 +        fi
  4.3630 +      else
  4.3631 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.3632 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool MKDIR=$tool_specified" >&5
  4.3633 +$as_echo "$as_me: Will use user supplied tool MKDIR=$tool_specified" >&6;}
  4.3634 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MKDIR" >&5
  4.3635 +$as_echo_n "checking for MKDIR... " >&6; }
  4.3636 +        if test ! -x "$tool_specified"; then
  4.3637 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.3638 +$as_echo "not found" >&6; }
  4.3639 +          as_fn_error $? "User supplied tool MKDIR=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.3640 +        fi
  4.3641 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.3642 +$as_echo "$tool_specified" >&6; }
  4.3643 +      fi
  4.3644 +    fi
  4.3645 +  fi
  4.3646 +
  4.3647 +
  4.3648  
  4.3649    if test "x$MKDIR" = x; then
  4.3650 -    if test "xmkdir" = x; then
  4.3651 -      PROG_NAME=mkdir
  4.3652 -    else
  4.3653 -      PROG_NAME=mkdir
  4.3654 -    fi
  4.3655 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.3656 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.3657 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.3658 -  fi
  4.3659 -
  4.3660 -
  4.3661 -
  4.3662 -  for ac_prog in mktemp
  4.3663 +    as_fn_error $? "Could not find required tool for MKDIR" "$LINENO" 5
  4.3664 +  fi
  4.3665 +
  4.3666 +
  4.3667 +
  4.3668 +
  4.3669 +
  4.3670 +  # Publish this variable in the help.
  4.3671 +
  4.3672 +
  4.3673 +  if test "x$MKTEMP" = x; then
  4.3674 +    # The variable is not set by user, try to locate tool using the code snippet
  4.3675 +    for ac_prog in mktemp
  4.3676  do
  4.3677    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3678  set dummy $ac_prog; ac_word=$2
  4.3679 @@ -5169,21 +8019,155 @@
  4.3680    test -n "$MKTEMP" && break
  4.3681  done
  4.3682  
  4.3683 +  else
  4.3684 +    # The variable is set, but is it from the command line or the environment?
  4.3685 +
  4.3686 +    # Try to remove the string !MKTEMP! from our list.
  4.3687 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!MKTEMP!/}
  4.3688 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.3689 +      # If it failed, the variable was not from the command line. Ignore it,
  4.3690 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.3691 +      if test "xMKTEMP" != xBASH; then
  4.3692 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of MKTEMP from the environment. Use command line variables instead." >&5
  4.3693 +$as_echo "$as_me: WARNING: Ignoring value of MKTEMP from the environment. Use command line variables instead." >&2;}
  4.3694 +      fi
  4.3695 +      # Try to locate tool using the code snippet
  4.3696 +      for ac_prog in mktemp
  4.3697 +do
  4.3698 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3699 +set dummy $ac_prog; ac_word=$2
  4.3700 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3701 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3702 +if ${ac_cv_path_MKTEMP+:} false; then :
  4.3703 +  $as_echo_n "(cached) " >&6
  4.3704 +else
  4.3705 +  case $MKTEMP in
  4.3706 +  [\\/]* | ?:[\\/]*)
  4.3707 +  ac_cv_path_MKTEMP="$MKTEMP" # Let the user override the test with a path.
  4.3708 +  ;;
  4.3709 +  *)
  4.3710 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3711 +for as_dir in $PATH
  4.3712 +do
  4.3713 +  IFS=$as_save_IFS
  4.3714 +  test -z "$as_dir" && as_dir=.
  4.3715 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3716 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3717 +    ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext"
  4.3718 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3719 +    break 2
  4.3720 +  fi
  4.3721 +done
  4.3722 +  done
  4.3723 +IFS=$as_save_IFS
  4.3724 +
  4.3725 +  ;;
  4.3726 +esac
  4.3727 +fi
  4.3728 +MKTEMP=$ac_cv_path_MKTEMP
  4.3729 +if test -n "$MKTEMP"; then
  4.3730 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKTEMP" >&5
  4.3731 +$as_echo "$MKTEMP" >&6; }
  4.3732 +else
  4.3733 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3734 +$as_echo "no" >&6; }
  4.3735 +fi
  4.3736 +
  4.3737 +
  4.3738 +  test -n "$MKTEMP" && break
  4.3739 +done
  4.3740 +
  4.3741 +    else
  4.3742 +      # If it succeeded, then it was overridden by the user. We will use it
  4.3743 +      # for the tool.
  4.3744 +
  4.3745 +      # First remove it from the list of overridden variables, so we can test
  4.3746 +      # for unknown variables in the end.
  4.3747 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.3748 +
  4.3749 +      # Check if the provided tool contains a complete path.
  4.3750 +      tool_specified="$MKTEMP"
  4.3751 +      tool_basename="${tool_specified##*/}"
  4.3752 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.3753 +        # A command without a complete path is provided, search $PATH.
  4.3754 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool MKTEMP=$tool_basename" >&5
  4.3755 +$as_echo "$as_me: Will search for user supplied tool MKTEMP=$tool_basename" >&6;}
  4.3756 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.3757 +set dummy $tool_basename; ac_word=$2
  4.3758 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3759 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3760 +if ${ac_cv_path_MKTEMP+:} false; then :
  4.3761 +  $as_echo_n "(cached) " >&6
  4.3762 +else
  4.3763 +  case $MKTEMP in
  4.3764 +  [\\/]* | ?:[\\/]*)
  4.3765 +  ac_cv_path_MKTEMP="$MKTEMP" # Let the user override the test with a path.
  4.3766 +  ;;
  4.3767 +  *)
  4.3768 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3769 +for as_dir in $PATH
  4.3770 +do
  4.3771 +  IFS=$as_save_IFS
  4.3772 +  test -z "$as_dir" && as_dir=.
  4.3773 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3774 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3775 +    ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext"
  4.3776 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3777 +    break 2
  4.3778 +  fi
  4.3779 +done
  4.3780 +  done
  4.3781 +IFS=$as_save_IFS
  4.3782 +
  4.3783 +  ;;
  4.3784 +esac
  4.3785 +fi
  4.3786 +MKTEMP=$ac_cv_path_MKTEMP
  4.3787 +if test -n "$MKTEMP"; then
  4.3788 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKTEMP" >&5
  4.3789 +$as_echo "$MKTEMP" >&6; }
  4.3790 +else
  4.3791 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3792 +$as_echo "no" >&6; }
  4.3793 +fi
  4.3794 +
  4.3795 +
  4.3796 +        if test "x$MKTEMP" = x; then
  4.3797 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.3798 +        fi
  4.3799 +      else
  4.3800 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.3801 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool MKTEMP=$tool_specified" >&5
  4.3802 +$as_echo "$as_me: Will use user supplied tool MKTEMP=$tool_specified" >&6;}
  4.3803 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MKTEMP" >&5
  4.3804 +$as_echo_n "checking for MKTEMP... " >&6; }
  4.3805 +        if test ! -x "$tool_specified"; then
  4.3806 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.3807 +$as_echo "not found" >&6; }
  4.3808 +          as_fn_error $? "User supplied tool MKTEMP=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.3809 +        fi
  4.3810 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.3811 +$as_echo "$tool_specified" >&6; }
  4.3812 +      fi
  4.3813 +    fi
  4.3814 +  fi
  4.3815 +
  4.3816 +
  4.3817  
  4.3818    if test "x$MKTEMP" = x; then
  4.3819 -    if test "xmktemp" = x; then
  4.3820 -      PROG_NAME=mktemp
  4.3821 -    else
  4.3822 -      PROG_NAME=mktemp
  4.3823 -    fi
  4.3824 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.3825 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.3826 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.3827 -  fi
  4.3828 -
  4.3829 -
  4.3830 -
  4.3831 -  for ac_prog in mv
  4.3832 +    as_fn_error $? "Could not find required tool for MKTEMP" "$LINENO" 5
  4.3833 +  fi
  4.3834 +
  4.3835 +
  4.3836 +
  4.3837 +
  4.3838 +
  4.3839 +  # Publish this variable in the help.
  4.3840 +
  4.3841 +
  4.3842 +  if test "x$MV" = x; then
  4.3843 +    # The variable is not set by user, try to locate tool using the code snippet
  4.3844 +    for ac_prog in mv
  4.3845  do
  4.3846    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3847  set dummy $ac_prog; ac_word=$2
  4.3848 @@ -5228,21 +8212,348 @@
  4.3849    test -n "$MV" && break
  4.3850  done
  4.3851  
  4.3852 +  else
  4.3853 +    # The variable is set, but is it from the command line or the environment?
  4.3854 +
  4.3855 +    # Try to remove the string !MV! from our list.
  4.3856 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!MV!/}
  4.3857 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.3858 +      # If it failed, the variable was not from the command line. Ignore it,
  4.3859 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.3860 +      if test "xMV" != xBASH; then
  4.3861 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of MV from the environment. Use command line variables instead." >&5
  4.3862 +$as_echo "$as_me: WARNING: Ignoring value of MV from the environment. Use command line variables instead." >&2;}
  4.3863 +      fi
  4.3864 +      # Try to locate tool using the code snippet
  4.3865 +      for ac_prog in mv
  4.3866 +do
  4.3867 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.3868 +set dummy $ac_prog; ac_word=$2
  4.3869 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3870 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3871 +if ${ac_cv_path_MV+:} false; then :
  4.3872 +  $as_echo_n "(cached) " >&6
  4.3873 +else
  4.3874 +  case $MV in
  4.3875 +  [\\/]* | ?:[\\/]*)
  4.3876 +  ac_cv_path_MV="$MV" # Let the user override the test with a path.
  4.3877 +  ;;
  4.3878 +  *)
  4.3879 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3880 +for as_dir in $PATH
  4.3881 +do
  4.3882 +  IFS=$as_save_IFS
  4.3883 +  test -z "$as_dir" && as_dir=.
  4.3884 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3885 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3886 +    ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
  4.3887 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3888 +    break 2
  4.3889 +  fi
  4.3890 +done
  4.3891 +  done
  4.3892 +IFS=$as_save_IFS
  4.3893 +
  4.3894 +  ;;
  4.3895 +esac
  4.3896 +fi
  4.3897 +MV=$ac_cv_path_MV
  4.3898 +if test -n "$MV"; then
  4.3899 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5
  4.3900 +$as_echo "$MV" >&6; }
  4.3901 +else
  4.3902 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3903 +$as_echo "no" >&6; }
  4.3904 +fi
  4.3905 +
  4.3906 +
  4.3907 +  test -n "$MV" && break
  4.3908 +done
  4.3909 +
  4.3910 +    else
  4.3911 +      # If it succeeded, then it was overridden by the user. We will use it
  4.3912 +      # for the tool.
  4.3913 +
  4.3914 +      # First remove it from the list of overridden variables, so we can test
  4.3915 +      # for unknown variables in the end.
  4.3916 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.3917 +
  4.3918 +      # Check if the provided tool contains a complete path.
  4.3919 +      tool_specified="$MV"
  4.3920 +      tool_basename="${tool_specified##*/}"
  4.3921 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.3922 +        # A command without a complete path is provided, search $PATH.
  4.3923 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool MV=$tool_basename" >&5
  4.3924 +$as_echo "$as_me: Will search for user supplied tool MV=$tool_basename" >&6;}
  4.3925 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.3926 +set dummy $tool_basename; ac_word=$2
  4.3927 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.3928 +$as_echo_n "checking for $ac_word... " >&6; }
  4.3929 +if ${ac_cv_path_MV+:} false; then :
  4.3930 +  $as_echo_n "(cached) " >&6
  4.3931 +else
  4.3932 +  case $MV in
  4.3933 +  [\\/]* | ?:[\\/]*)
  4.3934 +  ac_cv_path_MV="$MV" # Let the user override the test with a path.
  4.3935 +  ;;
  4.3936 +  *)
  4.3937 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.3938 +for as_dir in $PATH
  4.3939 +do
  4.3940 +  IFS=$as_save_IFS
  4.3941 +  test -z "$as_dir" && as_dir=.
  4.3942 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.3943 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.3944 +    ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
  4.3945 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.3946 +    break 2
  4.3947 +  fi
  4.3948 +done
  4.3949 +  done
  4.3950 +IFS=$as_save_IFS
  4.3951 +
  4.3952 +  ;;
  4.3953 +esac
  4.3954 +fi
  4.3955 +MV=$ac_cv_path_MV
  4.3956 +if test -n "$MV"; then
  4.3957 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5
  4.3958 +$as_echo "$MV" >&6; }
  4.3959 +else
  4.3960 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.3961 +$as_echo "no" >&6; }
  4.3962 +fi
  4.3963 +
  4.3964 +
  4.3965 +        if test "x$MV" = x; then
  4.3966 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.3967 +        fi
  4.3968 +      else
  4.3969 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.3970 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool MV=$tool_specified" >&5
  4.3971 +$as_echo "$as_me: Will use user supplied tool MV=$tool_specified" >&6;}
  4.3972 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MV" >&5
  4.3973 +$as_echo_n "checking for MV... " >&6; }
  4.3974 +        if test ! -x "$tool_specified"; then
  4.3975 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.3976 +$as_echo "not found" >&6; }
  4.3977 +          as_fn_error $? "User supplied tool MV=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.3978 +        fi
  4.3979 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.3980 +$as_echo "$tool_specified" >&6; }
  4.3981 +      fi
  4.3982 +    fi
  4.3983 +  fi
  4.3984 +
  4.3985 +
  4.3986  
  4.3987    if test "x$MV" = x; then
  4.3988 -    if test "xmv" = x; then
  4.3989 -      PROG_NAME=mv
  4.3990 -    else
  4.3991 -      PROG_NAME=mv
  4.3992 -    fi
  4.3993 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.3994 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.3995 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.3996 -  fi
  4.3997 -
  4.3998 -
  4.3999 -
  4.4000 -  for ac_prog in printf
  4.4001 +    as_fn_error $? "Could not find required tool for MV" "$LINENO" 5
  4.4002 +  fi
  4.4003 +
  4.4004 +
  4.4005 +
  4.4006 +
  4.4007 +
  4.4008 +  # Publish this variable in the help.
  4.4009 +
  4.4010 +
  4.4011 +  if test "x$NAWK" = x; then
  4.4012 +    # The variable is not set by user, try to locate tool using the code snippet
  4.4013 +    for ac_prog in nawk gawk awk
  4.4014 +do
  4.4015 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4016 +set dummy $ac_prog; ac_word=$2
  4.4017 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4018 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4019 +if ${ac_cv_path_NAWK+:} false; then :
  4.4020 +  $as_echo_n "(cached) " >&6
  4.4021 +else
  4.4022 +  case $NAWK in
  4.4023 +  [\\/]* | ?:[\\/]*)
  4.4024 +  ac_cv_path_NAWK="$NAWK" # Let the user override the test with a path.
  4.4025 +  ;;
  4.4026 +  *)
  4.4027 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4028 +for as_dir in $PATH
  4.4029 +do
  4.4030 +  IFS=$as_save_IFS
  4.4031 +  test -z "$as_dir" && as_dir=.
  4.4032 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4033 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4034 +    ac_cv_path_NAWK="$as_dir/$ac_word$ac_exec_ext"
  4.4035 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4036 +    break 2
  4.4037 +  fi
  4.4038 +done
  4.4039 +  done
  4.4040 +IFS=$as_save_IFS
  4.4041 +
  4.4042 +  ;;
  4.4043 +esac
  4.4044 +fi
  4.4045 +NAWK=$ac_cv_path_NAWK
  4.4046 +if test -n "$NAWK"; then
  4.4047 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NAWK" >&5
  4.4048 +$as_echo "$NAWK" >&6; }
  4.4049 +else
  4.4050 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4051 +$as_echo "no" >&6; }
  4.4052 +fi
  4.4053 +
  4.4054 +
  4.4055 +  test -n "$NAWK" && break
  4.4056 +done
  4.4057 +
  4.4058 +  else
  4.4059 +    # The variable is set, but is it from the command line or the environment?
  4.4060 +
  4.4061 +    # Try to remove the string !NAWK! from our list.
  4.4062 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!NAWK!/}
  4.4063 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.4064 +      # If it failed, the variable was not from the command line. Ignore it,
  4.4065 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.4066 +      if test "xNAWK" != xBASH; then
  4.4067 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of NAWK from the environment. Use command line variables instead." >&5
  4.4068 +$as_echo "$as_me: WARNING: Ignoring value of NAWK from the environment. Use command line variables instead." >&2;}
  4.4069 +      fi
  4.4070 +      # Try to locate tool using the code snippet
  4.4071 +      for ac_prog in nawk gawk awk
  4.4072 +do
  4.4073 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4074 +set dummy $ac_prog; ac_word=$2
  4.4075 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4076 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4077 +if ${ac_cv_path_NAWK+:} false; then :
  4.4078 +  $as_echo_n "(cached) " >&6
  4.4079 +else
  4.4080 +  case $NAWK in
  4.4081 +  [\\/]* | ?:[\\/]*)
  4.4082 +  ac_cv_path_NAWK="$NAWK" # Let the user override the test with a path.
  4.4083 +  ;;
  4.4084 +  *)
  4.4085 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4086 +for as_dir in $PATH
  4.4087 +do
  4.4088 +  IFS=$as_save_IFS
  4.4089 +  test -z "$as_dir" && as_dir=.
  4.4090 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4091 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4092 +    ac_cv_path_NAWK="$as_dir/$ac_word$ac_exec_ext"
  4.4093 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4094 +    break 2
  4.4095 +  fi
  4.4096 +done
  4.4097 +  done
  4.4098 +IFS=$as_save_IFS
  4.4099 +
  4.4100 +  ;;
  4.4101 +esac
  4.4102 +fi
  4.4103 +NAWK=$ac_cv_path_NAWK
  4.4104 +if test -n "$NAWK"; then
  4.4105 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NAWK" >&5
  4.4106 +$as_echo "$NAWK" >&6; }
  4.4107 +else
  4.4108 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4109 +$as_echo "no" >&6; }
  4.4110 +fi
  4.4111 +
  4.4112 +
  4.4113 +  test -n "$NAWK" && break
  4.4114 +done
  4.4115 +
  4.4116 +    else
  4.4117 +      # If it succeeded, then it was overridden by the user. We will use it
  4.4118 +      # for the tool.
  4.4119 +
  4.4120 +      # First remove it from the list of overridden variables, so we can test
  4.4121 +      # for unknown variables in the end.
  4.4122 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.4123 +
  4.4124 +      # Check if the provided tool contains a complete path.
  4.4125 +      tool_specified="$NAWK"
  4.4126 +      tool_basename="${tool_specified##*/}"
  4.4127 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.4128 +        # A command without a complete path is provided, search $PATH.
  4.4129 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool NAWK=$tool_basename" >&5
  4.4130 +$as_echo "$as_me: Will search for user supplied tool NAWK=$tool_basename" >&6;}
  4.4131 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.4132 +set dummy $tool_basename; ac_word=$2
  4.4133 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4134 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4135 +if ${ac_cv_path_NAWK+:} false; then :
  4.4136 +  $as_echo_n "(cached) " >&6
  4.4137 +else
  4.4138 +  case $NAWK in
  4.4139 +  [\\/]* | ?:[\\/]*)
  4.4140 +  ac_cv_path_NAWK="$NAWK" # Let the user override the test with a path.
  4.4141 +  ;;
  4.4142 +  *)
  4.4143 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4144 +for as_dir in $PATH
  4.4145 +do
  4.4146 +  IFS=$as_save_IFS
  4.4147 +  test -z "$as_dir" && as_dir=.
  4.4148 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4149 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4150 +    ac_cv_path_NAWK="$as_dir/$ac_word$ac_exec_ext"
  4.4151 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4152 +    break 2
  4.4153 +  fi
  4.4154 +done
  4.4155 +  done
  4.4156 +IFS=$as_save_IFS
  4.4157 +
  4.4158 +  ;;
  4.4159 +esac
  4.4160 +fi
  4.4161 +NAWK=$ac_cv_path_NAWK
  4.4162 +if test -n "$NAWK"; then
  4.4163 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NAWK" >&5
  4.4164 +$as_echo "$NAWK" >&6; }
  4.4165 +else
  4.4166 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4167 +$as_echo "no" >&6; }
  4.4168 +fi
  4.4169 +
  4.4170 +
  4.4171 +        if test "x$NAWK" = x; then
  4.4172 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.4173 +        fi
  4.4174 +      else
  4.4175 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.4176 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool NAWK=$tool_specified" >&5
  4.4177 +$as_echo "$as_me: Will use user supplied tool NAWK=$tool_specified" >&6;}
  4.4178 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAWK" >&5
  4.4179 +$as_echo_n "checking for NAWK... " >&6; }
  4.4180 +        if test ! -x "$tool_specified"; then
  4.4181 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.4182 +$as_echo "not found" >&6; }
  4.4183 +          as_fn_error $? "User supplied tool NAWK=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.4184 +        fi
  4.4185 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.4186 +$as_echo "$tool_specified" >&6; }
  4.4187 +      fi
  4.4188 +    fi
  4.4189 +  fi
  4.4190 +
  4.4191 +
  4.4192 +
  4.4193 +  if test "x$NAWK" = x; then
  4.4194 +    as_fn_error $? "Could not find required tool for NAWK" "$LINENO" 5
  4.4195 +  fi
  4.4196 +
  4.4197 +
  4.4198 +
  4.4199 +
  4.4200 +
  4.4201 +  # Publish this variable in the help.
  4.4202 +
  4.4203 +
  4.4204 +  if test "x$PRINTF" = x; then
  4.4205 +    # The variable is not set by user, try to locate tool using the code snippet
  4.4206 +    for ac_prog in printf
  4.4207  do
  4.4208    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4209  set dummy $ac_prog; ac_word=$2
  4.4210 @@ -5287,21 +8598,155 @@
  4.4211    test -n "$PRINTF" && break
  4.4212  done
  4.4213  
  4.4214 +  else
  4.4215 +    # The variable is set, but is it from the command line or the environment?
  4.4216 +
  4.4217 +    # Try to remove the string !PRINTF! from our list.
  4.4218 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!PRINTF!/}
  4.4219 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.4220 +      # If it failed, the variable was not from the command line. Ignore it,
  4.4221 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.4222 +      if test "xPRINTF" != xBASH; then
  4.4223 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of PRINTF from the environment. Use command line variables instead." >&5
  4.4224 +$as_echo "$as_me: WARNING: Ignoring value of PRINTF from the environment. Use command line variables instead." >&2;}
  4.4225 +      fi
  4.4226 +      # Try to locate tool using the code snippet
  4.4227 +      for ac_prog in printf
  4.4228 +do
  4.4229 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4230 +set dummy $ac_prog; ac_word=$2
  4.4231 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4232 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4233 +if ${ac_cv_path_PRINTF+:} false; then :
  4.4234 +  $as_echo_n "(cached) " >&6
  4.4235 +else
  4.4236 +  case $PRINTF in
  4.4237 +  [\\/]* | ?:[\\/]*)
  4.4238 +  ac_cv_path_PRINTF="$PRINTF" # Let the user override the test with a path.
  4.4239 +  ;;
  4.4240 +  *)
  4.4241 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4242 +for as_dir in $PATH
  4.4243 +do
  4.4244 +  IFS=$as_save_IFS
  4.4245 +  test -z "$as_dir" && as_dir=.
  4.4246 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4247 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4248 +    ac_cv_path_PRINTF="$as_dir/$ac_word$ac_exec_ext"
  4.4249 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4250 +    break 2
  4.4251 +  fi
  4.4252 +done
  4.4253 +  done
  4.4254 +IFS=$as_save_IFS
  4.4255 +
  4.4256 +  ;;
  4.4257 +esac
  4.4258 +fi
  4.4259 +PRINTF=$ac_cv_path_PRINTF
  4.4260 +if test -n "$PRINTF"; then
  4.4261 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRINTF" >&5
  4.4262 +$as_echo "$PRINTF" >&6; }
  4.4263 +else
  4.4264 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4265 +$as_echo "no" >&6; }
  4.4266 +fi
  4.4267 +
  4.4268 +
  4.4269 +  test -n "$PRINTF" && break
  4.4270 +done
  4.4271 +
  4.4272 +    else
  4.4273 +      # If it succeeded, then it was overridden by the user. We will use it
  4.4274 +      # for the tool.
  4.4275 +
  4.4276 +      # First remove it from the list of overridden variables, so we can test
  4.4277 +      # for unknown variables in the end.
  4.4278 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.4279 +
  4.4280 +      # Check if the provided tool contains a complete path.
  4.4281 +      tool_specified="$PRINTF"
  4.4282 +      tool_basename="${tool_specified##*/}"
  4.4283 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.4284 +        # A command without a complete path is provided, search $PATH.
  4.4285 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool PRINTF=$tool_basename" >&5
  4.4286 +$as_echo "$as_me: Will search for user supplied tool PRINTF=$tool_basename" >&6;}
  4.4287 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.4288 +set dummy $tool_basename; ac_word=$2
  4.4289 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4290 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4291 +if ${ac_cv_path_PRINTF+:} false; then :
  4.4292 +  $as_echo_n "(cached) " >&6
  4.4293 +else
  4.4294 +  case $PRINTF in
  4.4295 +  [\\/]* | ?:[\\/]*)
  4.4296 +  ac_cv_path_PRINTF="$PRINTF" # Let the user override the test with a path.
  4.4297 +  ;;
  4.4298 +  *)
  4.4299 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4300 +for as_dir in $PATH
  4.4301 +do
  4.4302 +  IFS=$as_save_IFS
  4.4303 +  test -z "$as_dir" && as_dir=.
  4.4304 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4305 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4306 +    ac_cv_path_PRINTF="$as_dir/$ac_word$ac_exec_ext"
  4.4307 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4308 +    break 2
  4.4309 +  fi
  4.4310 +done
  4.4311 +  done
  4.4312 +IFS=$as_save_IFS
  4.4313 +
  4.4314 +  ;;
  4.4315 +esac
  4.4316 +fi
  4.4317 +PRINTF=$ac_cv_path_PRINTF
  4.4318 +if test -n "$PRINTF"; then
  4.4319 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRINTF" >&5
  4.4320 +$as_echo "$PRINTF" >&6; }
  4.4321 +else
  4.4322 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4323 +$as_echo "no" >&6; }
  4.4324 +fi
  4.4325 +
  4.4326 +
  4.4327 +        if test "x$PRINTF" = x; then
  4.4328 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.4329 +        fi
  4.4330 +      else
  4.4331 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.4332 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool PRINTF=$tool_specified" >&5
  4.4333 +$as_echo "$as_me: Will use user supplied tool PRINTF=$tool_specified" >&6;}
  4.4334 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PRINTF" >&5
  4.4335 +$as_echo_n "checking for PRINTF... " >&6; }
  4.4336 +        if test ! -x "$tool_specified"; then
  4.4337 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.4338 +$as_echo "not found" >&6; }
  4.4339 +          as_fn_error $? "User supplied tool PRINTF=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.4340 +        fi
  4.4341 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.4342 +$as_echo "$tool_specified" >&6; }
  4.4343 +      fi
  4.4344 +    fi
  4.4345 +  fi
  4.4346 +
  4.4347 +
  4.4348  
  4.4349    if test "x$PRINTF" = x; then
  4.4350 -    if test "xprintf" = x; then
  4.4351 -      PROG_NAME=printf
  4.4352 -    else
  4.4353 -      PROG_NAME=printf
  4.4354 -    fi
  4.4355 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.4356 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.4357 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.4358 -  fi
  4.4359 -
  4.4360 -
  4.4361 -
  4.4362 -  for ac_prog in rm
  4.4363 +    as_fn_error $? "Could not find required tool for PRINTF" "$LINENO" 5
  4.4364 +  fi
  4.4365 +
  4.4366 +
  4.4367 +
  4.4368 +
  4.4369 +
  4.4370 +  # Publish this variable in the help.
  4.4371 +
  4.4372 +
  4.4373 +  if test "x$RM" = x; then
  4.4374 +    # The variable is not set by user, try to locate tool using the code snippet
  4.4375 +    for ac_prog in rm
  4.4376  do
  4.4377    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4378  set dummy $ac_prog; ac_word=$2
  4.4379 @@ -5346,21 +8791,155 @@
  4.4380    test -n "$RM" && break
  4.4381  done
  4.4382  
  4.4383 +  else
  4.4384 +    # The variable is set, but is it from the command line or the environment?
  4.4385 +
  4.4386 +    # Try to remove the string !RM! from our list.
  4.4387 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!RM!/}
  4.4388 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.4389 +      # If it failed, the variable was not from the command line. Ignore it,
  4.4390 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.4391 +      if test "xRM" != xBASH; then
  4.4392 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of RM from the environment. Use command line variables instead." >&5
  4.4393 +$as_echo "$as_me: WARNING: Ignoring value of RM from the environment. Use command line variables instead." >&2;}
  4.4394 +      fi
  4.4395 +      # Try to locate tool using the code snippet
  4.4396 +      for ac_prog in rm
  4.4397 +do
  4.4398 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4399 +set dummy $ac_prog; ac_word=$2
  4.4400 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4401 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4402 +if ${ac_cv_path_RM+:} false; then :
  4.4403 +  $as_echo_n "(cached) " >&6
  4.4404 +else
  4.4405 +  case $RM in
  4.4406 +  [\\/]* | ?:[\\/]*)
  4.4407 +  ac_cv_path_RM="$RM" # Let the user override the test with a path.
  4.4408 +  ;;
  4.4409 +  *)
  4.4410 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4411 +for as_dir in $PATH
  4.4412 +do
  4.4413 +  IFS=$as_save_IFS
  4.4414 +  test -z "$as_dir" && as_dir=.
  4.4415 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4416 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4417 +    ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
  4.4418 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4419 +    break 2
  4.4420 +  fi
  4.4421 +done
  4.4422 +  done
  4.4423 +IFS=$as_save_IFS
  4.4424 +
  4.4425 +  ;;
  4.4426 +esac
  4.4427 +fi
  4.4428 +RM=$ac_cv_path_RM
  4.4429 +if test -n "$RM"; then
  4.4430 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
  4.4431 +$as_echo "$RM" >&6; }
  4.4432 +else
  4.4433 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4434 +$as_echo "no" >&6; }
  4.4435 +fi
  4.4436 +
  4.4437 +
  4.4438 +  test -n "$RM" && break
  4.4439 +done
  4.4440 +
  4.4441 +    else
  4.4442 +      # If it succeeded, then it was overridden by the user. We will use it
  4.4443 +      # for the tool.
  4.4444 +
  4.4445 +      # First remove it from the list of overridden variables, so we can test
  4.4446 +      # for unknown variables in the end.
  4.4447 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.4448 +
  4.4449 +      # Check if the provided tool contains a complete path.
  4.4450 +      tool_specified="$RM"
  4.4451 +      tool_basename="${tool_specified##*/}"
  4.4452 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.4453 +        # A command without a complete path is provided, search $PATH.
  4.4454 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool RM=$tool_basename" >&5
  4.4455 +$as_echo "$as_me: Will search for user supplied tool RM=$tool_basename" >&6;}
  4.4456 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.4457 +set dummy $tool_basename; ac_word=$2
  4.4458 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4459 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4460 +if ${ac_cv_path_RM+:} false; then :
  4.4461 +  $as_echo_n "(cached) " >&6
  4.4462 +else
  4.4463 +  case $RM in
  4.4464 +  [\\/]* | ?:[\\/]*)
  4.4465 +  ac_cv_path_RM="$RM" # Let the user override the test with a path.
  4.4466 +  ;;
  4.4467 +  *)
  4.4468 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4469 +for as_dir in $PATH
  4.4470 +do
  4.4471 +  IFS=$as_save_IFS
  4.4472 +  test -z "$as_dir" && as_dir=.
  4.4473 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4474 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4475 +    ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
  4.4476 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4477 +    break 2
  4.4478 +  fi
  4.4479 +done
  4.4480 +  done
  4.4481 +IFS=$as_save_IFS
  4.4482 +
  4.4483 +  ;;
  4.4484 +esac
  4.4485 +fi
  4.4486 +RM=$ac_cv_path_RM
  4.4487 +if test -n "$RM"; then
  4.4488 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
  4.4489 +$as_echo "$RM" >&6; }
  4.4490 +else
  4.4491 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4492 +$as_echo "no" >&6; }
  4.4493 +fi
  4.4494 +
  4.4495 +
  4.4496 +        if test "x$RM" = x; then
  4.4497 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.4498 +        fi
  4.4499 +      else
  4.4500 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.4501 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool RM=$tool_specified" >&5
  4.4502 +$as_echo "$as_me: Will use user supplied tool RM=$tool_specified" >&6;}
  4.4503 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RM" >&5
  4.4504 +$as_echo_n "checking for RM... " >&6; }
  4.4505 +        if test ! -x "$tool_specified"; then
  4.4506 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.4507 +$as_echo "not found" >&6; }
  4.4508 +          as_fn_error $? "User supplied tool RM=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.4509 +        fi
  4.4510 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.4511 +$as_echo "$tool_specified" >&6; }
  4.4512 +      fi
  4.4513 +    fi
  4.4514 +  fi
  4.4515 +
  4.4516 +
  4.4517  
  4.4518    if test "x$RM" = x; then
  4.4519 -    if test "xrm" = x; then
  4.4520 -      PROG_NAME=rm
  4.4521 -    else
  4.4522 -      PROG_NAME=rm
  4.4523 -    fi
  4.4524 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.4525 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.4526 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.4527 -  fi
  4.4528 -
  4.4529 -
  4.4530 -
  4.4531 -  for ac_prog in sh
  4.4532 +    as_fn_error $? "Could not find required tool for RM" "$LINENO" 5
  4.4533 +  fi
  4.4534 +
  4.4535 +
  4.4536 +
  4.4537 +
  4.4538 +
  4.4539 +  # Publish this variable in the help.
  4.4540 +
  4.4541 +
  4.4542 +  if test "x$SH" = x; then
  4.4543 +    # The variable is not set by user, try to locate tool using the code snippet
  4.4544 +    for ac_prog in sh
  4.4545  do
  4.4546    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4547  set dummy $ac_prog; ac_word=$2
  4.4548 @@ -5405,21 +8984,155 @@
  4.4549    test -n "$SH" && break
  4.4550  done
  4.4551  
  4.4552 +  else
  4.4553 +    # The variable is set, but is it from the command line or the environment?
  4.4554 +
  4.4555 +    # Try to remove the string !SH! from our list.
  4.4556 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!SH!/}
  4.4557 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.4558 +      # If it failed, the variable was not from the command line. Ignore it,
  4.4559 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.4560 +      if test "xSH" != xBASH; then
  4.4561 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of SH from the environment. Use command line variables instead." >&5
  4.4562 +$as_echo "$as_me: WARNING: Ignoring value of SH from the environment. Use command line variables instead." >&2;}
  4.4563 +      fi
  4.4564 +      # Try to locate tool using the code snippet
  4.4565 +      for ac_prog in sh
  4.4566 +do
  4.4567 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4568 +set dummy $ac_prog; ac_word=$2
  4.4569 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4570 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4571 +if ${ac_cv_path_SH+:} false; then :
  4.4572 +  $as_echo_n "(cached) " >&6
  4.4573 +else
  4.4574 +  case $SH in
  4.4575 +  [\\/]* | ?:[\\/]*)
  4.4576 +  ac_cv_path_SH="$SH" # Let the user override the test with a path.
  4.4577 +  ;;
  4.4578 +  *)
  4.4579 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4580 +for as_dir in $PATH
  4.4581 +do
  4.4582 +  IFS=$as_save_IFS
  4.4583 +  test -z "$as_dir" && as_dir=.
  4.4584 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4585 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4586 +    ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext"
  4.4587 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4588 +    break 2
  4.4589 +  fi
  4.4590 +done
  4.4591 +  done
  4.4592 +IFS=$as_save_IFS
  4.4593 +
  4.4594 +  ;;
  4.4595 +esac
  4.4596 +fi
  4.4597 +SH=$ac_cv_path_SH
  4.4598 +if test -n "$SH"; then
  4.4599 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SH" >&5
  4.4600 +$as_echo "$SH" >&6; }
  4.4601 +else
  4.4602 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4603 +$as_echo "no" >&6; }
  4.4604 +fi
  4.4605 +
  4.4606 +
  4.4607 +  test -n "$SH" && break
  4.4608 +done
  4.4609 +
  4.4610 +    else
  4.4611 +      # If it succeeded, then it was overridden by the user. We will use it
  4.4612 +      # for the tool.
  4.4613 +
  4.4614 +      # First remove it from the list of overridden variables, so we can test
  4.4615 +      # for unknown variables in the end.
  4.4616 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.4617 +
  4.4618 +      # Check if the provided tool contains a complete path.
  4.4619 +      tool_specified="$SH"
  4.4620 +      tool_basename="${tool_specified##*/}"
  4.4621 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.4622 +        # A command without a complete path is provided, search $PATH.
  4.4623 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool SH=$tool_basename" >&5
  4.4624 +$as_echo "$as_me: Will search for user supplied tool SH=$tool_basename" >&6;}
  4.4625 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.4626 +set dummy $tool_basename; ac_word=$2
  4.4627 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4628 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4629 +if ${ac_cv_path_SH+:} false; then :
  4.4630 +  $as_echo_n "(cached) " >&6
  4.4631 +else
  4.4632 +  case $SH in
  4.4633 +  [\\/]* | ?:[\\/]*)
  4.4634 +  ac_cv_path_SH="$SH" # Let the user override the test with a path.
  4.4635 +  ;;
  4.4636 +  *)
  4.4637 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4638 +for as_dir in $PATH
  4.4639 +do
  4.4640 +  IFS=$as_save_IFS
  4.4641 +  test -z "$as_dir" && as_dir=.
  4.4642 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4643 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4644 +    ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext"
  4.4645 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4646 +    break 2
  4.4647 +  fi
  4.4648 +done
  4.4649 +  done
  4.4650 +IFS=$as_save_IFS
  4.4651 +
  4.4652 +  ;;
  4.4653 +esac
  4.4654 +fi
  4.4655 +SH=$ac_cv_path_SH
  4.4656 +if test -n "$SH"; then
  4.4657 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SH" >&5
  4.4658 +$as_echo "$SH" >&6; }
  4.4659 +else
  4.4660 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4661 +$as_echo "no" >&6; }
  4.4662 +fi
  4.4663 +
  4.4664 +
  4.4665 +        if test "x$SH" = x; then
  4.4666 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.4667 +        fi
  4.4668 +      else
  4.4669 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.4670 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool SH=$tool_specified" >&5
  4.4671 +$as_echo "$as_me: Will use user supplied tool SH=$tool_specified" >&6;}
  4.4672 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SH" >&5
  4.4673 +$as_echo_n "checking for SH... " >&6; }
  4.4674 +        if test ! -x "$tool_specified"; then
  4.4675 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.4676 +$as_echo "not found" >&6; }
  4.4677 +          as_fn_error $? "User supplied tool SH=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.4678 +        fi
  4.4679 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.4680 +$as_echo "$tool_specified" >&6; }
  4.4681 +      fi
  4.4682 +    fi
  4.4683 +  fi
  4.4684 +
  4.4685 +
  4.4686  
  4.4687    if test "x$SH" = x; then
  4.4688 -    if test "xsh" = x; then
  4.4689 -      PROG_NAME=sh
  4.4690 -    else
  4.4691 -      PROG_NAME=sh
  4.4692 -    fi
  4.4693 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.4694 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.4695 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.4696 -  fi
  4.4697 -
  4.4698 -
  4.4699 -
  4.4700 -  for ac_prog in sort
  4.4701 +    as_fn_error $? "Could not find required tool for SH" "$LINENO" 5
  4.4702 +  fi
  4.4703 +
  4.4704 +
  4.4705 +
  4.4706 +
  4.4707 +
  4.4708 +  # Publish this variable in the help.
  4.4709 +
  4.4710 +
  4.4711 +  if test "x$SORT" = x; then
  4.4712 +    # The variable is not set by user, try to locate tool using the code snippet
  4.4713 +    for ac_prog in sort
  4.4714  do
  4.4715    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4716  set dummy $ac_prog; ac_word=$2
  4.4717 @@ -5464,21 +9177,155 @@
  4.4718    test -n "$SORT" && break
  4.4719  done
  4.4720  
  4.4721 +  else
  4.4722 +    # The variable is set, but is it from the command line or the environment?
  4.4723 +
  4.4724 +    # Try to remove the string !SORT! from our list.
  4.4725 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!SORT!/}
  4.4726 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.4727 +      # If it failed, the variable was not from the command line. Ignore it,
  4.4728 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.4729 +      if test "xSORT" != xBASH; then
  4.4730 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of SORT from the environment. Use command line variables instead." >&5
  4.4731 +$as_echo "$as_me: WARNING: Ignoring value of SORT from the environment. Use command line variables instead." >&2;}
  4.4732 +      fi
  4.4733 +      # Try to locate tool using the code snippet
  4.4734 +      for ac_prog in sort
  4.4735 +do
  4.4736 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4737 +set dummy $ac_prog; ac_word=$2
  4.4738 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4739 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4740 +if ${ac_cv_path_SORT+:} false; then :
  4.4741 +  $as_echo_n "(cached) " >&6
  4.4742 +else
  4.4743 +  case $SORT in
  4.4744 +  [\\/]* | ?:[\\/]*)
  4.4745 +  ac_cv_path_SORT="$SORT" # Let the user override the test with a path.
  4.4746 +  ;;
  4.4747 +  *)
  4.4748 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4749 +for as_dir in $PATH
  4.4750 +do
  4.4751 +  IFS=$as_save_IFS
  4.4752 +  test -z "$as_dir" && as_dir=.
  4.4753 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4754 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4755 +    ac_cv_path_SORT="$as_dir/$ac_word$ac_exec_ext"
  4.4756 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4757 +    break 2
  4.4758 +  fi
  4.4759 +done
  4.4760 +  done
  4.4761 +IFS=$as_save_IFS
  4.4762 +
  4.4763 +  ;;
  4.4764 +esac
  4.4765 +fi
  4.4766 +SORT=$ac_cv_path_SORT
  4.4767 +if test -n "$SORT"; then
  4.4768 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SORT" >&5
  4.4769 +$as_echo "$SORT" >&6; }
  4.4770 +else
  4.4771 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4772 +$as_echo "no" >&6; }
  4.4773 +fi
  4.4774 +
  4.4775 +
  4.4776 +  test -n "$SORT" && break
  4.4777 +done
  4.4778 +
  4.4779 +    else
  4.4780 +      # If it succeeded, then it was overridden by the user. We will use it
  4.4781 +      # for the tool.
  4.4782 +
  4.4783 +      # First remove it from the list of overridden variables, so we can test
  4.4784 +      # for unknown variables in the end.
  4.4785 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.4786 +
  4.4787 +      # Check if the provided tool contains a complete path.
  4.4788 +      tool_specified="$SORT"
  4.4789 +      tool_basename="${tool_specified##*/}"
  4.4790 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.4791 +        # A command without a complete path is provided, search $PATH.
  4.4792 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool SORT=$tool_basename" >&5
  4.4793 +$as_echo "$as_me: Will search for user supplied tool SORT=$tool_basename" >&6;}
  4.4794 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.4795 +set dummy $tool_basename; ac_word=$2
  4.4796 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4797 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4798 +if ${ac_cv_path_SORT+:} false; then :
  4.4799 +  $as_echo_n "(cached) " >&6
  4.4800 +else
  4.4801 +  case $SORT in
  4.4802 +  [\\/]* | ?:[\\/]*)
  4.4803 +  ac_cv_path_SORT="$SORT" # Let the user override the test with a path.
  4.4804 +  ;;
  4.4805 +  *)
  4.4806 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4807 +for as_dir in $PATH
  4.4808 +do
  4.4809 +  IFS=$as_save_IFS
  4.4810 +  test -z "$as_dir" && as_dir=.
  4.4811 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4812 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4813 +    ac_cv_path_SORT="$as_dir/$ac_word$ac_exec_ext"
  4.4814 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4815 +    break 2
  4.4816 +  fi
  4.4817 +done
  4.4818 +  done
  4.4819 +IFS=$as_save_IFS
  4.4820 +
  4.4821 +  ;;
  4.4822 +esac
  4.4823 +fi
  4.4824 +SORT=$ac_cv_path_SORT
  4.4825 +if test -n "$SORT"; then
  4.4826 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SORT" >&5
  4.4827 +$as_echo "$SORT" >&6; }
  4.4828 +else
  4.4829 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4830 +$as_echo "no" >&6; }
  4.4831 +fi
  4.4832 +
  4.4833 +
  4.4834 +        if test "x$SORT" = x; then
  4.4835 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.4836 +        fi
  4.4837 +      else
  4.4838 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.4839 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool SORT=$tool_specified" >&5
  4.4840 +$as_echo "$as_me: Will use user supplied tool SORT=$tool_specified" >&6;}
  4.4841 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SORT" >&5
  4.4842 +$as_echo_n "checking for SORT... " >&6; }
  4.4843 +        if test ! -x "$tool_specified"; then
  4.4844 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.4845 +$as_echo "not found" >&6; }
  4.4846 +          as_fn_error $? "User supplied tool SORT=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.4847 +        fi
  4.4848 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.4849 +$as_echo "$tool_specified" >&6; }
  4.4850 +      fi
  4.4851 +    fi
  4.4852 +  fi
  4.4853 +
  4.4854 +
  4.4855  
  4.4856    if test "x$SORT" = x; then
  4.4857 -    if test "xsort" = x; then
  4.4858 -      PROG_NAME=sort
  4.4859 -    else
  4.4860 -      PROG_NAME=sort
  4.4861 -    fi
  4.4862 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.4863 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.4864 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.4865 -  fi
  4.4866 -
  4.4867 -
  4.4868 -
  4.4869 -  for ac_prog in tail
  4.4870 +    as_fn_error $? "Could not find required tool for SORT" "$LINENO" 5
  4.4871 +  fi
  4.4872 +
  4.4873 +
  4.4874 +
  4.4875 +
  4.4876 +
  4.4877 +  # Publish this variable in the help.
  4.4878 +
  4.4879 +
  4.4880 +  if test "x$TAIL" = x; then
  4.4881 +    # The variable is not set by user, try to locate tool using the code snippet
  4.4882 +    for ac_prog in tail
  4.4883  do
  4.4884    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4885  set dummy $ac_prog; ac_word=$2
  4.4886 @@ -5523,21 +9370,155 @@
  4.4887    test -n "$TAIL" && break
  4.4888  done
  4.4889  
  4.4890 +  else
  4.4891 +    # The variable is set, but is it from the command line or the environment?
  4.4892 +
  4.4893 +    # Try to remove the string !TAIL! from our list.
  4.4894 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!TAIL!/}
  4.4895 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.4896 +      # If it failed, the variable was not from the command line. Ignore it,
  4.4897 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.4898 +      if test "xTAIL" != xBASH; then
  4.4899 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of TAIL from the environment. Use command line variables instead." >&5
  4.4900 +$as_echo "$as_me: WARNING: Ignoring value of TAIL from the environment. Use command line variables instead." >&2;}
  4.4901 +      fi
  4.4902 +      # Try to locate tool using the code snippet
  4.4903 +      for ac_prog in tail
  4.4904 +do
  4.4905 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.4906 +set dummy $ac_prog; ac_word=$2
  4.4907 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4908 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4909 +if ${ac_cv_path_TAIL+:} false; then :
  4.4910 +  $as_echo_n "(cached) " >&6
  4.4911 +else
  4.4912 +  case $TAIL in
  4.4913 +  [\\/]* | ?:[\\/]*)
  4.4914 +  ac_cv_path_TAIL="$TAIL" # Let the user override the test with a path.
  4.4915 +  ;;
  4.4916 +  *)
  4.4917 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4918 +for as_dir in $PATH
  4.4919 +do
  4.4920 +  IFS=$as_save_IFS
  4.4921 +  test -z "$as_dir" && as_dir=.
  4.4922 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4923 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4924 +    ac_cv_path_TAIL="$as_dir/$ac_word$ac_exec_ext"
  4.4925 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4926 +    break 2
  4.4927 +  fi
  4.4928 +done
  4.4929 +  done
  4.4930 +IFS=$as_save_IFS
  4.4931 +
  4.4932 +  ;;
  4.4933 +esac
  4.4934 +fi
  4.4935 +TAIL=$ac_cv_path_TAIL
  4.4936 +if test -n "$TAIL"; then
  4.4937 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAIL" >&5
  4.4938 +$as_echo "$TAIL" >&6; }
  4.4939 +else
  4.4940 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4941 +$as_echo "no" >&6; }
  4.4942 +fi
  4.4943 +
  4.4944 +
  4.4945 +  test -n "$TAIL" && break
  4.4946 +done
  4.4947 +
  4.4948 +    else
  4.4949 +      # If it succeeded, then it was overridden by the user. We will use it
  4.4950 +      # for the tool.
  4.4951 +
  4.4952 +      # First remove it from the list of overridden variables, so we can test
  4.4953 +      # for unknown variables in the end.
  4.4954 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.4955 +
  4.4956 +      # Check if the provided tool contains a complete path.
  4.4957 +      tool_specified="$TAIL"
  4.4958 +      tool_basename="${tool_specified##*/}"
  4.4959 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.4960 +        # A command without a complete path is provided, search $PATH.
  4.4961 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool TAIL=$tool_basename" >&5
  4.4962 +$as_echo "$as_me: Will search for user supplied tool TAIL=$tool_basename" >&6;}
  4.4963 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.4964 +set dummy $tool_basename; ac_word=$2
  4.4965 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.4966 +$as_echo_n "checking for $ac_word... " >&6; }
  4.4967 +if ${ac_cv_path_TAIL+:} false; then :
  4.4968 +  $as_echo_n "(cached) " >&6
  4.4969 +else
  4.4970 +  case $TAIL in
  4.4971 +  [\\/]* | ?:[\\/]*)
  4.4972 +  ac_cv_path_TAIL="$TAIL" # Let the user override the test with a path.
  4.4973 +  ;;
  4.4974 +  *)
  4.4975 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.4976 +for as_dir in $PATH
  4.4977 +do
  4.4978 +  IFS=$as_save_IFS
  4.4979 +  test -z "$as_dir" && as_dir=.
  4.4980 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.4981 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.4982 +    ac_cv_path_TAIL="$as_dir/$ac_word$ac_exec_ext"
  4.4983 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.4984 +    break 2
  4.4985 +  fi
  4.4986 +done
  4.4987 +  done
  4.4988 +IFS=$as_save_IFS
  4.4989 +
  4.4990 +  ;;
  4.4991 +esac
  4.4992 +fi
  4.4993 +TAIL=$ac_cv_path_TAIL
  4.4994 +if test -n "$TAIL"; then
  4.4995 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAIL" >&5
  4.4996 +$as_echo "$TAIL" >&6; }
  4.4997 +else
  4.4998 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.4999 +$as_echo "no" >&6; }
  4.5000 +fi
  4.5001 +
  4.5002 +
  4.5003 +        if test "x$TAIL" = x; then
  4.5004 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.5005 +        fi
  4.5006 +      else
  4.5007 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.5008 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool TAIL=$tool_specified" >&5
  4.5009 +$as_echo "$as_me: Will use user supplied tool TAIL=$tool_specified" >&6;}
  4.5010 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TAIL" >&5
  4.5011 +$as_echo_n "checking for TAIL... " >&6; }
  4.5012 +        if test ! -x "$tool_specified"; then
  4.5013 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.5014 +$as_echo "not found" >&6; }
  4.5015 +          as_fn_error $? "User supplied tool TAIL=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.5016 +        fi
  4.5017 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.5018 +$as_echo "$tool_specified" >&6; }
  4.5019 +      fi
  4.5020 +    fi
  4.5021 +  fi
  4.5022 +
  4.5023 +
  4.5024  
  4.5025    if test "x$TAIL" = x; then
  4.5026 -    if test "xtail" = x; then
  4.5027 -      PROG_NAME=tail
  4.5028 -    else
  4.5029 -      PROG_NAME=tail
  4.5030 -    fi
  4.5031 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.5032 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.5033 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.5034 -  fi
  4.5035 -
  4.5036 -
  4.5037 -
  4.5038 -  for ac_prog in tar
  4.5039 +    as_fn_error $? "Could not find required tool for TAIL" "$LINENO" 5
  4.5040 +  fi
  4.5041 +
  4.5042 +
  4.5043 +
  4.5044 +
  4.5045 +
  4.5046 +  # Publish this variable in the help.
  4.5047 +
  4.5048 +
  4.5049 +  if test "x$TAR" = x; then
  4.5050 +    # The variable is not set by user, try to locate tool using the code snippet
  4.5051 +    for ac_prog in tar
  4.5052  do
  4.5053    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5054  set dummy $ac_prog; ac_word=$2
  4.5055 @@ -5582,21 +9563,155 @@
  4.5056    test -n "$TAR" && break
  4.5057  done
  4.5058  
  4.5059 +  else
  4.5060 +    # The variable is set, but is it from the command line or the environment?
  4.5061 +
  4.5062 +    # Try to remove the string !TAR! from our list.
  4.5063 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!TAR!/}
  4.5064 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.5065 +      # If it failed, the variable was not from the command line. Ignore it,
  4.5066 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.5067 +      if test "xTAR" != xBASH; then
  4.5068 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of TAR from the environment. Use command line variables instead." >&5
  4.5069 +$as_echo "$as_me: WARNING: Ignoring value of TAR from the environment. Use command line variables instead." >&2;}
  4.5070 +      fi
  4.5071 +      # Try to locate tool using the code snippet
  4.5072 +      for ac_prog in tar
  4.5073 +do
  4.5074 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5075 +set dummy $ac_prog; ac_word=$2
  4.5076 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5077 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5078 +if ${ac_cv_path_TAR+:} false; then :
  4.5079 +  $as_echo_n "(cached) " >&6
  4.5080 +else
  4.5081 +  case $TAR in
  4.5082 +  [\\/]* | ?:[\\/]*)
  4.5083 +  ac_cv_path_TAR="$TAR" # Let the user override the test with a path.
  4.5084 +  ;;
  4.5085 +  *)
  4.5086 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5087 +for as_dir in $PATH
  4.5088 +do
  4.5089 +  IFS=$as_save_IFS
  4.5090 +  test -z "$as_dir" && as_dir=.
  4.5091 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5092 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5093 +    ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
  4.5094 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5095 +    break 2
  4.5096 +  fi
  4.5097 +done
  4.5098 +  done
  4.5099 +IFS=$as_save_IFS
  4.5100 +
  4.5101 +  ;;
  4.5102 +esac
  4.5103 +fi
  4.5104 +TAR=$ac_cv_path_TAR
  4.5105 +if test -n "$TAR"; then
  4.5106 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
  4.5107 +$as_echo "$TAR" >&6; }
  4.5108 +else
  4.5109 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.5110 +$as_echo "no" >&6; }
  4.5111 +fi
  4.5112 +
  4.5113 +
  4.5114 +  test -n "$TAR" && break
  4.5115 +done
  4.5116 +
  4.5117 +    else
  4.5118 +      # If it succeeded, then it was overridden by the user. We will use it
  4.5119 +      # for the tool.
  4.5120 +
  4.5121 +      # First remove it from the list of overridden variables, so we can test
  4.5122 +      # for unknown variables in the end.
  4.5123 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.5124 +
  4.5125 +      # Check if the provided tool contains a complete path.
  4.5126 +      tool_specified="$TAR"
  4.5127 +      tool_basename="${tool_specified##*/}"
  4.5128 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.5129 +        # A command without a complete path is provided, search $PATH.
  4.5130 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool TAR=$tool_basename" >&5
  4.5131 +$as_echo "$as_me: Will search for user supplied tool TAR=$tool_basename" >&6;}
  4.5132 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.5133 +set dummy $tool_basename; ac_word=$2
  4.5134 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5135 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5136 +if ${ac_cv_path_TAR+:} false; then :
  4.5137 +  $as_echo_n "(cached) " >&6
  4.5138 +else
  4.5139 +  case $TAR in
  4.5140 +  [\\/]* | ?:[\\/]*)
  4.5141 +  ac_cv_path_TAR="$TAR" # Let the user override the test with a path.
  4.5142 +  ;;
  4.5143 +  *)
  4.5144 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5145 +for as_dir in $PATH
  4.5146 +do
  4.5147 +  IFS=$as_save_IFS
  4.5148 +  test -z "$as_dir" && as_dir=.
  4.5149 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5150 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5151 +    ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
  4.5152 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5153 +    break 2
  4.5154 +  fi
  4.5155 +done
  4.5156 +  done
  4.5157 +IFS=$as_save_IFS
  4.5158 +
  4.5159 +  ;;
  4.5160 +esac
  4.5161 +fi
  4.5162 +TAR=$ac_cv_path_TAR
  4.5163 +if test -n "$TAR"; then
  4.5164 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAR" >&5
  4.5165 +$as_echo "$TAR" >&6; }
  4.5166 +else
  4.5167 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.5168 +$as_echo "no" >&6; }
  4.5169 +fi
  4.5170 +
  4.5171 +
  4.5172 +        if test "x$TAR" = x; then
  4.5173 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.5174 +        fi
  4.5175 +      else
  4.5176 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.5177 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool TAR=$tool_specified" >&5
  4.5178 +$as_echo "$as_me: Will use user supplied tool TAR=$tool_specified" >&6;}
  4.5179 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TAR" >&5
  4.5180 +$as_echo_n "checking for TAR... " >&6; }
  4.5181 +        if test ! -x "$tool_specified"; then
  4.5182 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.5183 +$as_echo "not found" >&6; }
  4.5184 +          as_fn_error $? "User supplied tool TAR=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.5185 +        fi
  4.5186 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.5187 +$as_echo "$tool_specified" >&6; }
  4.5188 +      fi
  4.5189 +    fi
  4.5190 +  fi
  4.5191 +
  4.5192 +
  4.5193  
  4.5194    if test "x$TAR" = x; then
  4.5195 -    if test "xtar" = x; then
  4.5196 -      PROG_NAME=tar
  4.5197 -    else
  4.5198 -      PROG_NAME=tar
  4.5199 -    fi
  4.5200 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.5201 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.5202 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.5203 -  fi
  4.5204 -
  4.5205 -
  4.5206 -
  4.5207 -  for ac_prog in tee
  4.5208 +    as_fn_error $? "Could not find required tool for TAR" "$LINENO" 5
  4.5209 +  fi
  4.5210 +
  4.5211 +
  4.5212 +
  4.5213 +
  4.5214 +
  4.5215 +  # Publish this variable in the help.
  4.5216 +
  4.5217 +
  4.5218 +  if test "x$TEE" = x; then
  4.5219 +    # The variable is not set by user, try to locate tool using the code snippet
  4.5220 +    for ac_prog in tee
  4.5221  do
  4.5222    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5223  set dummy $ac_prog; ac_word=$2
  4.5224 @@ -5641,21 +9756,155 @@
  4.5225    test -n "$TEE" && break
  4.5226  done
  4.5227  
  4.5228 +  else
  4.5229 +    # The variable is set, but is it from the command line or the environment?
  4.5230 +
  4.5231 +    # Try to remove the string !TEE! from our list.
  4.5232 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!TEE!/}
  4.5233 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.5234 +      # If it failed, the variable was not from the command line. Ignore it,
  4.5235 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.5236 +      if test "xTEE" != xBASH; then
  4.5237 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of TEE from the environment. Use command line variables instead." >&5
  4.5238 +$as_echo "$as_me: WARNING: Ignoring value of TEE from the environment. Use command line variables instead." >&2;}
  4.5239 +      fi
  4.5240 +      # Try to locate tool using the code snippet
  4.5241 +      for ac_prog in tee
  4.5242 +do
  4.5243 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5244 +set dummy $ac_prog; ac_word=$2
  4.5245 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5246 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5247 +if ${ac_cv_path_TEE+:} false; then :
  4.5248 +  $as_echo_n "(cached) " >&6
  4.5249 +else
  4.5250 +  case $TEE in
  4.5251 +  [\\/]* | ?:[\\/]*)
  4.5252 +  ac_cv_path_TEE="$TEE" # Let the user override the test with a path.
  4.5253 +  ;;
  4.5254 +  *)
  4.5255 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5256 +for as_dir in $PATH
  4.5257 +do
  4.5258 +  IFS=$as_save_IFS
  4.5259 +  test -z "$as_dir" && as_dir=.
  4.5260 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5261 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5262 +    ac_cv_path_TEE="$as_dir/$ac_word$ac_exec_ext"
  4.5263 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5264 +    break 2
  4.5265 +  fi
  4.5266 +done
  4.5267 +  done
  4.5268 +IFS=$as_save_IFS
  4.5269 +
  4.5270 +  ;;
  4.5271 +esac
  4.5272 +fi
  4.5273 +TEE=$ac_cv_path_TEE
  4.5274 +if test -n "$TEE"; then
  4.5275 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEE" >&5
  4.5276 +$as_echo "$TEE" >&6; }
  4.5277 +else
  4.5278 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.5279 +$as_echo "no" >&6; }
  4.5280 +fi
  4.5281 +
  4.5282 +
  4.5283 +  test -n "$TEE" && break
  4.5284 +done
  4.5285 +
  4.5286 +    else
  4.5287 +      # If it succeeded, then it was overridden by the user. We will use it
  4.5288 +      # for the tool.
  4.5289 +
  4.5290 +      # First remove it from the list of overridden variables, so we can test
  4.5291 +      # for unknown variables in the end.
  4.5292 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.5293 +
  4.5294 +      # Check if the provided tool contains a complete path.
  4.5295 +      tool_specified="$TEE"
  4.5296 +      tool_basename="${tool_specified##*/}"
  4.5297 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.5298 +        # A command without a complete path is provided, search $PATH.
  4.5299 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool TEE=$tool_basename" >&5
  4.5300 +$as_echo "$as_me: Will search for user supplied tool TEE=$tool_basename" >&6;}
  4.5301 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.5302 +set dummy $tool_basename; ac_word=$2
  4.5303 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5304 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5305 +if ${ac_cv_path_TEE+:} false; then :
  4.5306 +  $as_echo_n "(cached) " >&6
  4.5307 +else
  4.5308 +  case $TEE in
  4.5309 +  [\\/]* | ?:[\\/]*)
  4.5310 +  ac_cv_path_TEE="$TEE" # Let the user override the test with a path.
  4.5311 +  ;;
  4.5312 +  *)
  4.5313 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5314 +for as_dir in $PATH
  4.5315 +do
  4.5316 +  IFS=$as_save_IFS
  4.5317 +  test -z "$as_dir" && as_dir=.
  4.5318 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5319 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5320 +    ac_cv_path_TEE="$as_dir/$ac_word$ac_exec_ext"
  4.5321 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5322 +    break 2
  4.5323 +  fi
  4.5324 +done
  4.5325 +  done
  4.5326 +IFS=$as_save_IFS
  4.5327 +
  4.5328 +  ;;
  4.5329 +esac
  4.5330 +fi
  4.5331 +TEE=$ac_cv_path_TEE
  4.5332 +if test -n "$TEE"; then
  4.5333 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEE" >&5
  4.5334 +$as_echo "$TEE" >&6; }
  4.5335 +else
  4.5336 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.5337 +$as_echo "no" >&6; }
  4.5338 +fi
  4.5339 +
  4.5340 +
  4.5341 +        if test "x$TEE" = x; then
  4.5342 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.5343 +        fi
  4.5344 +      else
  4.5345 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.5346 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool TEE=$tool_specified" >&5
  4.5347 +$as_echo "$as_me: Will use user supplied tool TEE=$tool_specified" >&6;}
  4.5348 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TEE" >&5
  4.5349 +$as_echo_n "checking for TEE... " >&6; }
  4.5350 +        if test ! -x "$tool_specified"; then
  4.5351 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.5352 +$as_echo "not found" >&6; }
  4.5353 +          as_fn_error $? "User supplied tool TEE=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.5354 +        fi
  4.5355 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.5356 +$as_echo "$tool_specified" >&6; }
  4.5357 +      fi
  4.5358 +    fi
  4.5359 +  fi
  4.5360 +
  4.5361 +
  4.5362  
  4.5363    if test "x$TEE" = x; then
  4.5364 -    if test "xtee" = x; then
  4.5365 -      PROG_NAME=tee
  4.5366 -    else
  4.5367 -      PROG_NAME=tee
  4.5368 -    fi
  4.5369 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.5370 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.5371 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.5372 -  fi
  4.5373 -
  4.5374 -
  4.5375 -
  4.5376 -  for ac_prog in touch
  4.5377 +    as_fn_error $? "Could not find required tool for TEE" "$LINENO" 5
  4.5378 +  fi
  4.5379 +
  4.5380 +
  4.5381 +
  4.5382 +
  4.5383 +
  4.5384 +  # Publish this variable in the help.
  4.5385 +
  4.5386 +
  4.5387 +  if test "x$TOUCH" = x; then
  4.5388 +    # The variable is not set by user, try to locate tool using the code snippet
  4.5389 +    for ac_prog in touch
  4.5390  do
  4.5391    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5392  set dummy $ac_prog; ac_word=$2
  4.5393 @@ -5700,21 +9949,155 @@
  4.5394    test -n "$TOUCH" && break
  4.5395  done
  4.5396  
  4.5397 +  else
  4.5398 +    # The variable is set, but is it from the command line or the environment?
  4.5399 +
  4.5400 +    # Try to remove the string !TOUCH! from our list.
  4.5401 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!TOUCH!/}
  4.5402 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.5403 +      # If it failed, the variable was not from the command line. Ignore it,
  4.5404 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.5405 +      if test "xTOUCH" != xBASH; then
  4.5406 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of TOUCH from the environment. Use command line variables instead." >&5
  4.5407 +$as_echo "$as_me: WARNING: Ignoring value of TOUCH from the environment. Use command line variables instead." >&2;}
  4.5408 +      fi
  4.5409 +      # Try to locate tool using the code snippet
  4.5410 +      for ac_prog in touch
  4.5411 +do
  4.5412 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5413 +set dummy $ac_prog; ac_word=$2
  4.5414 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5415 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5416 +if ${ac_cv_path_TOUCH+:} false; then :
  4.5417 +  $as_echo_n "(cached) " >&6
  4.5418 +else
  4.5419 +  case $TOUCH in
  4.5420 +  [\\/]* | ?:[\\/]*)
  4.5421 +  ac_cv_path_TOUCH="$TOUCH" # Let the user override the test with a path.
  4.5422 +  ;;
  4.5423 +  *)
  4.5424 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5425 +for as_dir in $PATH
  4.5426 +do
  4.5427 +  IFS=$as_save_IFS
  4.5428 +  test -z "$as_dir" && as_dir=.
  4.5429 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5430 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5431 +    ac_cv_path_TOUCH="$as_dir/$ac_word$ac_exec_ext"
  4.5432 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5433 +    break 2
  4.5434 +  fi
  4.5435 +done
  4.5436 +  done
  4.5437 +IFS=$as_save_IFS
  4.5438 +
  4.5439 +  ;;
  4.5440 +esac
  4.5441 +fi
  4.5442 +TOUCH=$ac_cv_path_TOUCH
  4.5443 +if test -n "$TOUCH"; then
  4.5444 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOUCH" >&5
  4.5445 +$as_echo "$TOUCH" >&6; }
  4.5446 +else
  4.5447 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.5448 +$as_echo "no" >&6; }
  4.5449 +fi
  4.5450 +
  4.5451 +
  4.5452 +  test -n "$TOUCH" && break
  4.5453 +done
  4.5454 +
  4.5455 +    else
  4.5456 +      # If it succeeded, then it was overridden by the user. We will use it
  4.5457 +      # for the tool.
  4.5458 +
  4.5459 +      # First remove it from the list of overridden variables, so we can test
  4.5460 +      # for unknown variables in the end.
  4.5461 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.5462 +
  4.5463 +      # Check if the provided tool contains a complete path.
  4.5464 +      tool_specified="$TOUCH"
  4.5465 +      tool_basename="${tool_specified##*/}"
  4.5466 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.5467 +        # A command without a complete path is provided, search $PATH.
  4.5468 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool TOUCH=$tool_basename" >&5
  4.5469 +$as_echo "$as_me: Will search for user supplied tool TOUCH=$tool_basename" >&6;}
  4.5470 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.5471 +set dummy $tool_basename; ac_word=$2
  4.5472 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5473 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5474 +if ${ac_cv_path_TOUCH+:} false; then :
  4.5475 +  $as_echo_n "(cached) " >&6
  4.5476 +else
  4.5477 +  case $TOUCH in
  4.5478 +  [\\/]* | ?:[\\/]*)
  4.5479 +  ac_cv_path_TOUCH="$TOUCH" # Let the user override the test with a path.
  4.5480 +  ;;
  4.5481 +  *)
  4.5482 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5483 +for as_dir in $PATH
  4.5484 +do
  4.5485 +  IFS=$as_save_IFS
  4.5486 +  test -z "$as_dir" && as_dir=.
  4.5487 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5488 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5489 +    ac_cv_path_TOUCH="$as_dir/$ac_word$ac_exec_ext"
  4.5490 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5491 +    break 2
  4.5492 +  fi
  4.5493 +done
  4.5494 +  done
  4.5495 +IFS=$as_save_IFS
  4.5496 +
  4.5497 +  ;;
  4.5498 +esac
  4.5499 +fi
  4.5500 +TOUCH=$ac_cv_path_TOUCH
  4.5501 +if test -n "$TOUCH"; then
  4.5502 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOUCH" >&5
  4.5503 +$as_echo "$TOUCH" >&6; }
  4.5504 +else
  4.5505 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.5506 +$as_echo "no" >&6; }
  4.5507 +fi
  4.5508 +
  4.5509 +
  4.5510 +        if test "x$TOUCH" = x; then
  4.5511 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.5512 +        fi
  4.5513 +      else
  4.5514 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.5515 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool TOUCH=$tool_specified" >&5
  4.5516 +$as_echo "$as_me: Will use user supplied tool TOUCH=$tool_specified" >&6;}
  4.5517 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TOUCH" >&5
  4.5518 +$as_echo_n "checking for TOUCH... " >&6; }
  4.5519 +        if test ! -x "$tool_specified"; then
  4.5520 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.5521 +$as_echo "not found" >&6; }
  4.5522 +          as_fn_error $? "User supplied tool TOUCH=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.5523 +        fi
  4.5524 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.5525 +$as_echo "$tool_specified" >&6; }
  4.5526 +      fi
  4.5527 +    fi
  4.5528 +  fi
  4.5529 +
  4.5530 +
  4.5531  
  4.5532    if test "x$TOUCH" = x; then
  4.5533 -    if test "xtouch" = x; then
  4.5534 -      PROG_NAME=touch
  4.5535 -    else
  4.5536 -      PROG_NAME=touch
  4.5537 -    fi
  4.5538 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.5539 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.5540 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.5541 -  fi
  4.5542 -
  4.5543 -
  4.5544 -
  4.5545 -  for ac_prog in tr
  4.5546 +    as_fn_error $? "Could not find required tool for TOUCH" "$LINENO" 5
  4.5547 +  fi
  4.5548 +
  4.5549 +
  4.5550 +
  4.5551 +
  4.5552 +
  4.5553 +  # Publish this variable in the help.
  4.5554 +
  4.5555 +
  4.5556 +  if test "x$TR" = x; then
  4.5557 +    # The variable is not set by user, try to locate tool using the code snippet
  4.5558 +    for ac_prog in tr
  4.5559  do
  4.5560    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5561  set dummy $ac_prog; ac_word=$2
  4.5562 @@ -5759,21 +10142,155 @@
  4.5563    test -n "$TR" && break
  4.5564  done
  4.5565  
  4.5566 +  else
  4.5567 +    # The variable is set, but is it from the command line or the environment?
  4.5568 +
  4.5569 +    # Try to remove the string !TR! from our list.
  4.5570 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!TR!/}
  4.5571 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.5572 +      # If it failed, the variable was not from the command line. Ignore it,
  4.5573 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.5574 +      if test "xTR" != xBASH; then
  4.5575 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of TR from the environment. Use command line variables instead." >&5
  4.5576 +$as_echo "$as_me: WARNING: Ignoring value of TR from the environment. Use command line variables instead." >&2;}
  4.5577 +      fi
  4.5578 +      # Try to locate tool using the code snippet
  4.5579 +      for ac_prog in tr
  4.5580 +do
  4.5581 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5582 +set dummy $ac_prog; ac_word=$2
  4.5583 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5584 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5585 +if ${ac_cv_path_TR+:} false; then :
  4.5586 +  $as_echo_n "(cached) " >&6
  4.5587 +else
  4.5588 +  case $TR in
  4.5589 +  [\\/]* | ?:[\\/]*)
  4.5590 +  ac_cv_path_TR="$TR" # Let the user override the test with a path.
  4.5591 +  ;;
  4.5592 +  *)
  4.5593 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5594 +for as_dir in $PATH
  4.5595 +do
  4.5596 +  IFS=$as_save_IFS
  4.5597 +  test -z "$as_dir" && as_dir=.
  4.5598 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5599 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5600 +    ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext"
  4.5601 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5602 +    break 2
  4.5603 +  fi
  4.5604 +done
  4.5605 +  done
  4.5606 +IFS=$as_save_IFS
  4.5607 +
  4.5608 +  ;;
  4.5609 +esac
  4.5610 +fi
  4.5611 +TR=$ac_cv_path_TR
  4.5612 +if test -n "$TR"; then
  4.5613 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TR" >&5
  4.5614 +$as_echo "$TR" >&6; }
  4.5615 +else
  4.5616 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.5617 +$as_echo "no" >&6; }
  4.5618 +fi
  4.5619 +
  4.5620 +
  4.5621 +  test -n "$TR" && break
  4.5622 +done
  4.5623 +
  4.5624 +    else
  4.5625 +      # If it succeeded, then it was overridden by the user. We will use it
  4.5626 +      # for the tool.
  4.5627 +
  4.5628 +      # First remove it from the list of overridden variables, so we can test
  4.5629 +      # for unknown variables in the end.
  4.5630 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.5631 +
  4.5632 +      # Check if the provided tool contains a complete path.
  4.5633 +      tool_specified="$TR"
  4.5634 +      tool_basename="${tool_specified##*/}"
  4.5635 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.5636 +        # A command without a complete path is provided, search $PATH.
  4.5637 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool TR=$tool_basename" >&5
  4.5638 +$as_echo "$as_me: Will search for user supplied tool TR=$tool_basename" >&6;}
  4.5639 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.5640 +set dummy $tool_basename; ac_word=$2
  4.5641 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5642 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5643 +if ${ac_cv_path_TR+:} false; then :
  4.5644 +  $as_echo_n "(cached) " >&6
  4.5645 +else
  4.5646 +  case $TR in
  4.5647 +  [\\/]* | ?:[\\/]*)
  4.5648 +  ac_cv_path_TR="$TR" # Let the user override the test with a path.
  4.5649 +  ;;
  4.5650 +  *)
  4.5651 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5652 +for as_dir in $PATH
  4.5653 +do
  4.5654 +  IFS=$as_save_IFS
  4.5655 +  test -z "$as_dir" && as_dir=.
  4.5656 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5657 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5658 +    ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext"
  4.5659 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5660 +    break 2
  4.5661 +  fi
  4.5662 +done
  4.5663 +  done
  4.5664 +IFS=$as_save_IFS
  4.5665 +
  4.5666 +  ;;
  4.5667 +esac
  4.5668 +fi
  4.5669 +TR=$ac_cv_path_TR
  4.5670 +if test -n "$TR"; then
  4.5671 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TR" >&5
  4.5672 +$as_echo "$TR" >&6; }
  4.5673 +else
  4.5674 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.5675 +$as_echo "no" >&6; }
  4.5676 +fi
  4.5677 +
  4.5678 +
  4.5679 +        if test "x$TR" = x; then
  4.5680 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.5681 +        fi
  4.5682 +      else
  4.5683 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.5684 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool TR=$tool_specified" >&5
  4.5685 +$as_echo "$as_me: Will use user supplied tool TR=$tool_specified" >&6;}
  4.5686 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TR" >&5
  4.5687 +$as_echo_n "checking for TR... " >&6; }
  4.5688 +        if test ! -x "$tool_specified"; then
  4.5689 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.5690 +$as_echo "not found" >&6; }
  4.5691 +          as_fn_error $? "User supplied tool TR=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.5692 +        fi
  4.5693 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.5694 +$as_echo "$tool_specified" >&6; }
  4.5695 +      fi
  4.5696 +    fi
  4.5697 +  fi
  4.5698 +
  4.5699 +
  4.5700  
  4.5701    if test "x$TR" = x; then
  4.5702 -    if test "xtr" = x; then
  4.5703 -      PROG_NAME=tr
  4.5704 -    else
  4.5705 -      PROG_NAME=tr
  4.5706 -    fi
  4.5707 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.5708 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.5709 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.5710 -  fi
  4.5711 -
  4.5712 -
  4.5713 -
  4.5714 -  for ac_prog in uname
  4.5715 +    as_fn_error $? "Could not find required tool for TR" "$LINENO" 5
  4.5716 +  fi
  4.5717 +
  4.5718 +
  4.5719 +
  4.5720 +
  4.5721 +
  4.5722 +  # Publish this variable in the help.
  4.5723 +
  4.5724 +
  4.5725 +  if test "x$UNAME" = x; then
  4.5726 +    # The variable is not set by user, try to locate tool using the code snippet
  4.5727 +    for ac_prog in uname
  4.5728  do
  4.5729    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5730  set dummy $ac_prog; ac_word=$2
  4.5731 @@ -5818,21 +10335,155 @@
  4.5732    test -n "$UNAME" && break
  4.5733  done
  4.5734  
  4.5735 +  else
  4.5736 +    # The variable is set, but is it from the command line or the environment?
  4.5737 +
  4.5738 +    # Try to remove the string !UNAME! from our list.
  4.5739 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!UNAME!/}
  4.5740 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.5741 +      # If it failed, the variable was not from the command line. Ignore it,
  4.5742 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.5743 +      if test "xUNAME" != xBASH; then
  4.5744 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of UNAME from the environment. Use command line variables instead." >&5
  4.5745 +$as_echo "$as_me: WARNING: Ignoring value of UNAME from the environment. Use command line variables instead." >&2;}
  4.5746 +      fi
  4.5747 +      # Try to locate tool using the code snippet
  4.5748 +      for ac_prog in uname
  4.5749 +do
  4.5750 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5751 +set dummy $ac_prog; ac_word=$2
  4.5752 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5753 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5754 +if ${ac_cv_path_UNAME+:} false; then :
  4.5755 +  $as_echo_n "(cached) " >&6
  4.5756 +else
  4.5757 +  case $UNAME in
  4.5758 +  [\\/]* | ?:[\\/]*)
  4.5759 +  ac_cv_path_UNAME="$UNAME" # Let the user override the test with a path.
  4.5760 +  ;;
  4.5761 +  *)
  4.5762 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5763 +for as_dir in $PATH
  4.5764 +do
  4.5765 +  IFS=$as_save_IFS
  4.5766 +  test -z "$as_dir" && as_dir=.
  4.5767 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5768 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5769 +    ac_cv_path_UNAME="$as_dir/$ac_word$ac_exec_ext"
  4.5770 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5771 +    break 2
  4.5772 +  fi
  4.5773 +done
  4.5774 +  done
  4.5775 +IFS=$as_save_IFS
  4.5776 +
  4.5777 +  ;;
  4.5778 +esac
  4.5779 +fi
  4.5780 +UNAME=$ac_cv_path_UNAME
  4.5781 +if test -n "$UNAME"; then
  4.5782 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNAME" >&5
  4.5783 +$as_echo "$UNAME" >&6; }
  4.5784 +else
  4.5785 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.5786 +$as_echo "no" >&6; }
  4.5787 +fi
  4.5788 +
  4.5789 +
  4.5790 +  test -n "$UNAME" && break
  4.5791 +done
  4.5792 +
  4.5793 +    else
  4.5794 +      # If it succeeded, then it was overridden by the user. We will use it
  4.5795 +      # for the tool.
  4.5796 +
  4.5797 +      # First remove it from the list of overridden variables, so we can test
  4.5798 +      # for unknown variables in the end.
  4.5799 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.5800 +
  4.5801 +      # Check if the provided tool contains a complete path.
  4.5802 +      tool_specified="$UNAME"
  4.5803 +      tool_basename="${tool_specified##*/}"
  4.5804 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.5805 +        # A command without a complete path is provided, search $PATH.
  4.5806 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool UNAME=$tool_basename" >&5
  4.5807 +$as_echo "$as_me: Will search for user supplied tool UNAME=$tool_basename" >&6;}
  4.5808 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.5809 +set dummy $tool_basename; ac_word=$2
  4.5810 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5811 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5812 +if ${ac_cv_path_UNAME+:} false; then :
  4.5813 +  $as_echo_n "(cached) " >&6
  4.5814 +else
  4.5815 +  case $UNAME in
  4.5816 +  [\\/]* | ?:[\\/]*)
  4.5817 +  ac_cv_path_UNAME="$UNAME" # Let the user override the test with a path.
  4.5818 +  ;;
  4.5819 +  *)
  4.5820 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5821 +for as_dir in $PATH
  4.5822 +do
  4.5823 +  IFS=$as_save_IFS
  4.5824 +  test -z "$as_dir" && as_dir=.
  4.5825 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5826 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5827 +    ac_cv_path_UNAME="$as_dir/$ac_word$ac_exec_ext"
  4.5828 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5829 +    break 2
  4.5830 +  fi
  4.5831 +done
  4.5832 +  done
  4.5833 +IFS=$as_save_IFS
  4.5834 +
  4.5835 +  ;;
  4.5836 +esac
  4.5837 +fi
  4.5838 +UNAME=$ac_cv_path_UNAME
  4.5839 +if test -n "$UNAME"; then
  4.5840 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNAME" >&5
  4.5841 +$as_echo "$UNAME" >&6; }
  4.5842 +else
  4.5843 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.5844 +$as_echo "no" >&6; }
  4.5845 +fi
  4.5846 +
  4.5847 +
  4.5848 +        if test "x$UNAME" = x; then
  4.5849 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.5850 +        fi
  4.5851 +      else
  4.5852 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.5853 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool UNAME=$tool_specified" >&5
  4.5854 +$as_echo "$as_me: Will use user supplied tool UNAME=$tool_specified" >&6;}
  4.5855 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNAME" >&5
  4.5856 +$as_echo_n "checking for UNAME... " >&6; }
  4.5857 +        if test ! -x "$tool_specified"; then
  4.5858 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.5859 +$as_echo "not found" >&6; }
  4.5860 +          as_fn_error $? "User supplied tool UNAME=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.5861 +        fi
  4.5862 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.5863 +$as_echo "$tool_specified" >&6; }
  4.5864 +      fi
  4.5865 +    fi
  4.5866 +  fi
  4.5867 +
  4.5868 +
  4.5869  
  4.5870    if test "x$UNAME" = x; then
  4.5871 -    if test "xuname" = x; then
  4.5872 -      PROG_NAME=uname
  4.5873 -    else
  4.5874 -      PROG_NAME=uname
  4.5875 -    fi
  4.5876 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.5877 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.5878 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.5879 -  fi
  4.5880 -
  4.5881 -
  4.5882 -
  4.5883 -  for ac_prog in uniq
  4.5884 +    as_fn_error $? "Could not find required tool for UNAME" "$LINENO" 5
  4.5885 +  fi
  4.5886 +
  4.5887 +
  4.5888 +
  4.5889 +
  4.5890 +
  4.5891 +  # Publish this variable in the help.
  4.5892 +
  4.5893 +
  4.5894 +  if test "x$UNIQ" = x; then
  4.5895 +    # The variable is not set by user, try to locate tool using the code snippet
  4.5896 +    for ac_prog in uniq
  4.5897  do
  4.5898    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5899  set dummy $ac_prog; ac_word=$2
  4.5900 @@ -5877,21 +10528,155 @@
  4.5901    test -n "$UNIQ" && break
  4.5902  done
  4.5903  
  4.5904 +  else
  4.5905 +    # The variable is set, but is it from the command line or the environment?
  4.5906 +
  4.5907 +    # Try to remove the string !UNIQ! from our list.
  4.5908 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!UNIQ!/}
  4.5909 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.5910 +      # If it failed, the variable was not from the command line. Ignore it,
  4.5911 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.5912 +      if test "xUNIQ" != xBASH; then
  4.5913 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of UNIQ from the environment. Use command line variables instead." >&5
  4.5914 +$as_echo "$as_me: WARNING: Ignoring value of UNIQ from the environment. Use command line variables instead." >&2;}
  4.5915 +      fi
  4.5916 +      # Try to locate tool using the code snippet
  4.5917 +      for ac_prog in uniq
  4.5918 +do
  4.5919 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.5920 +set dummy $ac_prog; ac_word=$2
  4.5921 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5922 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5923 +if ${ac_cv_path_UNIQ+:} false; then :
  4.5924 +  $as_echo_n "(cached) " >&6
  4.5925 +else
  4.5926 +  case $UNIQ in
  4.5927 +  [\\/]* | ?:[\\/]*)
  4.5928 +  ac_cv_path_UNIQ="$UNIQ" # Let the user override the test with a path.
  4.5929 +  ;;
  4.5930 +  *)
  4.5931 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5932 +for as_dir in $PATH
  4.5933 +do
  4.5934 +  IFS=$as_save_IFS
  4.5935 +  test -z "$as_dir" && as_dir=.
  4.5936 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5937 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5938 +    ac_cv_path_UNIQ="$as_dir/$ac_word$ac_exec_ext"
  4.5939 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5940 +    break 2
  4.5941 +  fi
  4.5942 +done
  4.5943 +  done
  4.5944 +IFS=$as_save_IFS
  4.5945 +
  4.5946 +  ;;
  4.5947 +esac
  4.5948 +fi
  4.5949 +UNIQ=$ac_cv_path_UNIQ
  4.5950 +if test -n "$UNIQ"; then
  4.5951 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIQ" >&5
  4.5952 +$as_echo "$UNIQ" >&6; }
  4.5953 +else
  4.5954 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.5955 +$as_echo "no" >&6; }
  4.5956 +fi
  4.5957 +
  4.5958 +
  4.5959 +  test -n "$UNIQ" && break
  4.5960 +done
  4.5961 +
  4.5962 +    else
  4.5963 +      # If it succeeded, then it was overridden by the user. We will use it
  4.5964 +      # for the tool.
  4.5965 +
  4.5966 +      # First remove it from the list of overridden variables, so we can test
  4.5967 +      # for unknown variables in the end.
  4.5968 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.5969 +
  4.5970 +      # Check if the provided tool contains a complete path.
  4.5971 +      tool_specified="$UNIQ"
  4.5972 +      tool_basename="${tool_specified##*/}"
  4.5973 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.5974 +        # A command without a complete path is provided, search $PATH.
  4.5975 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool UNIQ=$tool_basename" >&5
  4.5976 +$as_echo "$as_me: Will search for user supplied tool UNIQ=$tool_basename" >&6;}
  4.5977 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.5978 +set dummy $tool_basename; ac_word=$2
  4.5979 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.5980 +$as_echo_n "checking for $ac_word... " >&6; }
  4.5981 +if ${ac_cv_path_UNIQ+:} false; then :
  4.5982 +  $as_echo_n "(cached) " >&6
  4.5983 +else
  4.5984 +  case $UNIQ in
  4.5985 +  [\\/]* | ?:[\\/]*)
  4.5986 +  ac_cv_path_UNIQ="$UNIQ" # Let the user override the test with a path.
  4.5987 +  ;;
  4.5988 +  *)
  4.5989 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.5990 +for as_dir in $PATH
  4.5991 +do
  4.5992 +  IFS=$as_save_IFS
  4.5993 +  test -z "$as_dir" && as_dir=.
  4.5994 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.5995 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.5996 +    ac_cv_path_UNIQ="$as_dir/$ac_word$ac_exec_ext"
  4.5997 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.5998 +    break 2
  4.5999 +  fi
  4.6000 +done
  4.6001 +  done
  4.6002 +IFS=$as_save_IFS
  4.6003 +
  4.6004 +  ;;
  4.6005 +esac
  4.6006 +fi
  4.6007 +UNIQ=$ac_cv_path_UNIQ
  4.6008 +if test -n "$UNIQ"; then
  4.6009 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIQ" >&5
  4.6010 +$as_echo "$UNIQ" >&6; }
  4.6011 +else
  4.6012 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.6013 +$as_echo "no" >&6; }
  4.6014 +fi
  4.6015 +
  4.6016 +
  4.6017 +        if test "x$UNIQ" = x; then
  4.6018 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.6019 +        fi
  4.6020 +      else
  4.6021 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.6022 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool UNIQ=$tool_specified" >&5
  4.6023 +$as_echo "$as_me: Will use user supplied tool UNIQ=$tool_specified" >&6;}
  4.6024 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQ" >&5
  4.6025 +$as_echo_n "checking for UNIQ... " >&6; }
  4.6026 +        if test ! -x "$tool_specified"; then
  4.6027 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.6028 +$as_echo "not found" >&6; }
  4.6029 +          as_fn_error $? "User supplied tool UNIQ=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.6030 +        fi
  4.6031 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.6032 +$as_echo "$tool_specified" >&6; }
  4.6033 +      fi
  4.6034 +    fi
  4.6035 +  fi
  4.6036 +
  4.6037 +
  4.6038  
  4.6039    if test "x$UNIQ" = x; then
  4.6040 -    if test "xuniq" = x; then
  4.6041 -      PROG_NAME=uniq
  4.6042 -    else
  4.6043 -      PROG_NAME=uniq
  4.6044 -    fi
  4.6045 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.6046 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.6047 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.6048 -  fi
  4.6049 -
  4.6050 -
  4.6051 -
  4.6052 -  for ac_prog in wc
  4.6053 +    as_fn_error $? "Could not find required tool for UNIQ" "$LINENO" 5
  4.6054 +  fi
  4.6055 +
  4.6056 +
  4.6057 +
  4.6058 +
  4.6059 +
  4.6060 +  # Publish this variable in the help.
  4.6061 +
  4.6062 +
  4.6063 +  if test "x$WC" = x; then
  4.6064 +    # The variable is not set by user, try to locate tool using the code snippet
  4.6065 +    for ac_prog in wc
  4.6066  do
  4.6067    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.6068  set dummy $ac_prog; ac_word=$2
  4.6069 @@ -5936,21 +10721,155 @@
  4.6070    test -n "$WC" && break
  4.6071  done
  4.6072  
  4.6073 +  else
  4.6074 +    # The variable is set, but is it from the command line or the environment?
  4.6075 +
  4.6076 +    # Try to remove the string !WC! from our list.
  4.6077 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!WC!/}
  4.6078 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.6079 +      # If it failed, the variable was not from the command line. Ignore it,
  4.6080 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.6081 +      if test "xWC" != xBASH; then
  4.6082 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of WC from the environment. Use command line variables instead." >&5
  4.6083 +$as_echo "$as_me: WARNING: Ignoring value of WC from the environment. Use command line variables instead." >&2;}
  4.6084 +      fi
  4.6085 +      # Try to locate tool using the code snippet
  4.6086 +      for ac_prog in wc
  4.6087 +do
  4.6088 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.6089 +set dummy $ac_prog; ac_word=$2
  4.6090 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.6091 +$as_echo_n "checking for $ac_word... " >&6; }
  4.6092 +if ${ac_cv_path_WC+:} false; then :
  4.6093 +  $as_echo_n "(cached) " >&6
  4.6094 +else
  4.6095 +  case $WC in
  4.6096 +  [\\/]* | ?:[\\/]*)
  4.6097 +  ac_cv_path_WC="$WC" # Let the user override the test with a path.
  4.6098 +  ;;
  4.6099 +  *)
  4.6100 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.6101 +for as_dir in $PATH
  4.6102 +do
  4.6103 +  IFS=$as_save_IFS
  4.6104 +  test -z "$as_dir" && as_dir=.
  4.6105 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.6106 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.6107 +    ac_cv_path_WC="$as_dir/$ac_word$ac_exec_ext"
  4.6108 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.6109 +    break 2
  4.6110 +  fi
  4.6111 +done
  4.6112 +  done
  4.6113 +IFS=$as_save_IFS
  4.6114 +
  4.6115 +  ;;
  4.6116 +esac
  4.6117 +fi
  4.6118 +WC=$ac_cv_path_WC
  4.6119 +if test -n "$WC"; then
  4.6120 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WC" >&5
  4.6121 +$as_echo "$WC" >&6; }
  4.6122 +else
  4.6123 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.6124 +$as_echo "no" >&6; }
  4.6125 +fi
  4.6126 +
  4.6127 +
  4.6128 +  test -n "$WC" && break
  4.6129 +done
  4.6130 +
  4.6131 +    else
  4.6132 +      # If it succeeded, then it was overridden by the user. We will use it
  4.6133 +      # for the tool.
  4.6134 +
  4.6135 +      # First remove it from the list of overridden variables, so we can test
  4.6136 +      # for unknown variables in the end.
  4.6137 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.6138 +
  4.6139 +      # Check if the provided tool contains a complete path.
  4.6140 +      tool_specified="$WC"
  4.6141 +      tool_basename="${tool_specified##*/}"
  4.6142 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.6143 +        # A command without a complete path is provided, search $PATH.
  4.6144 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool WC=$tool_basename" >&5
  4.6145 +$as_echo "$as_me: Will search for user supplied tool WC=$tool_basename" >&6;}
  4.6146 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.6147 +set dummy $tool_basename; ac_word=$2
  4.6148 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.6149 +$as_echo_n "checking for $ac_word... " >&6; }
  4.6150 +if ${ac_cv_path_WC+:} false; then :
  4.6151 +  $as_echo_n "(cached) " >&6
  4.6152 +else
  4.6153 +  case $WC in
  4.6154 +  [\\/]* | ?:[\\/]*)
  4.6155 +  ac_cv_path_WC="$WC" # Let the user override the test with a path.
  4.6156 +  ;;
  4.6157 +  *)
  4.6158 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.6159 +for as_dir in $PATH
  4.6160 +do
  4.6161 +  IFS=$as_save_IFS
  4.6162 +  test -z "$as_dir" && as_dir=.
  4.6163 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.6164 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.6165 +    ac_cv_path_WC="$as_dir/$ac_word$ac_exec_ext"
  4.6166 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.6167 +    break 2
  4.6168 +  fi
  4.6169 +done
  4.6170 +  done
  4.6171 +IFS=$as_save_IFS
  4.6172 +
  4.6173 +  ;;
  4.6174 +esac
  4.6175 +fi
  4.6176 +WC=$ac_cv_path_WC
  4.6177 +if test -n "$WC"; then
  4.6178 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WC" >&5
  4.6179 +$as_echo "$WC" >&6; }
  4.6180 +else
  4.6181 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.6182 +$as_echo "no" >&6; }
  4.6183 +fi
  4.6184 +
  4.6185 +
  4.6186 +        if test "x$WC" = x; then
  4.6187 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.6188 +        fi
  4.6189 +      else
  4.6190 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.6191 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool WC=$tool_specified" >&5
  4.6192 +$as_echo "$as_me: Will use user supplied tool WC=$tool_specified" >&6;}
  4.6193 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WC" >&5
  4.6194 +$as_echo_n "checking for WC... " >&6; }
  4.6195 +        if test ! -x "$tool_specified"; then
  4.6196 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.6197 +$as_echo "not found" >&6; }
  4.6198 +          as_fn_error $? "User supplied tool WC=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.6199 +        fi
  4.6200 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.6201 +$as_echo "$tool_specified" >&6; }
  4.6202 +      fi
  4.6203 +    fi
  4.6204 +  fi
  4.6205 +
  4.6206 +
  4.6207  
  4.6208    if test "x$WC" = x; then
  4.6209 -    if test "xwc" = x; then
  4.6210 -      PROG_NAME=wc
  4.6211 -    else
  4.6212 -      PROG_NAME=wc
  4.6213 -    fi
  4.6214 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.6215 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.6216 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.6217 -  fi
  4.6218 -
  4.6219 -
  4.6220 -
  4.6221 -  for ac_prog in which
  4.6222 +    as_fn_error $? "Could not find required tool for WC" "$LINENO" 5
  4.6223 +  fi
  4.6224 +
  4.6225 +
  4.6226 +
  4.6227 +
  4.6228 +
  4.6229 +  # Publish this variable in the help.
  4.6230 +
  4.6231 +
  4.6232 +  if test "x$WHICH" = x; then
  4.6233 +    # The variable is not set by user, try to locate tool using the code snippet
  4.6234 +    for ac_prog in which
  4.6235  do
  4.6236    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.6237  set dummy $ac_prog; ac_word=$2
  4.6238 @@ -5995,21 +10914,155 @@
  4.6239    test -n "$WHICH" && break
  4.6240  done
  4.6241  
  4.6242 +  else
  4.6243 +    # The variable is set, but is it from the command line or the environment?
  4.6244 +
  4.6245 +    # Try to remove the string !WHICH! from our list.
  4.6246 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!WHICH!/}
  4.6247 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.6248 +      # If it failed, the variable was not from the command line. Ignore it,
  4.6249 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.6250 +      if test "xWHICH" != xBASH; then
  4.6251 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of WHICH from the environment. Use command line variables instead." >&5
  4.6252 +$as_echo "$as_me: WARNING: Ignoring value of WHICH from the environment. Use command line variables instead." >&2;}
  4.6253 +      fi
  4.6254 +      # Try to locate tool using the code snippet
  4.6255 +      for ac_prog in which
  4.6256 +do
  4.6257 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.6258 +set dummy $ac_prog; ac_word=$2
  4.6259 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.6260 +$as_echo_n "checking for $ac_word... " >&6; }
  4.6261 +if ${ac_cv_path_WHICH+:} false; then :
  4.6262 +  $as_echo_n "(cached) " >&6
  4.6263 +else
  4.6264 +  case $WHICH in
  4.6265 +  [\\/]* | ?:[\\/]*)
  4.6266 +  ac_cv_path_WHICH="$WHICH" # Let the user override the test with a path.
  4.6267 +  ;;
  4.6268 +  *)
  4.6269 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.6270 +for as_dir in $PATH
  4.6271 +do
  4.6272 +  IFS=$as_save_IFS
  4.6273 +  test -z "$as_dir" && as_dir=.
  4.6274 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.6275 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.6276 +    ac_cv_path_WHICH="$as_dir/$ac_word$ac_exec_ext"
  4.6277 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.6278 +    break 2
  4.6279 +  fi
  4.6280 +done
  4.6281 +  done
  4.6282 +IFS=$as_save_IFS
  4.6283 +
  4.6284 +  ;;
  4.6285 +esac
  4.6286 +fi
  4.6287 +WHICH=$ac_cv_path_WHICH
  4.6288 +if test -n "$WHICH"; then
  4.6289 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WHICH" >&5
  4.6290 +$as_echo "$WHICH" >&6; }
  4.6291 +else
  4.6292 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.6293 +$as_echo "no" >&6; }
  4.6294 +fi
  4.6295 +
  4.6296 +
  4.6297 +  test -n "$WHICH" && break
  4.6298 +done
  4.6299 +
  4.6300 +    else
  4.6301 +      # If it succeeded, then it was overridden by the user. We will use it
  4.6302 +      # for the tool.
  4.6303 +
  4.6304 +      # First remove it from the list of overridden variables, so we can test
  4.6305 +      # for unknown variables in the end.
  4.6306 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.6307 +
  4.6308 +      # Check if the provided tool contains a complete path.
  4.6309 +      tool_specified="$WHICH"
  4.6310 +      tool_basename="${tool_specified##*/}"
  4.6311 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.6312 +        # A command without a complete path is provided, search $PATH.
  4.6313 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool WHICH=$tool_basename" >&5
  4.6314 +$as_echo "$as_me: Will search for user supplied tool WHICH=$tool_basename" >&6;}
  4.6315 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.6316 +set dummy $tool_basename; ac_word=$2
  4.6317 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.6318 +$as_echo_n "checking for $ac_word... " >&6; }
  4.6319 +if ${ac_cv_path_WHICH+:} false; then :
  4.6320 +  $as_echo_n "(cached) " >&6
  4.6321 +else
  4.6322 +  case $WHICH in
  4.6323 +  [\\/]* | ?:[\\/]*)
  4.6324 +  ac_cv_path_WHICH="$WHICH" # Let the user override the test with a path.
  4.6325 +  ;;
  4.6326 +  *)
  4.6327 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.6328 +for as_dir in $PATH
  4.6329 +do
  4.6330 +  IFS=$as_save_IFS
  4.6331 +  test -z "$as_dir" && as_dir=.
  4.6332 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.6333 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.6334 +    ac_cv_path_WHICH="$as_dir/$ac_word$ac_exec_ext"
  4.6335 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.6336 +    break 2
  4.6337 +  fi
  4.6338 +done
  4.6339 +  done
  4.6340 +IFS=$as_save_IFS
  4.6341 +
  4.6342 +  ;;
  4.6343 +esac
  4.6344 +fi
  4.6345 +WHICH=$ac_cv_path_WHICH
  4.6346 +if test -n "$WHICH"; then
  4.6347 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WHICH" >&5
  4.6348 +$as_echo "$WHICH" >&6; }
  4.6349 +else
  4.6350 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.6351 +$as_echo "no" >&6; }
  4.6352 +fi
  4.6353 +
  4.6354 +
  4.6355 +        if test "x$WHICH" = x; then
  4.6356 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.6357 +        fi
  4.6358 +      else
  4.6359 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.6360 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool WHICH=$tool_specified" >&5
  4.6361 +$as_echo "$as_me: Will use user supplied tool WHICH=$tool_specified" >&6;}
  4.6362 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WHICH" >&5
  4.6363 +$as_echo_n "checking for WHICH... " >&6; }
  4.6364 +        if test ! -x "$tool_specified"; then
  4.6365 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.6366 +$as_echo "not found" >&6; }
  4.6367 +          as_fn_error $? "User supplied tool WHICH=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.6368 +        fi
  4.6369 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.6370 +$as_echo "$tool_specified" >&6; }
  4.6371 +      fi
  4.6372 +    fi
  4.6373 +  fi
  4.6374 +
  4.6375 +
  4.6376  
  4.6377    if test "x$WHICH" = x; then
  4.6378 -    if test "xwhich" = x; then
  4.6379 -      PROG_NAME=which
  4.6380 -    else
  4.6381 -      PROG_NAME=which
  4.6382 -    fi
  4.6383 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.6384 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.6385 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.6386 -  fi
  4.6387 -
  4.6388 -
  4.6389 -
  4.6390 -  for ac_prog in xargs
  4.6391 +    as_fn_error $? "Could not find required tool for WHICH" "$LINENO" 5
  4.6392 +  fi
  4.6393 +
  4.6394 +
  4.6395 +
  4.6396 +
  4.6397 +
  4.6398 +  # Publish this variable in the help.
  4.6399 +
  4.6400 +
  4.6401 +  if test "x$XARGS" = x; then
  4.6402 +    # The variable is not set by user, try to locate tool using the code snippet
  4.6403 +    for ac_prog in xargs
  4.6404  do
  4.6405    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.6406  set dummy $ac_prog; ac_word=$2
  4.6407 @@ -6054,22 +11107,156 @@
  4.6408    test -n "$XARGS" && break
  4.6409  done
  4.6410  
  4.6411 +  else
  4.6412 +    # The variable is set, but is it from the command line or the environment?
  4.6413 +
  4.6414 +    # Try to remove the string !XARGS! from our list.
  4.6415 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!XARGS!/}
  4.6416 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.6417 +      # If it failed, the variable was not from the command line. Ignore it,
  4.6418 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.6419 +      if test "xXARGS" != xBASH; then
  4.6420 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of XARGS from the environment. Use command line variables instead." >&5
  4.6421 +$as_echo "$as_me: WARNING: Ignoring value of XARGS from the environment. Use command line variables instead." >&2;}
  4.6422 +      fi
  4.6423 +      # Try to locate tool using the code snippet
  4.6424 +      for ac_prog in xargs
  4.6425 +do
  4.6426 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.6427 +set dummy $ac_prog; ac_word=$2
  4.6428 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.6429 +$as_echo_n "checking for $ac_word... " >&6; }
  4.6430 +if ${ac_cv_path_XARGS+:} false; then :
  4.6431 +  $as_echo_n "(cached) " >&6
  4.6432 +else
  4.6433 +  case $XARGS in
  4.6434 +  [\\/]* | ?:[\\/]*)
  4.6435 +  ac_cv_path_XARGS="$XARGS" # Let the user override the test with a path.
  4.6436 +  ;;
  4.6437 +  *)
  4.6438 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.6439 +for as_dir in $PATH
  4.6440 +do
  4.6441 +  IFS=$as_save_IFS
  4.6442 +  test -z "$as_dir" && as_dir=.
  4.6443 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.6444 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.6445 +    ac_cv_path_XARGS="$as_dir/$ac_word$ac_exec_ext"
  4.6446 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.6447 +    break 2
  4.6448 +  fi
  4.6449 +done
  4.6450 +  done
  4.6451 +IFS=$as_save_IFS
  4.6452 +
  4.6453 +  ;;
  4.6454 +esac
  4.6455 +fi
  4.6456 +XARGS=$ac_cv_path_XARGS
  4.6457 +if test -n "$XARGS"; then
  4.6458 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XARGS" >&5
  4.6459 +$as_echo "$XARGS" >&6; }
  4.6460 +else
  4.6461 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.6462 +$as_echo "no" >&6; }
  4.6463 +fi
  4.6464 +
  4.6465 +
  4.6466 +  test -n "$XARGS" && break
  4.6467 +done
  4.6468 +
  4.6469 +    else
  4.6470 +      # If it succeeded, then it was overridden by the user. We will use it
  4.6471 +      # for the tool.
  4.6472 +
  4.6473 +      # First remove it from the list of overridden variables, so we can test
  4.6474 +      # for unknown variables in the end.
  4.6475 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.6476 +
  4.6477 +      # Check if the provided tool contains a complete path.
  4.6478 +      tool_specified="$XARGS"
  4.6479 +      tool_basename="${tool_specified##*/}"
  4.6480 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.6481 +        # A command without a complete path is provided, search $PATH.
  4.6482 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool XARGS=$tool_basename" >&5
  4.6483 +$as_echo "$as_me: Will search for user supplied tool XARGS=$tool_basename" >&6;}
  4.6484 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.6485 +set dummy $tool_basename; ac_word=$2
  4.6486 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.6487 +$as_echo_n "checking for $ac_word... " >&6; }
  4.6488 +if ${ac_cv_path_XARGS+:} false; then :
  4.6489 +  $as_echo_n "(cached) " >&6
  4.6490 +else
  4.6491 +  case $XARGS in
  4.6492 +  [\\/]* | ?:[\\/]*)
  4.6493 +  ac_cv_path_XARGS="$XARGS" # Let the user override the test with a path.
  4.6494 +  ;;
  4.6495 +  *)
  4.6496 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.6497 +for as_dir in $PATH
  4.6498 +do
  4.6499 +  IFS=$as_save_IFS
  4.6500 +  test -z "$as_dir" && as_dir=.
  4.6501 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.6502 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.6503 +    ac_cv_path_XARGS="$as_dir/$ac_word$ac_exec_ext"
  4.6504 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.6505 +    break 2
  4.6506 +  fi
  4.6507 +done
  4.6508 +  done
  4.6509 +IFS=$as_save_IFS
  4.6510 +
  4.6511 +  ;;
  4.6512 +esac
  4.6513 +fi
  4.6514 +XARGS=$ac_cv_path_XARGS
  4.6515 +if test -n "$XARGS"; then
  4.6516 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XARGS" >&5
  4.6517 +$as_echo "$XARGS" >&6; }
  4.6518 +else
  4.6519 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.6520 +$as_echo "no" >&6; }
  4.6521 +fi
  4.6522 +
  4.6523 +
  4.6524 +        if test "x$XARGS" = x; then
  4.6525 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.6526 +        fi
  4.6527 +      else
  4.6528 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.6529 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool XARGS=$tool_specified" >&5
  4.6530 +$as_echo "$as_me: Will use user supplied tool XARGS=$tool_specified" >&6;}
  4.6531 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XARGS" >&5
  4.6532 +$as_echo_n "checking for XARGS... " >&6; }
  4.6533 +        if test ! -x "$tool_specified"; then
  4.6534 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.6535 +$as_echo "not found" >&6; }
  4.6536 +          as_fn_error $? "User supplied tool XARGS=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.6537 +        fi
  4.6538 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.6539 +$as_echo "$tool_specified" >&6; }
  4.6540 +      fi
  4.6541 +    fi
  4.6542 +  fi
  4.6543 +
  4.6544 +
  4.6545  
  4.6546    if test "x$XARGS" = x; then
  4.6547 -    if test "xxargs" = x; then
  4.6548 -      PROG_NAME=xargs
  4.6549 -    else
  4.6550 -      PROG_NAME=xargs
  4.6551 -    fi
  4.6552 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.6553 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.6554 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.6555 +    as_fn_error $? "Could not find required tool for XARGS" "$LINENO" 5
  4.6556    fi
  4.6557  
  4.6558  
  4.6559  
  4.6560    # Then required tools that require some special treatment.
  4.6561 -  for ac_prog in gawk mawk nawk awk
  4.6562 +
  4.6563 +
  4.6564 +  # Publish this variable in the help.
  4.6565 +
  4.6566 +
  4.6567 +  if test "x$AWK" = x; then
  4.6568 +    # The variable is not set by user, try to locate tool using the code snippet
  4.6569 +    for ac_prog in gawk mawk nawk awk
  4.6570  do
  4.6571    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.6572  set dummy $ac_prog; ac_word=$2
  4.6573 @@ -6111,19 +11298,150 @@
  4.6574    test -n "$AWK" && break
  4.6575  done
  4.6576  
  4.6577 +  else
  4.6578 +    # The variable is set, but is it from the command line or the environment?
  4.6579 +
  4.6580 +    # Try to remove the string !AWK! from our list.
  4.6581 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!AWK!/}
  4.6582 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.6583 +      # If it failed, the variable was not from the command line. Ignore it,
  4.6584 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.6585 +      if test "xAWK" != xBASH; then
  4.6586 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of AWK from the environment. Use command line variables instead." >&5
  4.6587 +$as_echo "$as_me: WARNING: Ignoring value of AWK from the environment. Use command line variables instead." >&2;}
  4.6588 +      fi
  4.6589 +      # Try to locate tool using the code snippet
  4.6590 +      for ac_prog in gawk mawk nawk awk
  4.6591 +do
  4.6592 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.6593 +set dummy $ac_prog; ac_word=$2
  4.6594 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.6595 +$as_echo_n "checking for $ac_word... " >&6; }
  4.6596 +if ${ac_cv_prog_AWK+:} false; then :
  4.6597 +  $as_echo_n "(cached) " >&6
  4.6598 +else
  4.6599 +  if test -n "$AWK"; then
  4.6600 +  ac_cv_prog_AWK="$AWK" # Let the user override the test.
  4.6601 +else
  4.6602 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.6603 +for as_dir in $PATH
  4.6604 +do
  4.6605 +  IFS=$as_save_IFS
  4.6606 +  test -z "$as_dir" && as_dir=.
  4.6607 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.6608 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.6609 +    ac_cv_prog_AWK="$ac_prog"
  4.6610 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.6611 +    break 2
  4.6612 +  fi
  4.6613 +done
  4.6614 +  done
  4.6615 +IFS=$as_save_IFS
  4.6616 +
  4.6617 +fi
  4.6618 +fi
  4.6619 +AWK=$ac_cv_prog_AWK
  4.6620 +if test -n "$AWK"; then
  4.6621 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
  4.6622 +$as_echo "$AWK" >&6; }
  4.6623 +else
  4.6624 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.6625 +$as_echo "no" >&6; }
  4.6626 +fi
  4.6627 +
  4.6628 +
  4.6629 +  test -n "$AWK" && break
  4.6630 +done
  4.6631 +
  4.6632 +    else
  4.6633 +      # If it succeeded, then it was overridden by the user. We will use it
  4.6634 +      # for the tool.
  4.6635 +
  4.6636 +      # First remove it from the list of overridden variables, so we can test
  4.6637 +      # for unknown variables in the end.
  4.6638 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.6639 +
  4.6640 +      # Check if the provided tool contains a complete path.
  4.6641 +      tool_specified="$AWK"
  4.6642 +      tool_basename="${tool_specified##*/}"
  4.6643 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.6644 +        # A command without a complete path is provided, search $PATH.
  4.6645 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool AWK=$tool_basename" >&5
  4.6646 +$as_echo "$as_me: Will search for user supplied tool AWK=$tool_basename" >&6;}
  4.6647 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.6648 +set dummy $tool_basename; ac_word=$2
  4.6649 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.6650 +$as_echo_n "checking for $ac_word... " >&6; }
  4.6651 +if ${ac_cv_path_AWK+:} false; then :
  4.6652 +  $as_echo_n "(cached) " >&6
  4.6653 +else
  4.6654 +  case $AWK in
  4.6655 +  [\\/]* | ?:[\\/]*)
  4.6656 +  ac_cv_path_AWK="$AWK" # Let the user override the test with a path.
  4.6657 +  ;;
  4.6658 +  *)
  4.6659 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.6660 +for as_dir in $PATH
  4.6661 +do
  4.6662 +  IFS=$as_save_IFS
  4.6663 +  test -z "$as_dir" && as_dir=.
  4.6664 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.6665 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.6666 +    ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
  4.6667 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.6668 +    break 2
  4.6669 +  fi
  4.6670 +done
  4.6671 +  done
  4.6672 +IFS=$as_save_IFS
  4.6673 +
  4.6674 +  ;;
  4.6675 +esac
  4.6676 +fi
  4.6677 +AWK=$ac_cv_path_AWK
  4.6678 +if test -n "$AWK"; then
  4.6679 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
  4.6680 +$as_echo "$AWK" >&6; }
  4.6681 +else
  4.6682 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.6683 +$as_echo "no" >&6; }
  4.6684 +fi
  4.6685 +
  4.6686 +
  4.6687 +        if test "x$AWK" = x; then
  4.6688 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.6689 +        fi
  4.6690 +      else
  4.6691 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.6692 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool AWK=$tool_specified" >&5
  4.6693 +$as_echo "$as_me: Will use user supplied tool AWK=$tool_specified" >&6;}
  4.6694 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AWK" >&5
  4.6695 +$as_echo_n "checking for AWK... " >&6; }
  4.6696 +        if test ! -x "$tool_specified"; then
  4.6697 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.6698 +$as_echo "not found" >&6; }
  4.6699 +          as_fn_error $? "User supplied tool AWK=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.6700 +        fi
  4.6701 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.6702 +$as_echo "$tool_specified" >&6; }
  4.6703 +      fi
  4.6704 +    fi
  4.6705 +  fi
  4.6706 +
  4.6707  
  4.6708    if test "x$AWK" = x; then
  4.6709 -    if test "x" = x; then
  4.6710 -      PROG_NAME=awk
  4.6711 -    else
  4.6712 -      PROG_NAME=
  4.6713 -    fi
  4.6714 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.6715 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.6716 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.6717 -  fi
  4.6718 -
  4.6719 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
  4.6720 +    as_fn_error $? "Could not find required tool for AWK" "$LINENO" 5
  4.6721 +  fi
  4.6722 +
  4.6723 +
  4.6724 +
  4.6725 +
  4.6726 +  # Publish this variable in the help.
  4.6727 +
  4.6728 +
  4.6729 +  if test "x$GREP" = x; then
  4.6730 +    # The variable is not set by user, try to locate tool using the code snippet
  4.6731 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
  4.6732  $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
  4.6733  if ${ac_cv_path_GREP+:} false; then :
  4.6734    $as_echo_n "(cached) " >&6
  4.6735 @@ -6186,19 +11504,171 @@
  4.6736   GREP="$ac_cv_path_GREP"
  4.6737  
  4.6738  
  4.6739 +  else
  4.6740 +    # The variable is set, but is it from the command line or the environment?
  4.6741 +
  4.6742 +    # Try to remove the string !GREP! from our list.
  4.6743 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!GREP!/}
  4.6744 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.6745 +      # If it failed, the variable was not from the command line. Ignore it,
  4.6746 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.6747 +      if test "xGREP" != xBASH; then
  4.6748 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of GREP from the environment. Use command line variables instead." >&5
  4.6749 +$as_echo "$as_me: WARNING: Ignoring value of GREP from the environment. Use command line variables instead." >&2;}
  4.6750 +      fi
  4.6751 +      # Try to locate tool using the code snippet
  4.6752 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
  4.6753 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
  4.6754 +if ${ac_cv_path_GREP+:} false; then :
  4.6755 +  $as_echo_n "(cached) " >&6
  4.6756 +else
  4.6757 +  if test -z "$GREP"; then
  4.6758 +  ac_path_GREP_found=false
  4.6759 +  # Loop through the user's path and test for each of PROGNAME-LIST
  4.6760 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.6761 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  4.6762 +do
  4.6763 +  IFS=$as_save_IFS
  4.6764 +  test -z "$as_dir" && as_dir=.
  4.6765 +    for ac_prog in grep ggrep; do
  4.6766 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.6767 +      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
  4.6768 +      as_fn_executable_p "$ac_path_GREP" || continue
  4.6769 +# Check for GNU ac_path_GREP and select it if it is found.
  4.6770 +  # Check for GNU $ac_path_GREP
  4.6771 +case `"$ac_path_GREP" --version 2>&1` in
  4.6772 +*GNU*)
  4.6773 +  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
  4.6774 +*)
  4.6775 +  ac_count=0
  4.6776 +  $as_echo_n 0123456789 >"conftest.in"
  4.6777 +  while :
  4.6778 +  do
  4.6779 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
  4.6780 +    mv "conftest.tmp" "conftest.in"
  4.6781 +    cp "conftest.in" "conftest.nl"
  4.6782 +    $as_echo 'GREP' >> "conftest.nl"
  4.6783 +    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
  4.6784 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  4.6785 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
  4.6786 +    if test $ac_count -gt ${ac_path_GREP_max-0}; then
  4.6787 +      # Best one so far, save it but keep looking for a better one
  4.6788 +      ac_cv_path_GREP="$ac_path_GREP"
  4.6789 +      ac_path_GREP_max=$ac_count
  4.6790 +    fi
  4.6791 +    # 10*(2^10) chars as input seems more than enough
  4.6792 +    test $ac_count -gt 10 && break
  4.6793 +  done
  4.6794 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  4.6795 +esac
  4.6796 +
  4.6797 +      $ac_path_GREP_found && break 3
  4.6798 +    done
  4.6799 +  done
  4.6800 +  done
  4.6801 +IFS=$as_save_IFS
  4.6802 +  if test -z "$ac_cv_path_GREP"; then
  4.6803 +    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  4.6804 +  fi
  4.6805 +else
  4.6806 +  ac_cv_path_GREP=$GREP
  4.6807 +fi
  4.6808 +
  4.6809 +fi
  4.6810 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
  4.6811 +$as_echo "$ac_cv_path_GREP" >&6; }
  4.6812 + GREP="$ac_cv_path_GREP"
  4.6813 +
  4.6814 +
  4.6815 +    else
  4.6816 +      # If it succeeded, then it was overridden by the user. We will use it
  4.6817 +      # for the tool.
  4.6818 +
  4.6819 +      # First remove it from the list of overridden variables, so we can test
  4.6820 +      # for unknown variables in the end.
  4.6821 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.6822 +
  4.6823 +      # Check if the provided tool contains a complete path.
  4.6824 +      tool_specified="$GREP"
  4.6825 +      tool_basename="${tool_specified##*/}"
  4.6826 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.6827 +        # A command without a complete path is provided, search $PATH.
  4.6828 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool GREP=$tool_basename" >&5
  4.6829 +$as_echo "$as_me: Will search for user supplied tool GREP=$tool_basename" >&6;}
  4.6830 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.6831 +set dummy $tool_basename; ac_word=$2
  4.6832 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.6833 +$as_echo_n "checking for $ac_word... " >&6; }
  4.6834 +if ${ac_cv_path_GREP+:} false; then :
  4.6835 +  $as_echo_n "(cached) " >&6
  4.6836 +else
  4.6837 +  case $GREP in
  4.6838 +  [\\/]* | ?:[\\/]*)
  4.6839 +  ac_cv_path_GREP="$GREP" # Let the user override the test with a path.
  4.6840 +  ;;
  4.6841 +  *)
  4.6842 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.6843 +for as_dir in $PATH
  4.6844 +do
  4.6845 +  IFS=$as_save_IFS
  4.6846 +  test -z "$as_dir" && as_dir=.
  4.6847 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.6848 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.6849 +    ac_cv_path_GREP="$as_dir/$ac_word$ac_exec_ext"
  4.6850 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.6851 +    break 2
  4.6852 +  fi
  4.6853 +done
  4.6854 +  done
  4.6855 +IFS=$as_save_IFS
  4.6856 +
  4.6857 +  ;;
  4.6858 +esac
  4.6859 +fi
  4.6860 +GREP=$ac_cv_path_GREP
  4.6861 +if test -n "$GREP"; then
  4.6862 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GREP" >&5
  4.6863 +$as_echo "$GREP" >&6; }
  4.6864 +else
  4.6865 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.6866 +$as_echo "no" >&6; }
  4.6867 +fi
  4.6868 +
  4.6869 +
  4.6870 +        if test "x$GREP" = x; then
  4.6871 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.6872 +        fi
  4.6873 +      else
  4.6874 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.6875 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool GREP=$tool_specified" >&5
  4.6876 +$as_echo "$as_me: Will use user supplied tool GREP=$tool_specified" >&6;}
  4.6877 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GREP" >&5
  4.6878 +$as_echo_n "checking for GREP... " >&6; }
  4.6879 +        if test ! -x "$tool_specified"; then
  4.6880 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.6881 +$as_echo "not found" >&6; }
  4.6882 +          as_fn_error $? "User supplied tool GREP=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.6883 +        fi
  4.6884 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.6885 +$as_echo "$tool_specified" >&6; }
  4.6886 +      fi
  4.6887 +    fi
  4.6888 +  fi
  4.6889 +
  4.6890  
  4.6891    if test "x$GREP" = x; then
  4.6892 -    if test "x" = x; then
  4.6893 -      PROG_NAME=grep
  4.6894 -    else
  4.6895 -      PROG_NAME=
  4.6896 -    fi
  4.6897 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.6898 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.6899 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.6900 -  fi
  4.6901 -
  4.6902 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
  4.6903 +    as_fn_error $? "Could not find required tool for GREP" "$LINENO" 5
  4.6904 +  fi
  4.6905 +
  4.6906 +
  4.6907 +
  4.6908 +
  4.6909 +  # Publish this variable in the help.
  4.6910 +
  4.6911 +
  4.6912 +  if test "x$EGREP" = x; then
  4.6913 +    # The variable is not set by user, try to locate tool using the code snippet
  4.6914 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
  4.6915  $as_echo_n "checking for egrep... " >&6; }
  4.6916  if ${ac_cv_path_EGREP+:} false; then :
  4.6917    $as_echo_n "(cached) " >&6
  4.6918 @@ -6265,19 +11735,175 @@
  4.6919   EGREP="$ac_cv_path_EGREP"
  4.6920  
  4.6921  
  4.6922 +  else
  4.6923 +    # The variable is set, but is it from the command line or the environment?
  4.6924 +
  4.6925 +    # Try to remove the string !EGREP! from our list.
  4.6926 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!EGREP!/}
  4.6927 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.6928 +      # If it failed, the variable was not from the command line. Ignore it,
  4.6929 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.6930 +      if test "xEGREP" != xBASH; then
  4.6931 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of EGREP from the environment. Use command line variables instead." >&5
  4.6932 +$as_echo "$as_me: WARNING: Ignoring value of EGREP from the environment. Use command line variables instead." >&2;}
  4.6933 +      fi
  4.6934 +      # Try to locate tool using the code snippet
  4.6935 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
  4.6936 +$as_echo_n "checking for egrep... " >&6; }
  4.6937 +if ${ac_cv_path_EGREP+:} false; then :
  4.6938 +  $as_echo_n "(cached) " >&6
  4.6939 +else
  4.6940 +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
  4.6941 +   then ac_cv_path_EGREP="$GREP -E"
  4.6942 +   else
  4.6943 +     if test -z "$EGREP"; then
  4.6944 +  ac_path_EGREP_found=false
  4.6945 +  # Loop through the user's path and test for each of PROGNAME-LIST
  4.6946 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.6947 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  4.6948 +do
  4.6949 +  IFS=$as_save_IFS
  4.6950 +  test -z "$as_dir" && as_dir=.
  4.6951 +    for ac_prog in egrep; do
  4.6952 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.6953 +      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
  4.6954 +      as_fn_executable_p "$ac_path_EGREP" || continue
  4.6955 +# Check for GNU ac_path_EGREP and select it if it is found.
  4.6956 +  # Check for GNU $ac_path_EGREP
  4.6957 +case `"$ac_path_EGREP" --version 2>&1` in
  4.6958 +*GNU*)
  4.6959 +  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
  4.6960 +*)
  4.6961 +  ac_count=0
  4.6962 +  $as_echo_n 0123456789 >"conftest.in"
  4.6963 +  while :
  4.6964 +  do
  4.6965 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
  4.6966 +    mv "conftest.tmp" "conftest.in"
  4.6967 +    cp "conftest.in" "conftest.nl"
  4.6968 +    $as_echo 'EGREP' >> "conftest.nl"
  4.6969 +    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
  4.6970 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  4.6971 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
  4.6972 +    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
  4.6973 +      # Best one so far, save it but keep looking for a better one
  4.6974 +      ac_cv_path_EGREP="$ac_path_EGREP"
  4.6975 +      ac_path_EGREP_max=$ac_count
  4.6976 +    fi
  4.6977 +    # 10*(2^10) chars as input seems more than enough
  4.6978 +    test $ac_count -gt 10 && break
  4.6979 +  done
  4.6980 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  4.6981 +esac
  4.6982 +
  4.6983 +      $ac_path_EGREP_found && break 3
  4.6984 +    done
  4.6985 +  done
  4.6986 +  done
  4.6987 +IFS=$as_save_IFS
  4.6988 +  if test -z "$ac_cv_path_EGREP"; then
  4.6989 +    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  4.6990 +  fi
  4.6991 +else
  4.6992 +  ac_cv_path_EGREP=$EGREP
  4.6993 +fi
  4.6994 +
  4.6995 +   fi
  4.6996 +fi
  4.6997 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
  4.6998 +$as_echo "$ac_cv_path_EGREP" >&6; }
  4.6999 + EGREP="$ac_cv_path_EGREP"
  4.7000 +
  4.7001 +
  4.7002 +    else
  4.7003 +      # If it succeeded, then it was overridden by the user. We will use it
  4.7004 +      # for the tool.
  4.7005 +
  4.7006 +      # First remove it from the list of overridden variables, so we can test
  4.7007 +      # for unknown variables in the end.
  4.7008 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.7009 +
  4.7010 +      # Check if the provided tool contains a complete path.
  4.7011 +      tool_specified="$EGREP"
  4.7012 +      tool_basename="${tool_specified##*/}"
  4.7013 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.7014 +        # A command without a complete path is provided, search $PATH.
  4.7015 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool EGREP=$tool_basename" >&5
  4.7016 +$as_echo "$as_me: Will search for user supplied tool EGREP=$tool_basename" >&6;}
  4.7017 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.7018 +set dummy $tool_basename; ac_word=$2
  4.7019 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7020 +$as_echo_n "checking for $ac_word... " >&6; }
  4.7021 +if ${ac_cv_path_EGREP+:} false; then :
  4.7022 +  $as_echo_n "(cached) " >&6
  4.7023 +else
  4.7024 +  case $EGREP in
  4.7025 +  [\\/]* | ?:[\\/]*)
  4.7026 +  ac_cv_path_EGREP="$EGREP" # Let the user override the test with a path.
  4.7027 +  ;;
  4.7028 +  *)
  4.7029 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7030 +for as_dir in $PATH
  4.7031 +do
  4.7032 +  IFS=$as_save_IFS
  4.7033 +  test -z "$as_dir" && as_dir=.
  4.7034 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7035 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.7036 +    ac_cv_path_EGREP="$as_dir/$ac_word$ac_exec_ext"
  4.7037 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.7038 +    break 2
  4.7039 +  fi
  4.7040 +done
  4.7041 +  done
  4.7042 +IFS=$as_save_IFS
  4.7043 +
  4.7044 +  ;;
  4.7045 +esac
  4.7046 +fi
  4.7047 +EGREP=$ac_cv_path_EGREP
  4.7048 +if test -n "$EGREP"; then
  4.7049 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EGREP" >&5
  4.7050 +$as_echo "$EGREP" >&6; }
  4.7051 +else
  4.7052 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.7053 +$as_echo "no" >&6; }
  4.7054 +fi
  4.7055 +
  4.7056 +
  4.7057 +        if test "x$EGREP" = x; then
  4.7058 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.7059 +        fi
  4.7060 +      else
  4.7061 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.7062 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool EGREP=$tool_specified" >&5
  4.7063 +$as_echo "$as_me: Will use user supplied tool EGREP=$tool_specified" >&6;}
  4.7064 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGREP" >&5
  4.7065 +$as_echo_n "checking for EGREP... " >&6; }
  4.7066 +        if test ! -x "$tool_specified"; then
  4.7067 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.7068 +$as_echo "not found" >&6; }
  4.7069 +          as_fn_error $? "User supplied tool EGREP=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.7070 +        fi
  4.7071 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.7072 +$as_echo "$tool_specified" >&6; }
  4.7073 +      fi
  4.7074 +    fi
  4.7075 +  fi
  4.7076 +
  4.7077  
  4.7078    if test "x$EGREP" = x; then
  4.7079 -    if test "x" = x; then
  4.7080 -      PROG_NAME=egrep
  4.7081 -    else
  4.7082 -      PROG_NAME=
  4.7083 -    fi
  4.7084 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.7085 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.7086 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.7087 -  fi
  4.7088 -
  4.7089 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
  4.7090 +    as_fn_error $? "Could not find required tool for EGREP" "$LINENO" 5
  4.7091 +  fi
  4.7092 +
  4.7093 +
  4.7094 +
  4.7095 +
  4.7096 +  # Publish this variable in the help.
  4.7097 +
  4.7098 +
  4.7099 +  if test "x$FGREP" = x; then
  4.7100 +    # The variable is not set by user, try to locate tool using the code snippet
  4.7101 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
  4.7102  $as_echo_n "checking for fgrep... " >&6; }
  4.7103  if ${ac_cv_path_FGREP+:} false; then :
  4.7104    $as_echo_n "(cached) " >&6
  4.7105 @@ -6344,19 +11970,175 @@
  4.7106   FGREP="$ac_cv_path_FGREP"
  4.7107  
  4.7108  
  4.7109 +  else
  4.7110 +    # The variable is set, but is it from the command line or the environment?
  4.7111 +
  4.7112 +    # Try to remove the string !FGREP! from our list.
  4.7113 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!FGREP!/}
  4.7114 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.7115 +      # If it failed, the variable was not from the command line. Ignore it,
  4.7116 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.7117 +      if test "xFGREP" != xBASH; then
  4.7118 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of FGREP from the environment. Use command line variables instead." >&5
  4.7119 +$as_echo "$as_me: WARNING: Ignoring value of FGREP from the environment. Use command line variables instead." >&2;}
  4.7120 +      fi
  4.7121 +      # Try to locate tool using the code snippet
  4.7122 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
  4.7123 +$as_echo_n "checking for fgrep... " >&6; }
  4.7124 +if ${ac_cv_path_FGREP+:} false; then :
  4.7125 +  $as_echo_n "(cached) " >&6
  4.7126 +else
  4.7127 +  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
  4.7128 +   then ac_cv_path_FGREP="$GREP -F"
  4.7129 +   else
  4.7130 +     if test -z "$FGREP"; then
  4.7131 +  ac_path_FGREP_found=false
  4.7132 +  # Loop through the user's path and test for each of PROGNAME-LIST
  4.7133 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7134 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  4.7135 +do
  4.7136 +  IFS=$as_save_IFS
  4.7137 +  test -z "$as_dir" && as_dir=.
  4.7138 +    for ac_prog in fgrep; do
  4.7139 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7140 +      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
  4.7141 +      as_fn_executable_p "$ac_path_FGREP" || continue
  4.7142 +# Check for GNU ac_path_FGREP and select it if it is found.
  4.7143 +  # Check for GNU $ac_path_FGREP
  4.7144 +case `"$ac_path_FGREP" --version 2>&1` in
  4.7145 +*GNU*)
  4.7146 +  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
  4.7147 +*)
  4.7148 +  ac_count=0
  4.7149 +  $as_echo_n 0123456789 >"conftest.in"
  4.7150 +  while :
  4.7151 +  do
  4.7152 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
  4.7153 +    mv "conftest.tmp" "conftest.in"
  4.7154 +    cp "conftest.in" "conftest.nl"
  4.7155 +    $as_echo 'FGREP' >> "conftest.nl"
  4.7156 +    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
  4.7157 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  4.7158 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
  4.7159 +    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
  4.7160 +      # Best one so far, save it but keep looking for a better one
  4.7161 +      ac_cv_path_FGREP="$ac_path_FGREP"
  4.7162 +      ac_path_FGREP_max=$ac_count
  4.7163 +    fi
  4.7164 +    # 10*(2^10) chars as input seems more than enough
  4.7165 +    test $ac_count -gt 10 && break
  4.7166 +  done
  4.7167 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  4.7168 +esac
  4.7169 +
  4.7170 +      $ac_path_FGREP_found && break 3
  4.7171 +    done
  4.7172 +  done
  4.7173 +  done
  4.7174 +IFS=$as_save_IFS
  4.7175 +  if test -z "$ac_cv_path_FGREP"; then
  4.7176 +    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
  4.7177 +  fi
  4.7178 +else
  4.7179 +  ac_cv_path_FGREP=$FGREP
  4.7180 +fi
  4.7181 +
  4.7182 +   fi
  4.7183 +fi
  4.7184 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
  4.7185 +$as_echo "$ac_cv_path_FGREP" >&6; }
  4.7186 + FGREP="$ac_cv_path_FGREP"
  4.7187 +
  4.7188 +
  4.7189 +    else
  4.7190 +      # If it succeeded, then it was overridden by the user. We will use it
  4.7191 +      # for the tool.
  4.7192 +
  4.7193 +      # First remove it from the list of overridden variables, so we can test
  4.7194 +      # for unknown variables in the end.
  4.7195 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.7196 +
  4.7197 +      # Check if the provided tool contains a complete path.
  4.7198 +      tool_specified="$FGREP"
  4.7199 +      tool_basename="${tool_specified##*/}"
  4.7200 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.7201 +        # A command without a complete path is provided, search $PATH.
  4.7202 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool FGREP=$tool_basename" >&5
  4.7203 +$as_echo "$as_me: Will search for user supplied tool FGREP=$tool_basename" >&6;}
  4.7204 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.7205 +set dummy $tool_basename; ac_word=$2
  4.7206 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7207 +$as_echo_n "checking for $ac_word... " >&6; }
  4.7208 +if ${ac_cv_path_FGREP+:} false; then :
  4.7209 +  $as_echo_n "(cached) " >&6
  4.7210 +else
  4.7211 +  case $FGREP in
  4.7212 +  [\\/]* | ?:[\\/]*)
  4.7213 +  ac_cv_path_FGREP="$FGREP" # Let the user override the test with a path.
  4.7214 +  ;;
  4.7215 +  *)
  4.7216 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7217 +for as_dir in $PATH
  4.7218 +do
  4.7219 +  IFS=$as_save_IFS
  4.7220 +  test -z "$as_dir" && as_dir=.
  4.7221 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7222 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.7223 +    ac_cv_path_FGREP="$as_dir/$ac_word$ac_exec_ext"
  4.7224 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.7225 +    break 2
  4.7226 +  fi
  4.7227 +done
  4.7228 +  done
  4.7229 +IFS=$as_save_IFS
  4.7230 +
  4.7231 +  ;;
  4.7232 +esac
  4.7233 +fi
  4.7234 +FGREP=$ac_cv_path_FGREP
  4.7235 +if test -n "$FGREP"; then
  4.7236 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FGREP" >&5
  4.7237 +$as_echo "$FGREP" >&6; }
  4.7238 +else
  4.7239 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.7240 +$as_echo "no" >&6; }
  4.7241 +fi
  4.7242 +
  4.7243 +
  4.7244 +        if test "x$FGREP" = x; then
  4.7245 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.7246 +        fi
  4.7247 +      else
  4.7248 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.7249 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool FGREP=$tool_specified" >&5
  4.7250 +$as_echo "$as_me: Will use user supplied tool FGREP=$tool_specified" >&6;}
  4.7251 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FGREP" >&5
  4.7252 +$as_echo_n "checking for FGREP... " >&6; }
  4.7253 +        if test ! -x "$tool_specified"; then
  4.7254 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.7255 +$as_echo "not found" >&6; }
  4.7256 +          as_fn_error $? "User supplied tool FGREP=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.7257 +        fi
  4.7258 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.7259 +$as_echo "$tool_specified" >&6; }
  4.7260 +      fi
  4.7261 +    fi
  4.7262 +  fi
  4.7263 +
  4.7264  
  4.7265    if test "x$FGREP" = x; then
  4.7266 -    if test "x" = x; then
  4.7267 -      PROG_NAME=fgrep
  4.7268 -    else
  4.7269 -      PROG_NAME=
  4.7270 -    fi
  4.7271 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.7272 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.7273 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.7274 -  fi
  4.7275 -
  4.7276 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
  4.7277 +    as_fn_error $? "Could not find required tool for FGREP" "$LINENO" 5
  4.7278 +  fi
  4.7279 +
  4.7280 +
  4.7281 +
  4.7282 +
  4.7283 +  # Publish this variable in the help.
  4.7284 +
  4.7285 +
  4.7286 +  if test "x$SED" = x; then
  4.7287 +    # The variable is not set by user, try to locate tool using the code snippet
  4.7288 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
  4.7289  $as_echo_n "checking for a sed that does not truncate output... " >&6; }
  4.7290  if ${ac_cv_path_SED+:} false; then :
  4.7291    $as_echo_n "(cached) " >&6
  4.7292 @@ -6425,75 +12207,168 @@
  4.7293   SED="$ac_cv_path_SED"
  4.7294    rm -f conftest.sed
  4.7295  
  4.7296 +  else
  4.7297 +    # The variable is set, but is it from the command line or the environment?
  4.7298 +
  4.7299 +    # Try to remove the string !SED! from our list.
  4.7300 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!SED!/}
  4.7301 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.7302 +      # If it failed, the variable was not from the command line. Ignore it,
  4.7303 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.7304 +      if test "xSED" != xBASH; then
  4.7305 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of SED from the environment. Use command line variables instead." >&5
  4.7306 +$as_echo "$as_me: WARNING: Ignoring value of SED from the environment. Use command line variables instead." >&2;}
  4.7307 +      fi
  4.7308 +      # Try to locate tool using the code snippet
  4.7309 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
  4.7310 +$as_echo_n "checking for a sed that does not truncate output... " >&6; }
  4.7311 +if ${ac_cv_path_SED+:} false; then :
  4.7312 +  $as_echo_n "(cached) " >&6
  4.7313 +else
  4.7314 +            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
  4.7315 +     for ac_i in 1 2 3 4 5 6 7; do
  4.7316 +       ac_script="$ac_script$as_nl$ac_script"
  4.7317 +     done
  4.7318 +     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
  4.7319 +     { ac_script=; unset ac_script;}
  4.7320 +     if test -z "$SED"; then
  4.7321 +  ac_path_SED_found=false
  4.7322 +  # Loop through the user's path and test for each of PROGNAME-LIST
  4.7323 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7324 +for as_dir in $PATH
  4.7325 +do
  4.7326 +  IFS=$as_save_IFS
  4.7327 +  test -z "$as_dir" && as_dir=.
  4.7328 +    for ac_prog in sed gsed; do
  4.7329 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7330 +      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
  4.7331 +      as_fn_executable_p "$ac_path_SED" || continue
  4.7332 +# Check for GNU ac_path_SED and select it if it is found.
  4.7333 +  # Check for GNU $ac_path_SED
  4.7334 +case `"$ac_path_SED" --version 2>&1` in
  4.7335 +*GNU*)
  4.7336 +  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
  4.7337 +*)
  4.7338 +  ac_count=0
  4.7339 +  $as_echo_n 0123456789 >"conftest.in"
  4.7340 +  while :
  4.7341 +  do
  4.7342 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
  4.7343 +    mv "conftest.tmp" "conftest.in"
  4.7344 +    cp "conftest.in" "conftest.nl"
  4.7345 +    $as_echo '' >> "conftest.nl"
  4.7346 +    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
  4.7347 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  4.7348 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
  4.7349 +    if test $ac_count -gt ${ac_path_SED_max-0}; then
  4.7350 +      # Best one so far, save it but keep looking for a better one
  4.7351 +      ac_cv_path_SED="$ac_path_SED"
  4.7352 +      ac_path_SED_max=$ac_count
  4.7353 +    fi
  4.7354 +    # 10*(2^10) chars as input seems more than enough
  4.7355 +    test $ac_count -gt 10 && break
  4.7356 +  done
  4.7357 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  4.7358 +esac
  4.7359 +
  4.7360 +      $ac_path_SED_found && break 3
  4.7361 +    done
  4.7362 +  done
  4.7363 +  done
  4.7364 +IFS=$as_save_IFS
  4.7365 +  if test -z "$ac_cv_path_SED"; then
  4.7366 +    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
  4.7367 +  fi
  4.7368 +else
  4.7369 +  ac_cv_path_SED=$SED
  4.7370 +fi
  4.7371 +
  4.7372 +fi
  4.7373 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
  4.7374 +$as_echo "$ac_cv_path_SED" >&6; }
  4.7375 + SED="$ac_cv_path_SED"
  4.7376 +  rm -f conftest.sed
  4.7377 +
  4.7378 +    else
  4.7379 +      # If it succeeded, then it was overridden by the user. We will use it
  4.7380 +      # for the tool.
  4.7381 +
  4.7382 +      # First remove it from the list of overridden variables, so we can test
  4.7383 +      # for unknown variables in the end.
  4.7384 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.7385 +
  4.7386 +      # Check if the provided tool contains a complete path.
  4.7387 +      tool_specified="$SED"
  4.7388 +      tool_basename="${tool_specified##*/}"
  4.7389 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.7390 +        # A command without a complete path is provided, search $PATH.
  4.7391 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool SED=$tool_basename" >&5
  4.7392 +$as_echo "$as_me: Will search for user supplied tool SED=$tool_basename" >&6;}
  4.7393 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.7394 +set dummy $tool_basename; ac_word=$2
  4.7395 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7396 +$as_echo_n "checking for $ac_word... " >&6; }
  4.7397 +if ${ac_cv_path_SED+:} false; then :
  4.7398 +  $as_echo_n "(cached) " >&6
  4.7399 +else
  4.7400 +  case $SED in
  4.7401 +  [\\/]* | ?:[\\/]*)
  4.7402 +  ac_cv_path_SED="$SED" # Let the user override the test with a path.
  4.7403 +  ;;
  4.7404 +  *)
  4.7405 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7406 +for as_dir in $PATH
  4.7407 +do
  4.7408 +  IFS=$as_save_IFS
  4.7409 +  test -z "$as_dir" && as_dir=.
  4.7410 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7411 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.7412 +    ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
  4.7413 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.7414 +    break 2
  4.7415 +  fi
  4.7416 +done
  4.7417 +  done
  4.7418 +IFS=$as_save_IFS
  4.7419 +
  4.7420 +  ;;
  4.7421 +esac
  4.7422 +fi
  4.7423 +SED=$ac_cv_path_SED
  4.7424 +if test -n "$SED"; then
  4.7425 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
  4.7426 +$as_echo "$SED" >&6; }
  4.7427 +else
  4.7428 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.7429 +$as_echo "no" >&6; }
  4.7430 +fi
  4.7431 +
  4.7432 +
  4.7433 +        if test "x$SED" = x; then
  4.7434 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.7435 +        fi
  4.7436 +      else
  4.7437 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.7438 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool SED=$tool_specified" >&5
  4.7439 +$as_echo "$as_me: Will use user supplied tool SED=$tool_specified" >&6;}
  4.7440 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SED" >&5
  4.7441 +$as_echo_n "checking for SED... " >&6; }
  4.7442 +        if test ! -x "$tool_specified"; then
  4.7443 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.7444 +$as_echo "not found" >&6; }
  4.7445 +          as_fn_error $? "User supplied tool SED=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.7446 +        fi
  4.7447 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.7448 +$as_echo "$tool_specified" >&6; }
  4.7449 +      fi
  4.7450 +    fi
  4.7451 +  fi
  4.7452 +
  4.7453  
  4.7454    if test "x$SED" = x; then
  4.7455 -    if test "x" = x; then
  4.7456 -      PROG_NAME=sed
  4.7457 -    else
  4.7458 -      PROG_NAME=
  4.7459 -    fi
  4.7460 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.7461 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.7462 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.7463 -  fi
  4.7464 -
  4.7465 -
  4.7466 -  for ac_prog in nawk gawk awk
  4.7467 -do
  4.7468 -  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.7469 -set dummy $ac_prog; ac_word=$2
  4.7470 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7471 -$as_echo_n "checking for $ac_word... " >&6; }
  4.7472 -if ${ac_cv_path_NAWK+:} false; then :
  4.7473 -  $as_echo_n "(cached) " >&6
  4.7474 -else
  4.7475 -  case $NAWK in
  4.7476 -  [\\/]* | ?:[\\/]*)
  4.7477 -  ac_cv_path_NAWK="$NAWK" # Let the user override the test with a path.
  4.7478 -  ;;
  4.7479 -  *)
  4.7480 -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7481 -for as_dir in $PATH
  4.7482 -do
  4.7483 -  IFS=$as_save_IFS
  4.7484 -  test -z "$as_dir" && as_dir=.
  4.7485 -    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7486 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.7487 -    ac_cv_path_NAWK="$as_dir/$ac_word$ac_exec_ext"
  4.7488 -    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.7489 -    break 2
  4.7490 -  fi
  4.7491 -done
  4.7492 -  done
  4.7493 -IFS=$as_save_IFS
  4.7494 -
  4.7495 -  ;;
  4.7496 -esac
  4.7497 -fi
  4.7498 -NAWK=$ac_cv_path_NAWK
  4.7499 -if test -n "$NAWK"; then
  4.7500 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NAWK" >&5
  4.7501 -$as_echo "$NAWK" >&6; }
  4.7502 -else
  4.7503 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.7504 -$as_echo "no" >&6; }
  4.7505 -fi
  4.7506 -
  4.7507 -
  4.7508 -  test -n "$NAWK" && break
  4.7509 -done
  4.7510 -
  4.7511 -
  4.7512 -  if test "x$NAWK" = x; then
  4.7513 -    if test "x" = x; then
  4.7514 -      PROG_NAME=nawk
  4.7515 -    else
  4.7516 -      PROG_NAME=
  4.7517 -    fi
  4.7518 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.7519 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.7520 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.7521 -  fi
  4.7522 +    as_fn_error $? "Could not find required tool for SED" "$LINENO" 5
  4.7523 +  fi
  4.7524 +
  4.7525  
  4.7526  
  4.7527    # Always force rm.
  4.7528 @@ -6504,8 +12379,17 @@
  4.7529    THEPWDCMD=pwd
  4.7530  
  4.7531    # These are not required on all platforms
  4.7532 -  # Extract the first word of "cygpath", so it can be a program name with args.
  4.7533 -set dummy cygpath; ac_word=$2
  4.7534 +
  4.7535 +
  4.7536 +  # Publish this variable in the help.
  4.7537 +
  4.7538 +
  4.7539 +  if test "x$CYGPATH" = x; then
  4.7540 +    # The variable is not set by user, try to locate tool using the code snippet
  4.7541 +    for ac_prog in cygpath
  4.7542 +do
  4.7543 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.7544 +set dummy $ac_prog; ac_word=$2
  4.7545  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7546  $as_echo_n "checking for $ac_word... " >&6; }
  4.7547  if ${ac_cv_path_CYGPATH+:} false; then :
  4.7548 @@ -6544,8 +12428,154 @@
  4.7549  fi
  4.7550  
  4.7551  
  4.7552 -  # Extract the first word of "readlink", so it can be a program name with args.
  4.7553 -set dummy readlink; ac_word=$2
  4.7554 +  test -n "$CYGPATH" && break
  4.7555 +done
  4.7556 +
  4.7557 +  else
  4.7558 +    # The variable is set, but is it from the command line or the environment?
  4.7559 +
  4.7560 +    # Try to remove the string !CYGPATH! from our list.
  4.7561 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CYGPATH!/}
  4.7562 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.7563 +      # If it failed, the variable was not from the command line. Ignore it,
  4.7564 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.7565 +      if test "xCYGPATH" != xBASH; then
  4.7566 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CYGPATH from the environment. Use command line variables instead." >&5
  4.7567 +$as_echo "$as_me: WARNING: Ignoring value of CYGPATH from the environment. Use command line variables instead." >&2;}
  4.7568 +      fi
  4.7569 +      # Try to locate tool using the code snippet
  4.7570 +      for ac_prog in cygpath
  4.7571 +do
  4.7572 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.7573 +set dummy $ac_prog; ac_word=$2
  4.7574 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7575 +$as_echo_n "checking for $ac_word... " >&6; }
  4.7576 +if ${ac_cv_path_CYGPATH+:} false; then :
  4.7577 +  $as_echo_n "(cached) " >&6
  4.7578 +else
  4.7579 +  case $CYGPATH in
  4.7580 +  [\\/]* | ?:[\\/]*)
  4.7581 +  ac_cv_path_CYGPATH="$CYGPATH" # Let the user override the test with a path.
  4.7582 +  ;;
  4.7583 +  *)
  4.7584 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7585 +for as_dir in $PATH
  4.7586 +do
  4.7587 +  IFS=$as_save_IFS
  4.7588 +  test -z "$as_dir" && as_dir=.
  4.7589 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7590 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.7591 +    ac_cv_path_CYGPATH="$as_dir/$ac_word$ac_exec_ext"
  4.7592 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.7593 +    break 2
  4.7594 +  fi
  4.7595 +done
  4.7596 +  done
  4.7597 +IFS=$as_save_IFS
  4.7598 +
  4.7599 +  ;;
  4.7600 +esac
  4.7601 +fi
  4.7602 +CYGPATH=$ac_cv_path_CYGPATH
  4.7603 +if test -n "$CYGPATH"; then
  4.7604 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGPATH" >&5
  4.7605 +$as_echo "$CYGPATH" >&6; }
  4.7606 +else
  4.7607 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.7608 +$as_echo "no" >&6; }
  4.7609 +fi
  4.7610 +
  4.7611 +
  4.7612 +  test -n "$CYGPATH" && break
  4.7613 +done
  4.7614 +
  4.7615 +    else
  4.7616 +      # If it succeeded, then it was overridden by the user. We will use it
  4.7617 +      # for the tool.
  4.7618 +
  4.7619 +      # First remove it from the list of overridden variables, so we can test
  4.7620 +      # for unknown variables in the end.
  4.7621 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.7622 +
  4.7623 +      # Check if the provided tool contains a complete path.
  4.7624 +      tool_specified="$CYGPATH"
  4.7625 +      tool_basename="${tool_specified##*/}"
  4.7626 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.7627 +        # A command without a complete path is provided, search $PATH.
  4.7628 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CYGPATH=$tool_basename" >&5
  4.7629 +$as_echo "$as_me: Will search for user supplied tool CYGPATH=$tool_basename" >&6;}
  4.7630 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.7631 +set dummy $tool_basename; ac_word=$2
  4.7632 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7633 +$as_echo_n "checking for $ac_word... " >&6; }
  4.7634 +if ${ac_cv_path_CYGPATH+:} false; then :
  4.7635 +  $as_echo_n "(cached) " >&6
  4.7636 +else
  4.7637 +  case $CYGPATH in
  4.7638 +  [\\/]* | ?:[\\/]*)
  4.7639 +  ac_cv_path_CYGPATH="$CYGPATH" # Let the user override the test with a path.
  4.7640 +  ;;
  4.7641 +  *)
  4.7642 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7643 +for as_dir in $PATH
  4.7644 +do
  4.7645 +  IFS=$as_save_IFS
  4.7646 +  test -z "$as_dir" && as_dir=.
  4.7647 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7648 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.7649 +    ac_cv_path_CYGPATH="$as_dir/$ac_word$ac_exec_ext"
  4.7650 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.7651 +    break 2
  4.7652 +  fi
  4.7653 +done
  4.7654 +  done
  4.7655 +IFS=$as_save_IFS
  4.7656 +
  4.7657 +  ;;
  4.7658 +esac
  4.7659 +fi
  4.7660 +CYGPATH=$ac_cv_path_CYGPATH
  4.7661 +if test -n "$CYGPATH"; then
  4.7662 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGPATH" >&5
  4.7663 +$as_echo "$CYGPATH" >&6; }
  4.7664 +else
  4.7665 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.7666 +$as_echo "no" >&6; }
  4.7667 +fi
  4.7668 +
  4.7669 +
  4.7670 +        if test "x$CYGPATH" = x; then
  4.7671 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.7672 +        fi
  4.7673 +      else
  4.7674 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.7675 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CYGPATH=$tool_specified" >&5
  4.7676 +$as_echo "$as_me: Will use user supplied tool CYGPATH=$tool_specified" >&6;}
  4.7677 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGPATH" >&5
  4.7678 +$as_echo_n "checking for CYGPATH... " >&6; }
  4.7679 +        if test ! -x "$tool_specified"; then
  4.7680 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.7681 +$as_echo "not found" >&6; }
  4.7682 +          as_fn_error $? "User supplied tool CYGPATH=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.7683 +        fi
  4.7684 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.7685 +$as_echo "$tool_specified" >&6; }
  4.7686 +      fi
  4.7687 +    fi
  4.7688 +  fi
  4.7689 +
  4.7690 +
  4.7691 +
  4.7692 +
  4.7693 +  # Publish this variable in the help.
  4.7694 +
  4.7695 +
  4.7696 +  if test "x$READLINK" = x; then
  4.7697 +    # The variable is not set by user, try to locate tool using the code snippet
  4.7698 +    for ac_prog in greadlink readlink
  4.7699 +do
  4.7700 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.7701 +set dummy $ac_prog; ac_word=$2
  4.7702  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7703  $as_echo_n "checking for $ac_word... " >&6; }
  4.7704  if ${ac_cv_path_READLINK+:} false; then :
  4.7705 @@ -6584,8 +12614,154 @@
  4.7706  fi
  4.7707  
  4.7708  
  4.7709 -  # Extract the first word of "df", so it can be a program name with args.
  4.7710 -set dummy df; ac_word=$2
  4.7711 +  test -n "$READLINK" && break
  4.7712 +done
  4.7713 +
  4.7714 +  else
  4.7715 +    # The variable is set, but is it from the command line or the environment?
  4.7716 +
  4.7717 +    # Try to remove the string !READLINK! from our list.
  4.7718 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!READLINK!/}
  4.7719 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.7720 +      # If it failed, the variable was not from the command line. Ignore it,
  4.7721 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.7722 +      if test "xREADLINK" != xBASH; then
  4.7723 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of READLINK from the environment. Use command line variables instead." >&5
  4.7724 +$as_echo "$as_me: WARNING: Ignoring value of READLINK from the environment. Use command line variables instead." >&2;}
  4.7725 +      fi
  4.7726 +      # Try to locate tool using the code snippet
  4.7727 +      for ac_prog in greadlink readlink
  4.7728 +do
  4.7729 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.7730 +set dummy $ac_prog; ac_word=$2
  4.7731 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7732 +$as_echo_n "checking for $ac_word... " >&6; }
  4.7733 +if ${ac_cv_path_READLINK+:} false; then :
  4.7734 +  $as_echo_n "(cached) " >&6
  4.7735 +else
  4.7736 +  case $READLINK in
  4.7737 +  [\\/]* | ?:[\\/]*)
  4.7738 +  ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path.
  4.7739 +  ;;
  4.7740 +  *)
  4.7741 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7742 +for as_dir in $PATH
  4.7743 +do
  4.7744 +  IFS=$as_save_IFS
  4.7745 +  test -z "$as_dir" && as_dir=.
  4.7746 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7747 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.7748 +    ac_cv_path_READLINK="$as_dir/$ac_word$ac_exec_ext"
  4.7749 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.7750 +    break 2
  4.7751 +  fi
  4.7752 +done
  4.7753 +  done
  4.7754 +IFS=$as_save_IFS
  4.7755 +
  4.7756 +  ;;
  4.7757 +esac
  4.7758 +fi
  4.7759 +READLINK=$ac_cv_path_READLINK
  4.7760 +if test -n "$READLINK"; then
  4.7761 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINK" >&5
  4.7762 +$as_echo "$READLINK" >&6; }
  4.7763 +else
  4.7764 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.7765 +$as_echo "no" >&6; }
  4.7766 +fi
  4.7767 +
  4.7768 +
  4.7769 +  test -n "$READLINK" && break
  4.7770 +done
  4.7771 +
  4.7772 +    else
  4.7773 +      # If it succeeded, then it was overridden by the user. We will use it
  4.7774 +      # for the tool.
  4.7775 +
  4.7776 +      # First remove it from the list of overridden variables, so we can test
  4.7777 +      # for unknown variables in the end.
  4.7778 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.7779 +
  4.7780 +      # Check if the provided tool contains a complete path.
  4.7781 +      tool_specified="$READLINK"
  4.7782 +      tool_basename="${tool_specified##*/}"
  4.7783 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.7784 +        # A command without a complete path is provided, search $PATH.
  4.7785 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool READLINK=$tool_basename" >&5
  4.7786 +$as_echo "$as_me: Will search for user supplied tool READLINK=$tool_basename" >&6;}
  4.7787 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.7788 +set dummy $tool_basename; ac_word=$2
  4.7789 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7790 +$as_echo_n "checking for $ac_word... " >&6; }
  4.7791 +if ${ac_cv_path_READLINK+:} false; then :
  4.7792 +  $as_echo_n "(cached) " >&6
  4.7793 +else
  4.7794 +  case $READLINK in
  4.7795 +  [\\/]* | ?:[\\/]*)
  4.7796 +  ac_cv_path_READLINK="$READLINK" # Let the user override the test with a path.
  4.7797 +  ;;
  4.7798 +  *)
  4.7799 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7800 +for as_dir in $PATH
  4.7801 +do
  4.7802 +  IFS=$as_save_IFS
  4.7803 +  test -z "$as_dir" && as_dir=.
  4.7804 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7805 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.7806 +    ac_cv_path_READLINK="$as_dir/$ac_word$ac_exec_ext"
  4.7807 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.7808 +    break 2
  4.7809 +  fi
  4.7810 +done
  4.7811 +  done
  4.7812 +IFS=$as_save_IFS
  4.7813 +
  4.7814 +  ;;
  4.7815 +esac
  4.7816 +fi
  4.7817 +READLINK=$ac_cv_path_READLINK
  4.7818 +if test -n "$READLINK"; then
  4.7819 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINK" >&5
  4.7820 +$as_echo "$READLINK" >&6; }
  4.7821 +else
  4.7822 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.7823 +$as_echo "no" >&6; }
  4.7824 +fi
  4.7825 +
  4.7826 +
  4.7827 +        if test "x$READLINK" = x; then
  4.7828 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.7829 +        fi
  4.7830 +      else
  4.7831 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.7832 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool READLINK=$tool_specified" >&5
  4.7833 +$as_echo "$as_me: Will use user supplied tool READLINK=$tool_specified" >&6;}
  4.7834 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for READLINK" >&5
  4.7835 +$as_echo_n "checking for READLINK... " >&6; }
  4.7836 +        if test ! -x "$tool_specified"; then
  4.7837 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.7838 +$as_echo "not found" >&6; }
  4.7839 +          as_fn_error $? "User supplied tool READLINK=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.7840 +        fi
  4.7841 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.7842 +$as_echo "$tool_specified" >&6; }
  4.7843 +      fi
  4.7844 +    fi
  4.7845 +  fi
  4.7846 +
  4.7847 +
  4.7848 +
  4.7849 +
  4.7850 +  # Publish this variable in the help.
  4.7851 +
  4.7852 +
  4.7853 +  if test "x$DF" = x; then
  4.7854 +    # The variable is not set by user, try to locate tool using the code snippet
  4.7855 +    for ac_prog in df
  4.7856 +do
  4.7857 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.7858 +set dummy $ac_prog; ac_word=$2
  4.7859  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7860  $as_echo_n "checking for $ac_word... " >&6; }
  4.7861  if ${ac_cv_path_DF+:} false; then :
  4.7862 @@ -6624,8 +12800,154 @@
  4.7863  fi
  4.7864  
  4.7865  
  4.7866 -  # Extract the first word of "SetFile", so it can be a program name with args.
  4.7867 -set dummy SetFile; ac_word=$2
  4.7868 +  test -n "$DF" && break
  4.7869 +done
  4.7870 +
  4.7871 +  else
  4.7872 +    # The variable is set, but is it from the command line or the environment?
  4.7873 +
  4.7874 +    # Try to remove the string !DF! from our list.
  4.7875 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!DF!/}
  4.7876 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.7877 +      # If it failed, the variable was not from the command line. Ignore it,
  4.7878 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.7879 +      if test "xDF" != xBASH; then
  4.7880 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of DF from the environment. Use command line variables instead." >&5
  4.7881 +$as_echo "$as_me: WARNING: Ignoring value of DF from the environment. Use command line variables instead." >&2;}
  4.7882 +      fi
  4.7883 +      # Try to locate tool using the code snippet
  4.7884 +      for ac_prog in df
  4.7885 +do
  4.7886 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.7887 +set dummy $ac_prog; ac_word=$2
  4.7888 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7889 +$as_echo_n "checking for $ac_word... " >&6; }
  4.7890 +if ${ac_cv_path_DF+:} false; then :
  4.7891 +  $as_echo_n "(cached) " >&6
  4.7892 +else
  4.7893 +  case $DF in
  4.7894 +  [\\/]* | ?:[\\/]*)
  4.7895 +  ac_cv_path_DF="$DF" # Let the user override the test with a path.
  4.7896 +  ;;
  4.7897 +  *)
  4.7898 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7899 +for as_dir in $PATH
  4.7900 +do
  4.7901 +  IFS=$as_save_IFS
  4.7902 +  test -z "$as_dir" && as_dir=.
  4.7903 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7904 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.7905 +    ac_cv_path_DF="$as_dir/$ac_word$ac_exec_ext"
  4.7906 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.7907 +    break 2
  4.7908 +  fi
  4.7909 +done
  4.7910 +  done
  4.7911 +IFS=$as_save_IFS
  4.7912 +
  4.7913 +  ;;
  4.7914 +esac
  4.7915 +fi
  4.7916 +DF=$ac_cv_path_DF
  4.7917 +if test -n "$DF"; then
  4.7918 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DF" >&5
  4.7919 +$as_echo "$DF" >&6; }
  4.7920 +else
  4.7921 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.7922 +$as_echo "no" >&6; }
  4.7923 +fi
  4.7924 +
  4.7925 +
  4.7926 +  test -n "$DF" && break
  4.7927 +done
  4.7928 +
  4.7929 +    else
  4.7930 +      # If it succeeded, then it was overridden by the user. We will use it
  4.7931 +      # for the tool.
  4.7932 +
  4.7933 +      # First remove it from the list of overridden variables, so we can test
  4.7934 +      # for unknown variables in the end.
  4.7935 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.7936 +
  4.7937 +      # Check if the provided tool contains a complete path.
  4.7938 +      tool_specified="$DF"
  4.7939 +      tool_basename="${tool_specified##*/}"
  4.7940 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.7941 +        # A command without a complete path is provided, search $PATH.
  4.7942 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool DF=$tool_basename" >&5
  4.7943 +$as_echo "$as_me: Will search for user supplied tool DF=$tool_basename" >&6;}
  4.7944 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.7945 +set dummy $tool_basename; ac_word=$2
  4.7946 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.7947 +$as_echo_n "checking for $ac_word... " >&6; }
  4.7948 +if ${ac_cv_path_DF+:} false; then :
  4.7949 +  $as_echo_n "(cached) " >&6
  4.7950 +else
  4.7951 +  case $DF in
  4.7952 +  [\\/]* | ?:[\\/]*)
  4.7953 +  ac_cv_path_DF="$DF" # Let the user override the test with a path.
  4.7954 +  ;;
  4.7955 +  *)
  4.7956 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.7957 +for as_dir in $PATH
  4.7958 +do
  4.7959 +  IFS=$as_save_IFS
  4.7960 +  test -z "$as_dir" && as_dir=.
  4.7961 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.7962 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.7963 +    ac_cv_path_DF="$as_dir/$ac_word$ac_exec_ext"
  4.7964 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.7965 +    break 2
  4.7966 +  fi
  4.7967 +done
  4.7968 +  done
  4.7969 +IFS=$as_save_IFS
  4.7970 +
  4.7971 +  ;;
  4.7972 +esac
  4.7973 +fi
  4.7974 +DF=$ac_cv_path_DF
  4.7975 +if test -n "$DF"; then
  4.7976 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DF" >&5
  4.7977 +$as_echo "$DF" >&6; }
  4.7978 +else
  4.7979 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.7980 +$as_echo "no" >&6; }
  4.7981 +fi
  4.7982 +
  4.7983 +
  4.7984 +        if test "x$DF" = x; then
  4.7985 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.7986 +        fi
  4.7987 +      else
  4.7988 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.7989 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool DF=$tool_specified" >&5
  4.7990 +$as_echo "$as_me: Will use user supplied tool DF=$tool_specified" >&6;}
  4.7991 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DF" >&5
  4.7992 +$as_echo_n "checking for DF... " >&6; }
  4.7993 +        if test ! -x "$tool_specified"; then
  4.7994 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.7995 +$as_echo "not found" >&6; }
  4.7996 +          as_fn_error $? "User supplied tool DF=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.7997 +        fi
  4.7998 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.7999 +$as_echo "$tool_specified" >&6; }
  4.8000 +      fi
  4.8001 +    fi
  4.8002 +  fi
  4.8003 +
  4.8004 +
  4.8005 +
  4.8006 +
  4.8007 +  # Publish this variable in the help.
  4.8008 +
  4.8009 +
  4.8010 +  if test "x$SETFILE" = x; then
  4.8011 +    # The variable is not set by user, try to locate tool using the code snippet
  4.8012 +    for ac_prog in SetFile
  4.8013 +do
  4.8014 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8015 +set dummy $ac_prog; ac_word=$2
  4.8016  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8017  $as_echo_n "checking for $ac_word... " >&6; }
  4.8018  if ${ac_cv_path_SETFILE+:} false; then :
  4.8019 @@ -6664,6 +12986,143 @@
  4.8020  fi
  4.8021  
  4.8022  
  4.8023 +  test -n "$SETFILE" && break
  4.8024 +done
  4.8025 +
  4.8026 +  else
  4.8027 +    # The variable is set, but is it from the command line or the environment?
  4.8028 +
  4.8029 +    # Try to remove the string !SETFILE! from our list.
  4.8030 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!SETFILE!/}
  4.8031 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.8032 +      # If it failed, the variable was not from the command line. Ignore it,
  4.8033 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.8034 +      if test "xSETFILE" != xBASH; then
  4.8035 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of SETFILE from the environment. Use command line variables instead." >&5
  4.8036 +$as_echo "$as_me: WARNING: Ignoring value of SETFILE from the environment. Use command line variables instead." >&2;}
  4.8037 +      fi
  4.8038 +      # Try to locate tool using the code snippet
  4.8039 +      for ac_prog in SetFile
  4.8040 +do
  4.8041 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8042 +set dummy $ac_prog; ac_word=$2
  4.8043 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8044 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8045 +if ${ac_cv_path_SETFILE+:} false; then :
  4.8046 +  $as_echo_n "(cached) " >&6
  4.8047 +else
  4.8048 +  case $SETFILE in
  4.8049 +  [\\/]* | ?:[\\/]*)
  4.8050 +  ac_cv_path_SETFILE="$SETFILE" # Let the user override the test with a path.
  4.8051 +  ;;
  4.8052 +  *)
  4.8053 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8054 +for as_dir in $PATH
  4.8055 +do
  4.8056 +  IFS=$as_save_IFS
  4.8057 +  test -z "$as_dir" && as_dir=.
  4.8058 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8059 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8060 +    ac_cv_path_SETFILE="$as_dir/$ac_word$ac_exec_ext"
  4.8061 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8062 +    break 2
  4.8063 +  fi
  4.8064 +done
  4.8065 +  done
  4.8066 +IFS=$as_save_IFS
  4.8067 +
  4.8068 +  ;;
  4.8069 +esac
  4.8070 +fi
  4.8071 +SETFILE=$ac_cv_path_SETFILE
  4.8072 +if test -n "$SETFILE"; then
  4.8073 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETFILE" >&5
  4.8074 +$as_echo "$SETFILE" >&6; }
  4.8075 +else
  4.8076 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8077 +$as_echo "no" >&6; }
  4.8078 +fi
  4.8079 +
  4.8080 +
  4.8081 +  test -n "$SETFILE" && break
  4.8082 +done
  4.8083 +
  4.8084 +    else
  4.8085 +      # If it succeeded, then it was overridden by the user. We will use it
  4.8086 +      # for the tool.
  4.8087 +
  4.8088 +      # First remove it from the list of overridden variables, so we can test
  4.8089 +      # for unknown variables in the end.
  4.8090 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.8091 +
  4.8092 +      # Check if the provided tool contains a complete path.
  4.8093 +      tool_specified="$SETFILE"
  4.8094 +      tool_basename="${tool_specified##*/}"
  4.8095 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.8096 +        # A command without a complete path is provided, search $PATH.
  4.8097 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool SETFILE=$tool_basename" >&5
  4.8098 +$as_echo "$as_me: Will search for user supplied tool SETFILE=$tool_basename" >&6;}
  4.8099 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.8100 +set dummy $tool_basename; ac_word=$2
  4.8101 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8102 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8103 +if ${ac_cv_path_SETFILE+:} false; then :
  4.8104 +  $as_echo_n "(cached) " >&6
  4.8105 +else
  4.8106 +  case $SETFILE in
  4.8107 +  [\\/]* | ?:[\\/]*)
  4.8108 +  ac_cv_path_SETFILE="$SETFILE" # Let the user override the test with a path.
  4.8109 +  ;;
  4.8110 +  *)
  4.8111 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8112 +for as_dir in $PATH
  4.8113 +do
  4.8114 +  IFS=$as_save_IFS
  4.8115 +  test -z "$as_dir" && as_dir=.
  4.8116 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8117 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8118 +    ac_cv_path_SETFILE="$as_dir/$ac_word$ac_exec_ext"
  4.8119 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8120 +    break 2
  4.8121 +  fi
  4.8122 +done
  4.8123 +  done
  4.8124 +IFS=$as_save_IFS
  4.8125 +
  4.8126 +  ;;
  4.8127 +esac
  4.8128 +fi
  4.8129 +SETFILE=$ac_cv_path_SETFILE
  4.8130 +if test -n "$SETFILE"; then
  4.8131 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SETFILE" >&5
  4.8132 +$as_echo "$SETFILE" >&6; }
  4.8133 +else
  4.8134 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8135 +$as_echo "no" >&6; }
  4.8136 +fi
  4.8137 +
  4.8138 +
  4.8139 +        if test "x$SETFILE" = x; then
  4.8140 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.8141 +        fi
  4.8142 +      else
  4.8143 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.8144 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool SETFILE=$tool_specified" >&5
  4.8145 +$as_echo "$as_me: Will use user supplied tool SETFILE=$tool_specified" >&6;}
  4.8146 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SETFILE" >&5
  4.8147 +$as_echo_n "checking for SETFILE... " >&6; }
  4.8148 +        if test ! -x "$tool_specified"; then
  4.8149 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.8150 +$as_echo "not found" >&6; }
  4.8151 +          as_fn_error $? "User supplied tool SETFILE=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.8152 +        fi
  4.8153 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.8154 +$as_echo "$tool_specified" >&6; }
  4.8155 +      fi
  4.8156 +    fi
  4.8157 +  fi
  4.8158 +
  4.8159 +
  4.8160  
  4.8161  
  4.8162  # Now we can determine OpenJDK build and target platforms. This is required to
  4.8163 @@ -10220,7 +16679,14 @@
  4.8164    # These tools might not be installed by default,
  4.8165    # need hint on how to install them.
  4.8166  
  4.8167 -  for ac_prog in unzip
  4.8168 +
  4.8169 +
  4.8170 +  # Publish this variable in the help.
  4.8171 +
  4.8172 +
  4.8173 +  if test "x$UNZIP" = x; then
  4.8174 +    # The variable is not set by user, try to locate tool using the code snippet
  4.8175 +    for ac_prog in unzip
  4.8176  do
  4.8177    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8178  set dummy $ac_prog; ac_word=$2
  4.8179 @@ -10265,21 +16731,155 @@
  4.8180    test -n "$UNZIP" && break
  4.8181  done
  4.8182  
  4.8183 +  else
  4.8184 +    # The variable is set, but is it from the command line or the environment?
  4.8185 +
  4.8186 +    # Try to remove the string !UNZIP! from our list.
  4.8187 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!UNZIP!/}
  4.8188 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.8189 +      # If it failed, the variable was not from the command line. Ignore it,
  4.8190 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.8191 +      if test "xUNZIP" != xBASH; then
  4.8192 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of UNZIP from the environment. Use command line variables instead." >&5
  4.8193 +$as_echo "$as_me: WARNING: Ignoring value of UNZIP from the environment. Use command line variables instead." >&2;}
  4.8194 +      fi
  4.8195 +      # Try to locate tool using the code snippet
  4.8196 +      for ac_prog in unzip
  4.8197 +do
  4.8198 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8199 +set dummy $ac_prog; ac_word=$2
  4.8200 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8201 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8202 +if ${ac_cv_path_UNZIP+:} false; then :
  4.8203 +  $as_echo_n "(cached) " >&6
  4.8204 +else
  4.8205 +  case $UNZIP in
  4.8206 +  [\\/]* | ?:[\\/]*)
  4.8207 +  ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path.
  4.8208 +  ;;
  4.8209 +  *)
  4.8210 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8211 +for as_dir in $PATH
  4.8212 +do
  4.8213 +  IFS=$as_save_IFS
  4.8214 +  test -z "$as_dir" && as_dir=.
  4.8215 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8216 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8217 +    ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
  4.8218 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8219 +    break 2
  4.8220 +  fi
  4.8221 +done
  4.8222 +  done
  4.8223 +IFS=$as_save_IFS
  4.8224 +
  4.8225 +  ;;
  4.8226 +esac
  4.8227 +fi
  4.8228 +UNZIP=$ac_cv_path_UNZIP
  4.8229 +if test -n "$UNZIP"; then
  4.8230 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5
  4.8231 +$as_echo "$UNZIP" >&6; }
  4.8232 +else
  4.8233 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8234 +$as_echo "no" >&6; }
  4.8235 +fi
  4.8236 +
  4.8237 +
  4.8238 +  test -n "$UNZIP" && break
  4.8239 +done
  4.8240 +
  4.8241 +    else
  4.8242 +      # If it succeeded, then it was overridden by the user. We will use it
  4.8243 +      # for the tool.
  4.8244 +
  4.8245 +      # First remove it from the list of overridden variables, so we can test
  4.8246 +      # for unknown variables in the end.
  4.8247 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.8248 +
  4.8249 +      # Check if the provided tool contains a complete path.
  4.8250 +      tool_specified="$UNZIP"
  4.8251 +      tool_basename="${tool_specified##*/}"
  4.8252 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.8253 +        # A command without a complete path is provided, search $PATH.
  4.8254 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool UNZIP=$tool_basename" >&5
  4.8255 +$as_echo "$as_me: Will search for user supplied tool UNZIP=$tool_basename" >&6;}
  4.8256 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.8257 +set dummy $tool_basename; ac_word=$2
  4.8258 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8259 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8260 +if ${ac_cv_path_UNZIP+:} false; then :
  4.8261 +  $as_echo_n "(cached) " >&6
  4.8262 +else
  4.8263 +  case $UNZIP in
  4.8264 +  [\\/]* | ?:[\\/]*)
  4.8265 +  ac_cv_path_UNZIP="$UNZIP" # Let the user override the test with a path.
  4.8266 +  ;;
  4.8267 +  *)
  4.8268 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8269 +for as_dir in $PATH
  4.8270 +do
  4.8271 +  IFS=$as_save_IFS
  4.8272 +  test -z "$as_dir" && as_dir=.
  4.8273 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8274 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8275 +    ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
  4.8276 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8277 +    break 2
  4.8278 +  fi
  4.8279 +done
  4.8280 +  done
  4.8281 +IFS=$as_save_IFS
  4.8282 +
  4.8283 +  ;;
  4.8284 +esac
  4.8285 +fi
  4.8286 +UNZIP=$ac_cv_path_UNZIP
  4.8287 +if test -n "$UNZIP"; then
  4.8288 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5
  4.8289 +$as_echo "$UNZIP" >&6; }
  4.8290 +else
  4.8291 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8292 +$as_echo "no" >&6; }
  4.8293 +fi
  4.8294 +
  4.8295 +
  4.8296 +        if test "x$UNZIP" = x; then
  4.8297 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.8298 +        fi
  4.8299 +      else
  4.8300 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.8301 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool UNZIP=$tool_specified" >&5
  4.8302 +$as_echo "$as_me: Will use user supplied tool UNZIP=$tool_specified" >&6;}
  4.8303 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNZIP" >&5
  4.8304 +$as_echo_n "checking for UNZIP... " >&6; }
  4.8305 +        if test ! -x "$tool_specified"; then
  4.8306 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.8307 +$as_echo "not found" >&6; }
  4.8308 +          as_fn_error $? "User supplied tool UNZIP=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.8309 +        fi
  4.8310 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.8311 +$as_echo "$tool_specified" >&6; }
  4.8312 +      fi
  4.8313 +    fi
  4.8314 +  fi
  4.8315 +
  4.8316 +
  4.8317  
  4.8318    if test "x$UNZIP" = x; then
  4.8319 -    if test "xunzip" = x; then
  4.8320 -      PROG_NAME=unzip
  4.8321 -    else
  4.8322 -      PROG_NAME=unzip
  4.8323 -    fi
  4.8324 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.8325 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.8326 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.8327 -  fi
  4.8328 -
  4.8329 -
  4.8330 -
  4.8331 -  for ac_prog in zip
  4.8332 +    as_fn_error $? "Could not find required tool for UNZIP" "$LINENO" 5
  4.8333 +  fi
  4.8334 +
  4.8335 +
  4.8336 +
  4.8337 +
  4.8338 +
  4.8339 +  # Publish this variable in the help.
  4.8340 +
  4.8341 +
  4.8342 +  if test "x$ZIP" = x; then
  4.8343 +    # The variable is not set by user, try to locate tool using the code snippet
  4.8344 +    for ac_prog in zip
  4.8345  do
  4.8346    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8347  set dummy $ac_prog; ac_word=$2
  4.8348 @@ -10324,24 +16924,160 @@
  4.8349    test -n "$ZIP" && break
  4.8350  done
  4.8351  
  4.8352 +  else
  4.8353 +    # The variable is set, but is it from the command line or the environment?
  4.8354 +
  4.8355 +    # Try to remove the string !ZIP! from our list.
  4.8356 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!ZIP!/}
  4.8357 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.8358 +      # If it failed, the variable was not from the command line. Ignore it,
  4.8359 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.8360 +      if test "xZIP" != xBASH; then
  4.8361 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of ZIP from the environment. Use command line variables instead." >&5
  4.8362 +$as_echo "$as_me: WARNING: Ignoring value of ZIP from the environment. Use command line variables instead." >&2;}
  4.8363 +      fi
  4.8364 +      # Try to locate tool using the code snippet
  4.8365 +      for ac_prog in zip
  4.8366 +do
  4.8367 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8368 +set dummy $ac_prog; ac_word=$2
  4.8369 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8370 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8371 +if ${ac_cv_path_ZIP+:} false; then :
  4.8372 +  $as_echo_n "(cached) " >&6
  4.8373 +else
  4.8374 +  case $ZIP in
  4.8375 +  [\\/]* | ?:[\\/]*)
  4.8376 +  ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
  4.8377 +  ;;
  4.8378 +  *)
  4.8379 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8380 +for as_dir in $PATH
  4.8381 +do
  4.8382 +  IFS=$as_save_IFS
  4.8383 +  test -z "$as_dir" && as_dir=.
  4.8384 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8385 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8386 +    ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
  4.8387 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8388 +    break 2
  4.8389 +  fi
  4.8390 +done
  4.8391 +  done
  4.8392 +IFS=$as_save_IFS
  4.8393 +
  4.8394 +  ;;
  4.8395 +esac
  4.8396 +fi
  4.8397 +ZIP=$ac_cv_path_ZIP
  4.8398 +if test -n "$ZIP"; then
  4.8399 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5
  4.8400 +$as_echo "$ZIP" >&6; }
  4.8401 +else
  4.8402 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8403 +$as_echo "no" >&6; }
  4.8404 +fi
  4.8405 +
  4.8406 +
  4.8407 +  test -n "$ZIP" && break
  4.8408 +done
  4.8409 +
  4.8410 +    else
  4.8411 +      # If it succeeded, then it was overridden by the user. We will use it
  4.8412 +      # for the tool.
  4.8413 +
  4.8414 +      # First remove it from the list of overridden variables, so we can test
  4.8415 +      # for unknown variables in the end.
  4.8416 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.8417 +
  4.8418 +      # Check if the provided tool contains a complete path.
  4.8419 +      tool_specified="$ZIP"
  4.8420 +      tool_basename="${tool_specified##*/}"
  4.8421 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.8422 +        # A command without a complete path is provided, search $PATH.
  4.8423 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool ZIP=$tool_basename" >&5
  4.8424 +$as_echo "$as_me: Will search for user supplied tool ZIP=$tool_basename" >&6;}
  4.8425 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.8426 +set dummy $tool_basename; ac_word=$2
  4.8427 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8428 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8429 +if ${ac_cv_path_ZIP+:} false; then :
  4.8430 +  $as_echo_n "(cached) " >&6
  4.8431 +else
  4.8432 +  case $ZIP in
  4.8433 +  [\\/]* | ?:[\\/]*)
  4.8434 +  ac_cv_path_ZIP="$ZIP" # Let the user override the test with a path.
  4.8435 +  ;;
  4.8436 +  *)
  4.8437 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8438 +for as_dir in $PATH
  4.8439 +do
  4.8440 +  IFS=$as_save_IFS
  4.8441 +  test -z "$as_dir" && as_dir=.
  4.8442 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8443 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8444 +    ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
  4.8445 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8446 +    break 2
  4.8447 +  fi
  4.8448 +done
  4.8449 +  done
  4.8450 +IFS=$as_save_IFS
  4.8451 +
  4.8452 +  ;;
  4.8453 +esac
  4.8454 +fi
  4.8455 +ZIP=$ac_cv_path_ZIP
  4.8456 +if test -n "$ZIP"; then
  4.8457 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5
  4.8458 +$as_echo "$ZIP" >&6; }
  4.8459 +else
  4.8460 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8461 +$as_echo "no" >&6; }
  4.8462 +fi
  4.8463 +
  4.8464 +
  4.8465 +        if test "x$ZIP" = x; then
  4.8466 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.8467 +        fi
  4.8468 +      else
  4.8469 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.8470 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool ZIP=$tool_specified" >&5
  4.8471 +$as_echo "$as_me: Will use user supplied tool ZIP=$tool_specified" >&6;}
  4.8472 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZIP" >&5
  4.8473 +$as_echo_n "checking for ZIP... " >&6; }
  4.8474 +        if test ! -x "$tool_specified"; then
  4.8475 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.8476 +$as_echo "not found" >&6; }
  4.8477 +          as_fn_error $? "User supplied tool ZIP=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.8478 +        fi
  4.8479 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.8480 +$as_echo "$tool_specified" >&6; }
  4.8481 +      fi
  4.8482 +    fi
  4.8483 +  fi
  4.8484 +
  4.8485 +
  4.8486  
  4.8487    if test "x$ZIP" = x; then
  4.8488 -    if test "xzip" = x; then
  4.8489 -      PROG_NAME=zip
  4.8490 -    else
  4.8491 -      PROG_NAME=zip
  4.8492 -    fi
  4.8493 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.8494 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.8495 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.8496 +    as_fn_error $? "Could not find required tool for ZIP" "$LINENO" 5
  4.8497    fi
  4.8498  
  4.8499  
  4.8500  
  4.8501    # Non-required basic tools
  4.8502  
  4.8503 -  # Extract the first word of "ldd", so it can be a program name with args.
  4.8504 -set dummy ldd; ac_word=$2
  4.8505 +
  4.8506 +
  4.8507 +  # Publish this variable in the help.
  4.8508 +
  4.8509 +
  4.8510 +  if test "x$LDD" = x; then
  4.8511 +    # The variable is not set by user, try to locate tool using the code snippet
  4.8512 +    for ac_prog in ldd
  4.8513 +do
  4.8514 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8515 +set dummy $ac_prog; ac_word=$2
  4.8516  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8517  $as_echo_n "checking for $ac_word... " >&6; }
  4.8518  if ${ac_cv_path_LDD+:} false; then :
  4.8519 @@ -10380,13 +17116,157 @@
  4.8520  fi
  4.8521  
  4.8522  
  4.8523 +  test -n "$LDD" && break
  4.8524 +done
  4.8525 +
  4.8526 +  else
  4.8527 +    # The variable is set, but is it from the command line or the environment?
  4.8528 +
  4.8529 +    # Try to remove the string !LDD! from our list.
  4.8530 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!LDD!/}
  4.8531 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.8532 +      # If it failed, the variable was not from the command line. Ignore it,
  4.8533 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.8534 +      if test "xLDD" != xBASH; then
  4.8535 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of LDD from the environment. Use command line variables instead." >&5
  4.8536 +$as_echo "$as_me: WARNING: Ignoring value of LDD from the environment. Use command line variables instead." >&2;}
  4.8537 +      fi
  4.8538 +      # Try to locate tool using the code snippet
  4.8539 +      for ac_prog in ldd
  4.8540 +do
  4.8541 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8542 +set dummy $ac_prog; ac_word=$2
  4.8543 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8544 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8545 +if ${ac_cv_path_LDD+:} false; then :
  4.8546 +  $as_echo_n "(cached) " >&6
  4.8547 +else
  4.8548 +  case $LDD in
  4.8549 +  [\\/]* | ?:[\\/]*)
  4.8550 +  ac_cv_path_LDD="$LDD" # Let the user override the test with a path.
  4.8551 +  ;;
  4.8552 +  *)
  4.8553 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8554 +for as_dir in $PATH
  4.8555 +do
  4.8556 +  IFS=$as_save_IFS
  4.8557 +  test -z "$as_dir" && as_dir=.
  4.8558 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8559 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8560 +    ac_cv_path_LDD="$as_dir/$ac_word$ac_exec_ext"
  4.8561 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8562 +    break 2
  4.8563 +  fi
  4.8564 +done
  4.8565 +  done
  4.8566 +IFS=$as_save_IFS
  4.8567 +
  4.8568 +  ;;
  4.8569 +esac
  4.8570 +fi
  4.8571 +LDD=$ac_cv_path_LDD
  4.8572 +if test -n "$LDD"; then
  4.8573 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDD" >&5
  4.8574 +$as_echo "$LDD" >&6; }
  4.8575 +else
  4.8576 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8577 +$as_echo "no" >&6; }
  4.8578 +fi
  4.8579 +
  4.8580 +
  4.8581 +  test -n "$LDD" && break
  4.8582 +done
  4.8583 +
  4.8584 +    else
  4.8585 +      # If it succeeded, then it was overridden by the user. We will use it
  4.8586 +      # for the tool.
  4.8587 +
  4.8588 +      # First remove it from the list of overridden variables, so we can test
  4.8589 +      # for unknown variables in the end.
  4.8590 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.8591 +
  4.8592 +      # Check if the provided tool contains a complete path.
  4.8593 +      tool_specified="$LDD"
  4.8594 +      tool_basename="${tool_specified##*/}"
  4.8595 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.8596 +        # A command without a complete path is provided, search $PATH.
  4.8597 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool LDD=$tool_basename" >&5
  4.8598 +$as_echo "$as_me: Will search for user supplied tool LDD=$tool_basename" >&6;}
  4.8599 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.8600 +set dummy $tool_basename; ac_word=$2
  4.8601 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8602 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8603 +if ${ac_cv_path_LDD+:} false; then :
  4.8604 +  $as_echo_n "(cached) " >&6
  4.8605 +else
  4.8606 +  case $LDD in
  4.8607 +  [\\/]* | ?:[\\/]*)
  4.8608 +  ac_cv_path_LDD="$LDD" # Let the user override the test with a path.
  4.8609 +  ;;
  4.8610 +  *)
  4.8611 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8612 +for as_dir in $PATH
  4.8613 +do
  4.8614 +  IFS=$as_save_IFS
  4.8615 +  test -z "$as_dir" && as_dir=.
  4.8616 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8617 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8618 +    ac_cv_path_LDD="$as_dir/$ac_word$ac_exec_ext"
  4.8619 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8620 +    break 2
  4.8621 +  fi
  4.8622 +done
  4.8623 +  done
  4.8624 +IFS=$as_save_IFS
  4.8625 +
  4.8626 +  ;;
  4.8627 +esac
  4.8628 +fi
  4.8629 +LDD=$ac_cv_path_LDD
  4.8630 +if test -n "$LDD"; then
  4.8631 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDD" >&5
  4.8632 +$as_echo "$LDD" >&6; }
  4.8633 +else
  4.8634 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8635 +$as_echo "no" >&6; }
  4.8636 +fi
  4.8637 +
  4.8638 +
  4.8639 +        if test "x$LDD" = x; then
  4.8640 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.8641 +        fi
  4.8642 +      else
  4.8643 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.8644 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool LDD=$tool_specified" >&5
  4.8645 +$as_echo "$as_me: Will use user supplied tool LDD=$tool_specified" >&6;}
  4.8646 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LDD" >&5
  4.8647 +$as_echo_n "checking for LDD... " >&6; }
  4.8648 +        if test ! -x "$tool_specified"; then
  4.8649 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.8650 +$as_echo "not found" >&6; }
  4.8651 +          as_fn_error $? "User supplied tool LDD=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.8652 +        fi
  4.8653 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.8654 +$as_echo "$tool_specified" >&6; }
  4.8655 +      fi
  4.8656 +    fi
  4.8657 +  fi
  4.8658 +
  4.8659 +
  4.8660    if test "x$LDD" = "x"; then
  4.8661      # List shared lib dependencies is used for
  4.8662      # debug output and checking for forbidden dependencies.
  4.8663      # We can build without it.
  4.8664      LDD="true"
  4.8665    fi
  4.8666 -  for ac_prog in readelf greadelf
  4.8667 +
  4.8668 +
  4.8669 +  # Publish this variable in the help.
  4.8670 +
  4.8671 +
  4.8672 +  if test "x$READELF" = x; then
  4.8673 +    # The variable is not set by user, try to locate tool using the code snippet
  4.8674 +    for ac_prog in readelf greadelf
  4.8675  do
  4.8676    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8677  set dummy $ac_prog; ac_word=$2
  4.8678 @@ -10431,8 +17311,151 @@
  4.8679    test -n "$READELF" && break
  4.8680  done
  4.8681  
  4.8682 -  # Extract the first word of "hg", so it can be a program name with args.
  4.8683 -set dummy hg; ac_word=$2
  4.8684 +  else
  4.8685 +    # The variable is set, but is it from the command line or the environment?
  4.8686 +
  4.8687 +    # Try to remove the string !READELF! from our list.
  4.8688 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!READELF!/}
  4.8689 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.8690 +      # If it failed, the variable was not from the command line. Ignore it,
  4.8691 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.8692 +      if test "xREADELF" != xBASH; then
  4.8693 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of READELF from the environment. Use command line variables instead." >&5
  4.8694 +$as_echo "$as_me: WARNING: Ignoring value of READELF from the environment. Use command line variables instead." >&2;}
  4.8695 +      fi
  4.8696 +      # Try to locate tool using the code snippet
  4.8697 +      for ac_prog in readelf greadelf
  4.8698 +do
  4.8699 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8700 +set dummy $ac_prog; ac_word=$2
  4.8701 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8702 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8703 +if ${ac_cv_path_READELF+:} false; then :
  4.8704 +  $as_echo_n "(cached) " >&6
  4.8705 +else
  4.8706 +  case $READELF in
  4.8707 +  [\\/]* | ?:[\\/]*)
  4.8708 +  ac_cv_path_READELF="$READELF" # Let the user override the test with a path.
  4.8709 +  ;;
  4.8710 +  *)
  4.8711 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8712 +for as_dir in $PATH
  4.8713 +do
  4.8714 +  IFS=$as_save_IFS
  4.8715 +  test -z "$as_dir" && as_dir=.
  4.8716 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8717 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8718 +    ac_cv_path_READELF="$as_dir/$ac_word$ac_exec_ext"
  4.8719 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8720 +    break 2
  4.8721 +  fi
  4.8722 +done
  4.8723 +  done
  4.8724 +IFS=$as_save_IFS
  4.8725 +
  4.8726 +  ;;
  4.8727 +esac
  4.8728 +fi
  4.8729 +READELF=$ac_cv_path_READELF
  4.8730 +if test -n "$READELF"; then
  4.8731 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
  4.8732 +$as_echo "$READELF" >&6; }
  4.8733 +else
  4.8734 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8735 +$as_echo "no" >&6; }
  4.8736 +fi
  4.8737 +
  4.8738 +
  4.8739 +  test -n "$READELF" && break
  4.8740 +done
  4.8741 +
  4.8742 +    else
  4.8743 +      # If it succeeded, then it was overridden by the user. We will use it
  4.8744 +      # for the tool.
  4.8745 +
  4.8746 +      # First remove it from the list of overridden variables, so we can test
  4.8747 +      # for unknown variables in the end.
  4.8748 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.8749 +
  4.8750 +      # Check if the provided tool contains a complete path.
  4.8751 +      tool_specified="$READELF"
  4.8752 +      tool_basename="${tool_specified##*/}"
  4.8753 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.8754 +        # A command without a complete path is provided, search $PATH.
  4.8755 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool READELF=$tool_basename" >&5
  4.8756 +$as_echo "$as_me: Will search for user supplied tool READELF=$tool_basename" >&6;}
  4.8757 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.8758 +set dummy $tool_basename; ac_word=$2
  4.8759 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8760 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8761 +if ${ac_cv_path_READELF+:} false; then :
  4.8762 +  $as_echo_n "(cached) " >&6
  4.8763 +else
  4.8764 +  case $READELF in
  4.8765 +  [\\/]* | ?:[\\/]*)
  4.8766 +  ac_cv_path_READELF="$READELF" # Let the user override the test with a path.
  4.8767 +  ;;
  4.8768 +  *)
  4.8769 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8770 +for as_dir in $PATH
  4.8771 +do
  4.8772 +  IFS=$as_save_IFS
  4.8773 +  test -z "$as_dir" && as_dir=.
  4.8774 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8775 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8776 +    ac_cv_path_READELF="$as_dir/$ac_word$ac_exec_ext"
  4.8777 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8778 +    break 2
  4.8779 +  fi
  4.8780 +done
  4.8781 +  done
  4.8782 +IFS=$as_save_IFS
  4.8783 +
  4.8784 +  ;;
  4.8785 +esac
  4.8786 +fi
  4.8787 +READELF=$ac_cv_path_READELF
  4.8788 +if test -n "$READELF"; then
  4.8789 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5
  4.8790 +$as_echo "$READELF" >&6; }
  4.8791 +else
  4.8792 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8793 +$as_echo "no" >&6; }
  4.8794 +fi
  4.8795 +
  4.8796 +
  4.8797 +        if test "x$READELF" = x; then
  4.8798 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.8799 +        fi
  4.8800 +      else
  4.8801 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.8802 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool READELF=$tool_specified" >&5
  4.8803 +$as_echo "$as_me: Will use user supplied tool READELF=$tool_specified" >&6;}
  4.8804 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for READELF" >&5
  4.8805 +$as_echo_n "checking for READELF... " >&6; }
  4.8806 +        if test ! -x "$tool_specified"; then
  4.8807 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.8808 +$as_echo "not found" >&6; }
  4.8809 +          as_fn_error $? "User supplied tool READELF=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.8810 +        fi
  4.8811 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.8812 +$as_echo "$tool_specified" >&6; }
  4.8813 +      fi
  4.8814 +    fi
  4.8815 +  fi
  4.8816 +
  4.8817 +
  4.8818 +
  4.8819 +
  4.8820 +  # Publish this variable in the help.
  4.8821 +
  4.8822 +
  4.8823 +  if test "x$HG" = x; then
  4.8824 +    # The variable is not set by user, try to locate tool using the code snippet
  4.8825 +    for ac_prog in hg
  4.8826 +do
  4.8827 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8828 +set dummy $ac_prog; ac_word=$2
  4.8829  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8830  $as_echo_n "checking for $ac_word... " >&6; }
  4.8831  if ${ac_cv_path_HG+:} false; then :
  4.8832 @@ -10471,8 +17494,154 @@
  4.8833  fi
  4.8834  
  4.8835  
  4.8836 -  # Extract the first word of "stat", so it can be a program name with args.
  4.8837 -set dummy stat; ac_word=$2
  4.8838 +  test -n "$HG" && break
  4.8839 +done
  4.8840 +
  4.8841 +  else
  4.8842 +    # The variable is set, but is it from the command line or the environment?
  4.8843 +
  4.8844 +    # Try to remove the string !HG! from our list.
  4.8845 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!HG!/}
  4.8846 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.8847 +      # If it failed, the variable was not from the command line. Ignore it,
  4.8848 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.8849 +      if test "xHG" != xBASH; then
  4.8850 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of HG from the environment. Use command line variables instead." >&5
  4.8851 +$as_echo "$as_me: WARNING: Ignoring value of HG from the environment. Use command line variables instead." >&2;}
  4.8852 +      fi
  4.8853 +      # Try to locate tool using the code snippet
  4.8854 +      for ac_prog in hg
  4.8855 +do
  4.8856 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8857 +set dummy $ac_prog; ac_word=$2
  4.8858 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8859 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8860 +if ${ac_cv_path_HG+:} false; then :
  4.8861 +  $as_echo_n "(cached) " >&6
  4.8862 +else
  4.8863 +  case $HG in
  4.8864 +  [\\/]* | ?:[\\/]*)
  4.8865 +  ac_cv_path_HG="$HG" # Let the user override the test with a path.
  4.8866 +  ;;
  4.8867 +  *)
  4.8868 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8869 +for as_dir in $PATH
  4.8870 +do
  4.8871 +  IFS=$as_save_IFS
  4.8872 +  test -z "$as_dir" && as_dir=.
  4.8873 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8874 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8875 +    ac_cv_path_HG="$as_dir/$ac_word$ac_exec_ext"
  4.8876 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8877 +    break 2
  4.8878 +  fi
  4.8879 +done
  4.8880 +  done
  4.8881 +IFS=$as_save_IFS
  4.8882 +
  4.8883 +  ;;
  4.8884 +esac
  4.8885 +fi
  4.8886 +HG=$ac_cv_path_HG
  4.8887 +if test -n "$HG"; then
  4.8888 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HG" >&5
  4.8889 +$as_echo "$HG" >&6; }
  4.8890 +else
  4.8891 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8892 +$as_echo "no" >&6; }
  4.8893 +fi
  4.8894 +
  4.8895 +
  4.8896 +  test -n "$HG" && break
  4.8897 +done
  4.8898 +
  4.8899 +    else
  4.8900 +      # If it succeeded, then it was overridden by the user. We will use it
  4.8901 +      # for the tool.
  4.8902 +
  4.8903 +      # First remove it from the list of overridden variables, so we can test
  4.8904 +      # for unknown variables in the end.
  4.8905 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.8906 +
  4.8907 +      # Check if the provided tool contains a complete path.
  4.8908 +      tool_specified="$HG"
  4.8909 +      tool_basename="${tool_specified##*/}"
  4.8910 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.8911 +        # A command without a complete path is provided, search $PATH.
  4.8912 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool HG=$tool_basename" >&5
  4.8913 +$as_echo "$as_me: Will search for user supplied tool HG=$tool_basename" >&6;}
  4.8914 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.8915 +set dummy $tool_basename; ac_word=$2
  4.8916 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8917 +$as_echo_n "checking for $ac_word... " >&6; }
  4.8918 +if ${ac_cv_path_HG+:} false; then :
  4.8919 +  $as_echo_n "(cached) " >&6
  4.8920 +else
  4.8921 +  case $HG in
  4.8922 +  [\\/]* | ?:[\\/]*)
  4.8923 +  ac_cv_path_HG="$HG" # Let the user override the test with a path.
  4.8924 +  ;;
  4.8925 +  *)
  4.8926 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.8927 +for as_dir in $PATH
  4.8928 +do
  4.8929 +  IFS=$as_save_IFS
  4.8930 +  test -z "$as_dir" && as_dir=.
  4.8931 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.8932 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.8933 +    ac_cv_path_HG="$as_dir/$ac_word$ac_exec_ext"
  4.8934 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.8935 +    break 2
  4.8936 +  fi
  4.8937 +done
  4.8938 +  done
  4.8939 +IFS=$as_save_IFS
  4.8940 +
  4.8941 +  ;;
  4.8942 +esac
  4.8943 +fi
  4.8944 +HG=$ac_cv_path_HG
  4.8945 +if test -n "$HG"; then
  4.8946 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HG" >&5
  4.8947 +$as_echo "$HG" >&6; }
  4.8948 +else
  4.8949 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.8950 +$as_echo "no" >&6; }
  4.8951 +fi
  4.8952 +
  4.8953 +
  4.8954 +        if test "x$HG" = x; then
  4.8955 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.8956 +        fi
  4.8957 +      else
  4.8958 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.8959 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool HG=$tool_specified" >&5
  4.8960 +$as_echo "$as_me: Will use user supplied tool HG=$tool_specified" >&6;}
  4.8961 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HG" >&5
  4.8962 +$as_echo_n "checking for HG... " >&6; }
  4.8963 +        if test ! -x "$tool_specified"; then
  4.8964 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.8965 +$as_echo "not found" >&6; }
  4.8966 +          as_fn_error $? "User supplied tool HG=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.8967 +        fi
  4.8968 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.8969 +$as_echo "$tool_specified" >&6; }
  4.8970 +      fi
  4.8971 +    fi
  4.8972 +  fi
  4.8973 +
  4.8974 +
  4.8975 +
  4.8976 +
  4.8977 +  # Publish this variable in the help.
  4.8978 +
  4.8979 +
  4.8980 +  if test "x$STAT" = x; then
  4.8981 +    # The variable is not set by user, try to locate tool using the code snippet
  4.8982 +    for ac_prog in stat
  4.8983 +do
  4.8984 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.8985 +set dummy $ac_prog; ac_word=$2
  4.8986  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.8987  $as_echo_n "checking for $ac_word... " >&6; }
  4.8988  if ${ac_cv_path_STAT+:} false; then :
  4.8989 @@ -10511,8 +17680,154 @@
  4.8990  fi
  4.8991  
  4.8992  
  4.8993 -  # Extract the first word of "time", so it can be a program name with args.
  4.8994 -set dummy time; ac_word=$2
  4.8995 +  test -n "$STAT" && break
  4.8996 +done
  4.8997 +
  4.8998 +  else
  4.8999 +    # The variable is set, but is it from the command line or the environment?
  4.9000 +
  4.9001 +    # Try to remove the string !STAT! from our list.
  4.9002 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!STAT!/}
  4.9003 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.9004 +      # If it failed, the variable was not from the command line. Ignore it,
  4.9005 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.9006 +      if test "xSTAT" != xBASH; then
  4.9007 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of STAT from the environment. Use command line variables instead." >&5
  4.9008 +$as_echo "$as_me: WARNING: Ignoring value of STAT from the environment. Use command line variables instead." >&2;}
  4.9009 +      fi
  4.9010 +      # Try to locate tool using the code snippet
  4.9011 +      for ac_prog in stat
  4.9012 +do
  4.9013 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9014 +set dummy $ac_prog; ac_word=$2
  4.9015 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9016 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9017 +if ${ac_cv_path_STAT+:} false; then :
  4.9018 +  $as_echo_n "(cached) " >&6
  4.9019 +else
  4.9020 +  case $STAT in
  4.9021 +  [\\/]* | ?:[\\/]*)
  4.9022 +  ac_cv_path_STAT="$STAT" # Let the user override the test with a path.
  4.9023 +  ;;
  4.9024 +  *)
  4.9025 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9026 +for as_dir in $PATH
  4.9027 +do
  4.9028 +  IFS=$as_save_IFS
  4.9029 +  test -z "$as_dir" && as_dir=.
  4.9030 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9031 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9032 +    ac_cv_path_STAT="$as_dir/$ac_word$ac_exec_ext"
  4.9033 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9034 +    break 2
  4.9035 +  fi
  4.9036 +done
  4.9037 +  done
  4.9038 +IFS=$as_save_IFS
  4.9039 +
  4.9040 +  ;;
  4.9041 +esac
  4.9042 +fi
  4.9043 +STAT=$ac_cv_path_STAT
  4.9044 +if test -n "$STAT"; then
  4.9045 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STAT" >&5
  4.9046 +$as_echo "$STAT" >&6; }
  4.9047 +else
  4.9048 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9049 +$as_echo "no" >&6; }
  4.9050 +fi
  4.9051 +
  4.9052 +
  4.9053 +  test -n "$STAT" && break
  4.9054 +done
  4.9055 +
  4.9056 +    else
  4.9057 +      # If it succeeded, then it was overridden by the user. We will use it
  4.9058 +      # for the tool.
  4.9059 +
  4.9060 +      # First remove it from the list of overridden variables, so we can test
  4.9061 +      # for unknown variables in the end.
  4.9062 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.9063 +
  4.9064 +      # Check if the provided tool contains a complete path.
  4.9065 +      tool_specified="$STAT"
  4.9066 +      tool_basename="${tool_specified##*/}"
  4.9067 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.9068 +        # A command without a complete path is provided, search $PATH.
  4.9069 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool STAT=$tool_basename" >&5
  4.9070 +$as_echo "$as_me: Will search for user supplied tool STAT=$tool_basename" >&6;}
  4.9071 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.9072 +set dummy $tool_basename; ac_word=$2
  4.9073 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9074 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9075 +if ${ac_cv_path_STAT+:} false; then :
  4.9076 +  $as_echo_n "(cached) " >&6
  4.9077 +else
  4.9078 +  case $STAT in
  4.9079 +  [\\/]* | ?:[\\/]*)
  4.9080 +  ac_cv_path_STAT="$STAT" # Let the user override the test with a path.
  4.9081 +  ;;
  4.9082 +  *)
  4.9083 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9084 +for as_dir in $PATH
  4.9085 +do
  4.9086 +  IFS=$as_save_IFS
  4.9087 +  test -z "$as_dir" && as_dir=.
  4.9088 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9089 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9090 +    ac_cv_path_STAT="$as_dir/$ac_word$ac_exec_ext"
  4.9091 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9092 +    break 2
  4.9093 +  fi
  4.9094 +done
  4.9095 +  done
  4.9096 +IFS=$as_save_IFS
  4.9097 +
  4.9098 +  ;;
  4.9099 +esac
  4.9100 +fi
  4.9101 +STAT=$ac_cv_path_STAT
  4.9102 +if test -n "$STAT"; then
  4.9103 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STAT" >&5
  4.9104 +$as_echo "$STAT" >&6; }
  4.9105 +else
  4.9106 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9107 +$as_echo "no" >&6; }
  4.9108 +fi
  4.9109 +
  4.9110 +
  4.9111 +        if test "x$STAT" = x; then
  4.9112 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.9113 +        fi
  4.9114 +      else
  4.9115 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.9116 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool STAT=$tool_specified" >&5
  4.9117 +$as_echo "$as_me: Will use user supplied tool STAT=$tool_specified" >&6;}
  4.9118 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STAT" >&5
  4.9119 +$as_echo_n "checking for STAT... " >&6; }
  4.9120 +        if test ! -x "$tool_specified"; then
  4.9121 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.9122 +$as_echo "not found" >&6; }
  4.9123 +          as_fn_error $? "User supplied tool STAT=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.9124 +        fi
  4.9125 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.9126 +$as_echo "$tool_specified" >&6; }
  4.9127 +      fi
  4.9128 +    fi
  4.9129 +  fi
  4.9130 +
  4.9131 +
  4.9132 +
  4.9133 +
  4.9134 +  # Publish this variable in the help.
  4.9135 +
  4.9136 +
  4.9137 +  if test "x$TIME" = x; then
  4.9138 +    # The variable is not set by user, try to locate tool using the code snippet
  4.9139 +    for ac_prog in time
  4.9140 +do
  4.9141 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9142 +set dummy $ac_prog; ac_word=$2
  4.9143  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9144  $as_echo_n "checking for $ac_word... " >&6; }
  4.9145  if ${ac_cv_path_TIME+:} false; then :
  4.9146 @@ -10551,6 +17866,143 @@
  4.9147  fi
  4.9148  
  4.9149  
  4.9150 +  test -n "$TIME" && break
  4.9151 +done
  4.9152 +
  4.9153 +  else
  4.9154 +    # The variable is set, but is it from the command line or the environment?
  4.9155 +
  4.9156 +    # Try to remove the string !TIME! from our list.
  4.9157 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!TIME!/}
  4.9158 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.9159 +      # If it failed, the variable was not from the command line. Ignore it,
  4.9160 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.9161 +      if test "xTIME" != xBASH; then
  4.9162 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of TIME from the environment. Use command line variables instead." >&5
  4.9163 +$as_echo "$as_me: WARNING: Ignoring value of TIME from the environment. Use command line variables instead." >&2;}
  4.9164 +      fi
  4.9165 +      # Try to locate tool using the code snippet
  4.9166 +      for ac_prog in time
  4.9167 +do
  4.9168 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9169 +set dummy $ac_prog; ac_word=$2
  4.9170 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9171 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9172 +if ${ac_cv_path_TIME+:} false; then :
  4.9173 +  $as_echo_n "(cached) " >&6
  4.9174 +else
  4.9175 +  case $TIME in
  4.9176 +  [\\/]* | ?:[\\/]*)
  4.9177 +  ac_cv_path_TIME="$TIME" # Let the user override the test with a path.
  4.9178 +  ;;
  4.9179 +  *)
  4.9180 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9181 +for as_dir in $PATH
  4.9182 +do
  4.9183 +  IFS=$as_save_IFS
  4.9184 +  test -z "$as_dir" && as_dir=.
  4.9185 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9186 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9187 +    ac_cv_path_TIME="$as_dir/$ac_word$ac_exec_ext"
  4.9188 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9189 +    break 2
  4.9190 +  fi
  4.9191 +done
  4.9192 +  done
  4.9193 +IFS=$as_save_IFS
  4.9194 +
  4.9195 +  ;;
  4.9196 +esac
  4.9197 +fi
  4.9198 +TIME=$ac_cv_path_TIME
  4.9199 +if test -n "$TIME"; then
  4.9200 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TIME" >&5
  4.9201 +$as_echo "$TIME" >&6; }
  4.9202 +else
  4.9203 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9204 +$as_echo "no" >&6; }
  4.9205 +fi
  4.9206 +
  4.9207 +
  4.9208 +  test -n "$TIME" && break
  4.9209 +done
  4.9210 +
  4.9211 +    else
  4.9212 +      # If it succeeded, then it was overridden by the user. We will use it
  4.9213 +      # for the tool.
  4.9214 +
  4.9215 +      # First remove it from the list of overridden variables, so we can test
  4.9216 +      # for unknown variables in the end.
  4.9217 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.9218 +
  4.9219 +      # Check if the provided tool contains a complete path.
  4.9220 +      tool_specified="$TIME"
  4.9221 +      tool_basename="${tool_specified##*/}"
  4.9222 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.9223 +        # A command without a complete path is provided, search $PATH.
  4.9224 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool TIME=$tool_basename" >&5
  4.9225 +$as_echo "$as_me: Will search for user supplied tool TIME=$tool_basename" >&6;}
  4.9226 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.9227 +set dummy $tool_basename; ac_word=$2
  4.9228 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9229 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9230 +if ${ac_cv_path_TIME+:} false; then :
  4.9231 +  $as_echo_n "(cached) " >&6
  4.9232 +else
  4.9233 +  case $TIME in
  4.9234 +  [\\/]* | ?:[\\/]*)
  4.9235 +  ac_cv_path_TIME="$TIME" # Let the user override the test with a path.
  4.9236 +  ;;
  4.9237 +  *)
  4.9238 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9239 +for as_dir in $PATH
  4.9240 +do
  4.9241 +  IFS=$as_save_IFS
  4.9242 +  test -z "$as_dir" && as_dir=.
  4.9243 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9244 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9245 +    ac_cv_path_TIME="$as_dir/$ac_word$ac_exec_ext"
  4.9246 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9247 +    break 2
  4.9248 +  fi
  4.9249 +done
  4.9250 +  done
  4.9251 +IFS=$as_save_IFS
  4.9252 +
  4.9253 +  ;;
  4.9254 +esac
  4.9255 +fi
  4.9256 +TIME=$ac_cv_path_TIME
  4.9257 +if test -n "$TIME"; then
  4.9258 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TIME" >&5
  4.9259 +$as_echo "$TIME" >&6; }
  4.9260 +else
  4.9261 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9262 +$as_echo "no" >&6; }
  4.9263 +fi
  4.9264 +
  4.9265 +
  4.9266 +        if test "x$TIME" = x; then
  4.9267 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.9268 +        fi
  4.9269 +      else
  4.9270 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.9271 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool TIME=$tool_specified" >&5
  4.9272 +$as_echo "$as_me: Will use user supplied tool TIME=$tool_specified" >&6;}
  4.9273 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIME" >&5
  4.9274 +$as_echo_n "checking for TIME... " >&6; }
  4.9275 +        if test ! -x "$tool_specified"; then
  4.9276 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.9277 +$as_echo "not found" >&6; }
  4.9278 +          as_fn_error $? "User supplied tool TIME=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.9279 +        fi
  4.9280 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.9281 +$as_echo "$tool_specified" >&6; }
  4.9282 +      fi
  4.9283 +    fi
  4.9284 +  fi
  4.9285 +
  4.9286 +
  4.9287    # Check if it's GNU time
  4.9288    IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
  4.9289    if test "x$IS_GNU_TIME" != x; then
  4.9290 @@ -10562,7 +18014,14 @@
  4.9291  
  4.9292    if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
  4.9293  
  4.9294 -  for ac_prog in comm
  4.9295 +
  4.9296 +
  4.9297 +  # Publish this variable in the help.
  4.9298 +
  4.9299 +
  4.9300 +  if test "x$COMM" = x; then
  4.9301 +    # The variable is not set by user, try to locate tool using the code snippet
  4.9302 +    for ac_prog in comm
  4.9303  do
  4.9304    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9305  set dummy $ac_prog; ac_word=$2
  4.9306 @@ -10607,16 +18066,143 @@
  4.9307    test -n "$COMM" && break
  4.9308  done
  4.9309  
  4.9310 +  else
  4.9311 +    # The variable is set, but is it from the command line or the environment?
  4.9312 +
  4.9313 +    # Try to remove the string !COMM! from our list.
  4.9314 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!COMM!/}
  4.9315 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.9316 +      # If it failed, the variable was not from the command line. Ignore it,
  4.9317 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.9318 +      if test "xCOMM" != xBASH; then
  4.9319 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of COMM from the environment. Use command line variables instead." >&5
  4.9320 +$as_echo "$as_me: WARNING: Ignoring value of COMM from the environment. Use command line variables instead." >&2;}
  4.9321 +      fi
  4.9322 +      # Try to locate tool using the code snippet
  4.9323 +      for ac_prog in comm
  4.9324 +do
  4.9325 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9326 +set dummy $ac_prog; ac_word=$2
  4.9327 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9328 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9329 +if ${ac_cv_path_COMM+:} false; then :
  4.9330 +  $as_echo_n "(cached) " >&6
  4.9331 +else
  4.9332 +  case $COMM in
  4.9333 +  [\\/]* | ?:[\\/]*)
  4.9334 +  ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
  4.9335 +  ;;
  4.9336 +  *)
  4.9337 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9338 +for as_dir in $PATH
  4.9339 +do
  4.9340 +  IFS=$as_save_IFS
  4.9341 +  test -z "$as_dir" && as_dir=.
  4.9342 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9343 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9344 +    ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
  4.9345 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9346 +    break 2
  4.9347 +  fi
  4.9348 +done
  4.9349 +  done
  4.9350 +IFS=$as_save_IFS
  4.9351 +
  4.9352 +  ;;
  4.9353 +esac
  4.9354 +fi
  4.9355 +COMM=$ac_cv_path_COMM
  4.9356 +if test -n "$COMM"; then
  4.9357 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
  4.9358 +$as_echo "$COMM" >&6; }
  4.9359 +else
  4.9360 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9361 +$as_echo "no" >&6; }
  4.9362 +fi
  4.9363 +
  4.9364 +
  4.9365 +  test -n "$COMM" && break
  4.9366 +done
  4.9367 +
  4.9368 +    else
  4.9369 +      # If it succeeded, then it was overridden by the user. We will use it
  4.9370 +      # for the tool.
  4.9371 +
  4.9372 +      # First remove it from the list of overridden variables, so we can test
  4.9373 +      # for unknown variables in the end.
  4.9374 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.9375 +
  4.9376 +      # Check if the provided tool contains a complete path.
  4.9377 +      tool_specified="$COMM"
  4.9378 +      tool_basename="${tool_specified##*/}"
  4.9379 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.9380 +        # A command without a complete path is provided, search $PATH.
  4.9381 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool COMM=$tool_basename" >&5
  4.9382 +$as_echo "$as_me: Will search for user supplied tool COMM=$tool_basename" >&6;}
  4.9383 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.9384 +set dummy $tool_basename; ac_word=$2
  4.9385 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9386 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9387 +if ${ac_cv_path_COMM+:} false; then :
  4.9388 +  $as_echo_n "(cached) " >&6
  4.9389 +else
  4.9390 +  case $COMM in
  4.9391 +  [\\/]* | ?:[\\/]*)
  4.9392 +  ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
  4.9393 +  ;;
  4.9394 +  *)
  4.9395 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9396 +for as_dir in $PATH
  4.9397 +do
  4.9398 +  IFS=$as_save_IFS
  4.9399 +  test -z "$as_dir" && as_dir=.
  4.9400 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9401 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9402 +    ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
  4.9403 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9404 +    break 2
  4.9405 +  fi
  4.9406 +done
  4.9407 +  done
  4.9408 +IFS=$as_save_IFS
  4.9409 +
  4.9410 +  ;;
  4.9411 +esac
  4.9412 +fi
  4.9413 +COMM=$ac_cv_path_COMM
  4.9414 +if test -n "$COMM"; then
  4.9415 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
  4.9416 +$as_echo "$COMM" >&6; }
  4.9417 +else
  4.9418 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9419 +$as_echo "no" >&6; }
  4.9420 +fi
  4.9421 +
  4.9422 +
  4.9423 +        if test "x$COMM" = x; then
  4.9424 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.9425 +        fi
  4.9426 +      else
  4.9427 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.9428 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool COMM=$tool_specified" >&5
  4.9429 +$as_echo "$as_me: Will use user supplied tool COMM=$tool_specified" >&6;}
  4.9430 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for COMM" >&5
  4.9431 +$as_echo_n "checking for COMM... " >&6; }
  4.9432 +        if test ! -x "$tool_specified"; then
  4.9433 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.9434 +$as_echo "not found" >&6; }
  4.9435 +          as_fn_error $? "User supplied tool COMM=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.9436 +        fi
  4.9437 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.9438 +$as_echo "$tool_specified" >&6; }
  4.9439 +      fi
  4.9440 +    fi
  4.9441 +  fi
  4.9442 +
  4.9443 +
  4.9444  
  4.9445    if test "x$COMM" = x; then
  4.9446 -    if test "xcomm" = x; then
  4.9447 -      PROG_NAME=comm
  4.9448 -    else
  4.9449 -      PROG_NAME=comm
  4.9450 -    fi
  4.9451 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.9452 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.9453 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.9454 +    as_fn_error $? "Could not find required tool for COMM" "$LINENO" 5
  4.9455    fi
  4.9456  
  4.9457  
  4.9458 @@ -10624,7 +18210,14 @@
  4.9459  
  4.9460    if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
  4.9461  
  4.9462 -  for ac_prog in dsymutil
  4.9463 +
  4.9464 +
  4.9465 +  # Publish this variable in the help.
  4.9466 +
  4.9467 +
  4.9468 +  if test "x$DSYMUTIL" = x; then
  4.9469 +    # The variable is not set by user, try to locate tool using the code snippet
  4.9470 +    for ac_prog in dsymutil
  4.9471  do
  4.9472    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9473  set dummy $ac_prog; ac_word=$2
  4.9474 @@ -10669,21 +18262,155 @@
  4.9475    test -n "$DSYMUTIL" && break
  4.9476  done
  4.9477  
  4.9478 +  else
  4.9479 +    # The variable is set, but is it from the command line or the environment?
  4.9480 +
  4.9481 +    # Try to remove the string !DSYMUTIL! from our list.
  4.9482 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!DSYMUTIL!/}
  4.9483 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.9484 +      # If it failed, the variable was not from the command line. Ignore it,
  4.9485 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.9486 +      if test "xDSYMUTIL" != xBASH; then
  4.9487 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of DSYMUTIL from the environment. Use command line variables instead." >&5
  4.9488 +$as_echo "$as_me: WARNING: Ignoring value of DSYMUTIL from the environment. Use command line variables instead." >&2;}
  4.9489 +      fi
  4.9490 +      # Try to locate tool using the code snippet
  4.9491 +      for ac_prog in dsymutil
  4.9492 +do
  4.9493 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9494 +set dummy $ac_prog; ac_word=$2
  4.9495 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9496 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9497 +if ${ac_cv_path_DSYMUTIL+:} false; then :
  4.9498 +  $as_echo_n "(cached) " >&6
  4.9499 +else
  4.9500 +  case $DSYMUTIL in
  4.9501 +  [\\/]* | ?:[\\/]*)
  4.9502 +  ac_cv_path_DSYMUTIL="$DSYMUTIL" # Let the user override the test with a path.
  4.9503 +  ;;
  4.9504 +  *)
  4.9505 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9506 +for as_dir in $PATH
  4.9507 +do
  4.9508 +  IFS=$as_save_IFS
  4.9509 +  test -z "$as_dir" && as_dir=.
  4.9510 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9511 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9512 +    ac_cv_path_DSYMUTIL="$as_dir/$ac_word$ac_exec_ext"
  4.9513 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9514 +    break 2
  4.9515 +  fi
  4.9516 +done
  4.9517 +  done
  4.9518 +IFS=$as_save_IFS
  4.9519 +
  4.9520 +  ;;
  4.9521 +esac
  4.9522 +fi
  4.9523 +DSYMUTIL=$ac_cv_path_DSYMUTIL
  4.9524 +if test -n "$DSYMUTIL"; then
  4.9525 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
  4.9526 +$as_echo "$DSYMUTIL" >&6; }
  4.9527 +else
  4.9528 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9529 +$as_echo "no" >&6; }
  4.9530 +fi
  4.9531 +
  4.9532 +
  4.9533 +  test -n "$DSYMUTIL" && break
  4.9534 +done
  4.9535 +
  4.9536 +    else
  4.9537 +      # If it succeeded, then it was overridden by the user. We will use it
  4.9538 +      # for the tool.
  4.9539 +
  4.9540 +      # First remove it from the list of overridden variables, so we can test
  4.9541 +      # for unknown variables in the end.
  4.9542 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.9543 +
  4.9544 +      # Check if the provided tool contains a complete path.
  4.9545 +      tool_specified="$DSYMUTIL"
  4.9546 +      tool_basename="${tool_specified##*/}"
  4.9547 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.9548 +        # A command without a complete path is provided, search $PATH.
  4.9549 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool DSYMUTIL=$tool_basename" >&5
  4.9550 +$as_echo "$as_me: Will search for user supplied tool DSYMUTIL=$tool_basename" >&6;}
  4.9551 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.9552 +set dummy $tool_basename; ac_word=$2
  4.9553 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9554 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9555 +if ${ac_cv_path_DSYMUTIL+:} false; then :
  4.9556 +  $as_echo_n "(cached) " >&6
  4.9557 +else
  4.9558 +  case $DSYMUTIL in
  4.9559 +  [\\/]* | ?:[\\/]*)
  4.9560 +  ac_cv_path_DSYMUTIL="$DSYMUTIL" # Let the user override the test with a path.
  4.9561 +  ;;
  4.9562 +  *)
  4.9563 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9564 +for as_dir in $PATH
  4.9565 +do
  4.9566 +  IFS=$as_save_IFS
  4.9567 +  test -z "$as_dir" && as_dir=.
  4.9568 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9569 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9570 +    ac_cv_path_DSYMUTIL="$as_dir/$ac_word$ac_exec_ext"
  4.9571 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9572 +    break 2
  4.9573 +  fi
  4.9574 +done
  4.9575 +  done
  4.9576 +IFS=$as_save_IFS
  4.9577 +
  4.9578 +  ;;
  4.9579 +esac
  4.9580 +fi
  4.9581 +DSYMUTIL=$ac_cv_path_DSYMUTIL
  4.9582 +if test -n "$DSYMUTIL"; then
  4.9583 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
  4.9584 +$as_echo "$DSYMUTIL" >&6; }
  4.9585 +else
  4.9586 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9587 +$as_echo "no" >&6; }
  4.9588 +fi
  4.9589 +
  4.9590 +
  4.9591 +        if test "x$DSYMUTIL" = x; then
  4.9592 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.9593 +        fi
  4.9594 +      else
  4.9595 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.9596 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool DSYMUTIL=$tool_specified" >&5
  4.9597 +$as_echo "$as_me: Will use user supplied tool DSYMUTIL=$tool_specified" >&6;}
  4.9598 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DSYMUTIL" >&5
  4.9599 +$as_echo_n "checking for DSYMUTIL... " >&6; }
  4.9600 +        if test ! -x "$tool_specified"; then
  4.9601 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.9602 +$as_echo "not found" >&6; }
  4.9603 +          as_fn_error $? "User supplied tool DSYMUTIL=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.9604 +        fi
  4.9605 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.9606 +$as_echo "$tool_specified" >&6; }
  4.9607 +      fi
  4.9608 +    fi
  4.9609 +  fi
  4.9610 +
  4.9611 +
  4.9612  
  4.9613    if test "x$DSYMUTIL" = x; then
  4.9614 -    if test "xdsymutil" = x; then
  4.9615 -      PROG_NAME=dsymutil
  4.9616 -    else
  4.9617 -      PROG_NAME=dsymutil
  4.9618 -    fi
  4.9619 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.9620 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.9621 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.9622 -  fi
  4.9623 -
  4.9624 -
  4.9625 -
  4.9626 -  for ac_prog in xattr
  4.9627 +    as_fn_error $? "Could not find required tool for DSYMUTIL" "$LINENO" 5
  4.9628 +  fi
  4.9629 +
  4.9630 +
  4.9631 +
  4.9632 +
  4.9633 +
  4.9634 +  # Publish this variable in the help.
  4.9635 +
  4.9636 +
  4.9637 +  if test "x$XATTR" = x; then
  4.9638 +    # The variable is not set by user, try to locate tool using the code snippet
  4.9639 +    for ac_prog in xattr
  4.9640  do
  4.9641    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9642  set dummy $ac_prog; ac_word=$2
  4.9643 @@ -10728,21 +18455,157 @@
  4.9644    test -n "$XATTR" && break
  4.9645  done
  4.9646  
  4.9647 +  else
  4.9648 +    # The variable is set, but is it from the command line or the environment?
  4.9649 +
  4.9650 +    # Try to remove the string !XATTR! from our list.
  4.9651 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!XATTR!/}
  4.9652 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.9653 +      # If it failed, the variable was not from the command line. Ignore it,
  4.9654 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.9655 +      if test "xXATTR" != xBASH; then
  4.9656 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of XATTR from the environment. Use command line variables instead." >&5
  4.9657 +$as_echo "$as_me: WARNING: Ignoring value of XATTR from the environment. Use command line variables instead." >&2;}
  4.9658 +      fi
  4.9659 +      # Try to locate tool using the code snippet
  4.9660 +      for ac_prog in xattr
  4.9661 +do
  4.9662 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9663 +set dummy $ac_prog; ac_word=$2
  4.9664 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9665 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9666 +if ${ac_cv_path_XATTR+:} false; then :
  4.9667 +  $as_echo_n "(cached) " >&6
  4.9668 +else
  4.9669 +  case $XATTR in
  4.9670 +  [\\/]* | ?:[\\/]*)
  4.9671 +  ac_cv_path_XATTR="$XATTR" # Let the user override the test with a path.
  4.9672 +  ;;
  4.9673 +  *)
  4.9674 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9675 +for as_dir in $PATH
  4.9676 +do
  4.9677 +  IFS=$as_save_IFS
  4.9678 +  test -z "$as_dir" && as_dir=.
  4.9679 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9680 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9681 +    ac_cv_path_XATTR="$as_dir/$ac_word$ac_exec_ext"
  4.9682 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9683 +    break 2
  4.9684 +  fi
  4.9685 +done
  4.9686 +  done
  4.9687 +IFS=$as_save_IFS
  4.9688 +
  4.9689 +  ;;
  4.9690 +esac
  4.9691 +fi
  4.9692 +XATTR=$ac_cv_path_XATTR
  4.9693 +if test -n "$XATTR"; then
  4.9694 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XATTR" >&5
  4.9695 +$as_echo "$XATTR" >&6; }
  4.9696 +else
  4.9697 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9698 +$as_echo "no" >&6; }
  4.9699 +fi
  4.9700 +
  4.9701 +
  4.9702 +  test -n "$XATTR" && break
  4.9703 +done
  4.9704 +
  4.9705 +    else
  4.9706 +      # If it succeeded, then it was overridden by the user. We will use it
  4.9707 +      # for the tool.
  4.9708 +
  4.9709 +      # First remove it from the list of overridden variables, so we can test
  4.9710 +      # for unknown variables in the end.
  4.9711 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.9712 +
  4.9713 +      # Check if the provided tool contains a complete path.
  4.9714 +      tool_specified="$XATTR"
  4.9715 +      tool_basename="${tool_specified##*/}"
  4.9716 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.9717 +        # A command without a complete path is provided, search $PATH.
  4.9718 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool XATTR=$tool_basename" >&5
  4.9719 +$as_echo "$as_me: Will search for user supplied tool XATTR=$tool_basename" >&6;}
  4.9720 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.9721 +set dummy $tool_basename; ac_word=$2
  4.9722 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9723 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9724 +if ${ac_cv_path_XATTR+:} false; then :
  4.9725 +  $as_echo_n "(cached) " >&6
  4.9726 +else
  4.9727 +  case $XATTR in
  4.9728 +  [\\/]* | ?:[\\/]*)
  4.9729 +  ac_cv_path_XATTR="$XATTR" # Let the user override the test with a path.
  4.9730 +  ;;
  4.9731 +  *)
  4.9732 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9733 +for as_dir in $PATH
  4.9734 +do
  4.9735 +  IFS=$as_save_IFS
  4.9736 +  test -z "$as_dir" && as_dir=.
  4.9737 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9738 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9739 +    ac_cv_path_XATTR="$as_dir/$ac_word$ac_exec_ext"
  4.9740 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9741 +    break 2
  4.9742 +  fi
  4.9743 +done
  4.9744 +  done
  4.9745 +IFS=$as_save_IFS
  4.9746 +
  4.9747 +  ;;
  4.9748 +esac
  4.9749 +fi
  4.9750 +XATTR=$ac_cv_path_XATTR
  4.9751 +if test -n "$XATTR"; then
  4.9752 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XATTR" >&5
  4.9753 +$as_echo "$XATTR" >&6; }
  4.9754 +else
  4.9755 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9756 +$as_echo "no" >&6; }
  4.9757 +fi
  4.9758 +
  4.9759 +
  4.9760 +        if test "x$XATTR" = x; then
  4.9761 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.9762 +        fi
  4.9763 +      else
  4.9764 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.9765 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool XATTR=$tool_specified" >&5
  4.9766 +$as_echo "$as_me: Will use user supplied tool XATTR=$tool_specified" >&6;}
  4.9767 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XATTR" >&5
  4.9768 +$as_echo_n "checking for XATTR... " >&6; }
  4.9769 +        if test ! -x "$tool_specified"; then
  4.9770 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.9771 +$as_echo "not found" >&6; }
  4.9772 +          as_fn_error $? "User supplied tool XATTR=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.9773 +        fi
  4.9774 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.9775 +$as_echo "$tool_specified" >&6; }
  4.9776 +      fi
  4.9777 +    fi
  4.9778 +  fi
  4.9779 +
  4.9780 +
  4.9781  
  4.9782    if test "x$XATTR" = x; then
  4.9783 -    if test "xxattr" = x; then
  4.9784 -      PROG_NAME=xattr
  4.9785 -    else
  4.9786 -      PROG_NAME=xattr
  4.9787 -    fi
  4.9788 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
  4.9789 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
  4.9790 -    as_fn_error $? "Cannot continue" "$LINENO" 5
  4.9791 -  fi
  4.9792 -
  4.9793 -
  4.9794 -    # Extract the first word of "codesign", so it can be a program name with args.
  4.9795 -set dummy codesign; ac_word=$2
  4.9796 +    as_fn_error $? "Could not find required tool for XATTR" "$LINENO" 5
  4.9797 +  fi
  4.9798 +
  4.9799 +
  4.9800 +
  4.9801 +
  4.9802 +  # Publish this variable in the help.
  4.9803 +
  4.9804 +
  4.9805 +  if test "x$CODESIGN" = x; then
  4.9806 +    # The variable is not set by user, try to locate tool using the code snippet
  4.9807 +    for ac_prog in codesign
  4.9808 +do
  4.9809 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9810 +set dummy $ac_prog; ac_word=$2
  4.9811  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9812  $as_echo_n "checking for $ac_word... " >&6; }
  4.9813  if ${ac_cv_path_CODESIGN+:} false; then :
  4.9814 @@ -10781,6 +18644,143 @@
  4.9815  fi
  4.9816  
  4.9817  
  4.9818 +  test -n "$CODESIGN" && break
  4.9819 +done
  4.9820 +
  4.9821 +  else
  4.9822 +    # The variable is set, but is it from the command line or the environment?
  4.9823 +
  4.9824 +    # Try to remove the string !CODESIGN! from our list.
  4.9825 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CODESIGN!/}
  4.9826 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.9827 +      # If it failed, the variable was not from the command line. Ignore it,
  4.9828 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.9829 +      if test "xCODESIGN" != xBASH; then
  4.9830 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CODESIGN from the environment. Use command line variables instead." >&5
  4.9831 +$as_echo "$as_me: WARNING: Ignoring value of CODESIGN from the environment. Use command line variables instead." >&2;}
  4.9832 +      fi
  4.9833 +      # Try to locate tool using the code snippet
  4.9834 +      for ac_prog in codesign
  4.9835 +do
  4.9836 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9837 +set dummy $ac_prog; ac_word=$2
  4.9838 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9839 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9840 +if ${ac_cv_path_CODESIGN+:} false; then :
  4.9841 +  $as_echo_n "(cached) " >&6
  4.9842 +else
  4.9843 +  case $CODESIGN in
  4.9844 +  [\\/]* | ?:[\\/]*)
  4.9845 +  ac_cv_path_CODESIGN="$CODESIGN" # Let the user override the test with a path.
  4.9846 +  ;;
  4.9847 +  *)
  4.9848 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9849 +for as_dir in $PATH
  4.9850 +do
  4.9851 +  IFS=$as_save_IFS
  4.9852 +  test -z "$as_dir" && as_dir=.
  4.9853 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9854 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9855 +    ac_cv_path_CODESIGN="$as_dir/$ac_word$ac_exec_ext"
  4.9856 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9857 +    break 2
  4.9858 +  fi
  4.9859 +done
  4.9860 +  done
  4.9861 +IFS=$as_save_IFS
  4.9862 +
  4.9863 +  ;;
  4.9864 +esac
  4.9865 +fi
  4.9866 +CODESIGN=$ac_cv_path_CODESIGN
  4.9867 +if test -n "$CODESIGN"; then
  4.9868 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CODESIGN" >&5
  4.9869 +$as_echo "$CODESIGN" >&6; }
  4.9870 +else
  4.9871 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9872 +$as_echo "no" >&6; }
  4.9873 +fi
  4.9874 +
  4.9875 +
  4.9876 +  test -n "$CODESIGN" && break
  4.9877 +done
  4.9878 +
  4.9879 +    else
  4.9880 +      # If it succeeded, then it was overridden by the user. We will use it
  4.9881 +      # for the tool.
  4.9882 +
  4.9883 +      # First remove it from the list of overridden variables, so we can test
  4.9884 +      # for unknown variables in the end.
  4.9885 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
  4.9886 +
  4.9887 +      # Check if the provided tool contains a complete path.
  4.9888 +      tool_specified="$CODESIGN"
  4.9889 +      tool_basename="${tool_specified##*/}"
  4.9890 +      if test "x$tool_basename" = "x$tool_specified"; then
  4.9891 +        # A command without a complete path is provided, search $PATH.
  4.9892 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CODESIGN=$tool_basename" >&5
  4.9893 +$as_echo "$as_me: Will search for user supplied tool CODESIGN=$tool_basename" >&6;}
  4.9894 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
  4.9895 +set dummy $tool_basename; ac_word=$2
  4.9896 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9897 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9898 +if ${ac_cv_path_CODESIGN+:} false; then :
  4.9899 +  $as_echo_n "(cached) " >&6
  4.9900 +else
  4.9901 +  case $CODESIGN in
  4.9902 +  [\\/]* | ?:[\\/]*)
  4.9903 +  ac_cv_path_CODESIGN="$CODESIGN" # Let the user override the test with a path.
  4.9904 +  ;;
  4.9905 +  *)
  4.9906 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  4.9907 +for as_dir in $PATH
  4.9908 +do
  4.9909 +  IFS=$as_save_IFS
  4.9910 +  test -z "$as_dir" && as_dir=.
  4.9911 +    for ac_exec_ext in '' $ac_executable_extensions; do
  4.9912 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  4.9913 +    ac_cv_path_CODESIGN="$as_dir/$ac_word$ac_exec_ext"
  4.9914 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  4.9915 +    break 2
  4.9916 +  fi
  4.9917 +done
  4.9918 +  done
  4.9919 +IFS=$as_save_IFS
  4.9920 +
  4.9921 +  ;;
  4.9922 +esac
  4.9923 +fi
  4.9924 +CODESIGN=$ac_cv_path_CODESIGN
  4.9925 +if test -n "$CODESIGN"; then
  4.9926 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CODESIGN" >&5
  4.9927 +$as_echo "$CODESIGN" >&6; }
  4.9928 +else
  4.9929 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  4.9930 +$as_echo "no" >&6; }
  4.9931 +fi
  4.9932 +
  4.9933 +
  4.9934 +        if test "x$CODESIGN" = x; then
  4.9935 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
  4.9936 +        fi
  4.9937 +      else
  4.9938 +        # Otherwise we believe it is a complete path. Use it as it is.
  4.9939 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CODESIGN=$tool_specified" >&5
  4.9940 +$as_echo "$as_me: Will use user supplied tool CODESIGN=$tool_specified" >&6;}
  4.9941 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CODESIGN" >&5
  4.9942 +$as_echo_n "checking for CODESIGN... " >&6; }
  4.9943 +        if test ! -x "$tool_specified"; then
  4.9944 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
  4.9945 +$as_echo "not found" >&6; }
  4.9946 +          as_fn_error $? "User supplied tool CODESIGN=$tool_specified does not exist or is not executable" "$LINENO" 5
  4.9947 +        fi
  4.9948 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
  4.9949 +$as_echo "$tool_specified" >&6; }
  4.9950 +      fi
  4.9951 +    fi
  4.9952 +  fi
  4.9953 +
  4.9954 +
  4.9955      if test "x$CODESIGN" != "x"; then
  4.9956        # Verify that the openjdk_codesign certificate is present
  4.9957        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5
  4.9958 @@ -16842,7 +24842,14 @@
  4.9959      else
  4.9960        # try to find jtreg on path
  4.9961  
  4.9962 -  for ac_prog in jtreg
  4.9963 +
  4.9964 +
  4.9965 +  # Publish this variable in the help.
  4.9966 +
  4.9967 +
  4.9968 +  if test "x$JTREGEXE" = x; then
  4.9969 +    # The variable is not set by user, try to locate tool using the code snippet
  4.9970 +    for ac_prog in jtreg
  4.9971  do
  4.9972    # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9973  set dummy $ac_prog; ac_word=$2
  4.9974 @@ -16887,16 +24894,143 @@
  4.9975    test -n "$JTREGEXE" && break
  4.9976  done
  4.9977  
  4.9978 +  else
  4.9979 +    # The variable is set, but is it from the command line or the environment?
  4.9980 +
  4.9981 +    # Try to remove the string !JTREGEXE! from our list.
  4.9982 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!JTREGEXE!/}
  4.9983 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
  4.9984 +      # If it failed, the variable was not from the command line. Ignore it,
  4.9985 +      # but warn the user (except for BASH, which is always set by the calling BASH).
  4.9986 +      if test "xJTREGEXE" != xBASH; then
  4.9987 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of JTREGEXE from the environment. Use command line variables instead." >&5
  4.9988 +$as_echo "$as_me: WARNING: Ignoring value of JTREGEXE from the environment. Use command line variables instead." >&2;}
  4.9989 +      fi
  4.9990 +      # Try to locate tool using the code snippet
  4.9991 +      for ac_prog in jtreg
  4.9992 +do
  4.9993 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
  4.9994 +set dummy $ac_prog; ac_word=$2
  4.9995 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  4.9996 +$as_echo_n "checking for $ac_word... " >&6; }
  4.9997 +if ${ac_cv_path_JTREGEXE+:} false; then :
  4.9998 +  $as_echo_n "(cached) " >&6
  4.9999 +else
 4.10000 +  case $JTREGEXE in
 4.10001 +  [\\/]* | ?:[\\/]*)
 4.10002 +  ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
 4.10003 +  ;;
 4.10004 +  *)
 4.10005 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10006 +for as_dir in $PATH
 4.10007 +do
 4.10008 +  IFS=$as_save_IFS
 4.10009 +  test -z "$as_dir" && as_dir=.
 4.10010 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10011 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10012 +    ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
 4.10013 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10014 +    break 2
 4.10015 +  fi
 4.10016 +done
 4.10017 +  done
 4.10018 +IFS=$as_save_IFS
 4.10019 +
 4.10020 +  ;;
 4.10021 +esac
 4.10022 +fi
 4.10023 +JTREGEXE=$ac_cv_path_JTREGEXE
 4.10024 +if test -n "$JTREGEXE"; then
 4.10025 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
 4.10026 +$as_echo "$JTREGEXE" >&6; }
 4.10027 +else
 4.10028 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10029 +$as_echo "no" >&6; }
 4.10030 +fi
 4.10031 +
 4.10032 +
 4.10033 +  test -n "$JTREGEXE" && break
 4.10034 +done
 4.10035 +
 4.10036 +    else
 4.10037 +      # If it succeeded, then it was overridden by the user. We will use it
 4.10038 +      # for the tool.
 4.10039 +
 4.10040 +      # First remove it from the list of overridden variables, so we can test
 4.10041 +      # for unknown variables in the end.
 4.10042 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.10043 +
 4.10044 +      # Check if the provided tool contains a complete path.
 4.10045 +      tool_specified="$JTREGEXE"
 4.10046 +      tool_basename="${tool_specified##*/}"
 4.10047 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.10048 +        # A command without a complete path is provided, search $PATH.
 4.10049 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool JTREGEXE=$tool_basename" >&5
 4.10050 +$as_echo "$as_me: Will search for user supplied tool JTREGEXE=$tool_basename" >&6;}
 4.10051 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.10052 +set dummy $tool_basename; ac_word=$2
 4.10053 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10054 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10055 +if ${ac_cv_path_JTREGEXE+:} false; then :
 4.10056 +  $as_echo_n "(cached) " >&6
 4.10057 +else
 4.10058 +  case $JTREGEXE in
 4.10059 +  [\\/]* | ?:[\\/]*)
 4.10060 +  ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
 4.10061 +  ;;
 4.10062 +  *)
 4.10063 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10064 +for as_dir in $PATH
 4.10065 +do
 4.10066 +  IFS=$as_save_IFS
 4.10067 +  test -z "$as_dir" && as_dir=.
 4.10068 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10069 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10070 +    ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
 4.10071 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10072 +    break 2
 4.10073 +  fi
 4.10074 +done
 4.10075 +  done
 4.10076 +IFS=$as_save_IFS
 4.10077 +
 4.10078 +  ;;
 4.10079 +esac
 4.10080 +fi
 4.10081 +JTREGEXE=$ac_cv_path_JTREGEXE
 4.10082 +if test -n "$JTREGEXE"; then
 4.10083 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
 4.10084 +$as_echo "$JTREGEXE" >&6; }
 4.10085 +else
 4.10086 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10087 +$as_echo "no" >&6; }
 4.10088 +fi
 4.10089 +
 4.10090 +
 4.10091 +        if test "x$JTREGEXE" = x; then
 4.10092 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.10093 +        fi
 4.10094 +      else
 4.10095 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.10096 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool JTREGEXE=$tool_specified" >&5
 4.10097 +$as_echo "$as_me: Will use user supplied tool JTREGEXE=$tool_specified" >&6;}
 4.10098 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JTREGEXE" >&5
 4.10099 +$as_echo_n "checking for JTREGEXE... " >&6; }
 4.10100 +        if test ! -x "$tool_specified"; then
 4.10101 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.10102 +$as_echo "not found" >&6; }
 4.10103 +          as_fn_error $? "User supplied tool JTREGEXE=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.10104 +        fi
 4.10105 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.10106 +$as_echo "$tool_specified" >&6; }
 4.10107 +      fi
 4.10108 +    fi
 4.10109 +  fi
 4.10110 +
 4.10111 +
 4.10112  
 4.10113    if test "x$JTREGEXE" = x; then
 4.10114 -    if test "xjtreg" = x; then
 4.10115 -      PROG_NAME=jtregexe
 4.10116 -    else
 4.10117 -      PROG_NAME=jtreg
 4.10118 -    fi
 4.10119 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 4.10120 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 4.10121 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 4.10122 +    as_fn_error $? "Could not find required tool for JTREGEXE" "$LINENO" 5
 4.10123    fi
 4.10124  
 4.10125  
 4.10126 @@ -18185,6 +26319,13 @@
 4.10127      # otherwise we might pick up cross-compilers which don't use standard naming.
 4.10128      # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have
 4.10129      # to wait until they are properly discovered.
 4.10130 +
 4.10131 +
 4.10132 +  # Publish this variable in the help.
 4.10133 +
 4.10134 +
 4.10135 +  if test "x$BUILD_CC" = x; then
 4.10136 +    # The variable is not set by user, try to locate tool using the code snippet
 4.10137      for ac_prog in cl cc gcc
 4.10138  do
 4.10139    # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.10140 @@ -18230,6 +26371,140 @@
 4.10141    test -n "$BUILD_CC" && break
 4.10142  done
 4.10143  
 4.10144 +  else
 4.10145 +    # The variable is set, but is it from the command line or the environment?
 4.10146 +
 4.10147 +    # Try to remove the string !BUILD_CC! from our list.
 4.10148 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_CC!/}
 4.10149 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.10150 +      # If it failed, the variable was not from the command line. Ignore it,
 4.10151 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.10152 +      if test "xBUILD_CC" != xBASH; then
 4.10153 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_CC from the environment. Use command line variables instead." >&5
 4.10154 +$as_echo "$as_me: WARNING: Ignoring value of BUILD_CC from the environment. Use command line variables instead." >&2;}
 4.10155 +      fi
 4.10156 +      # Try to locate tool using the code snippet
 4.10157 +      for ac_prog in cl cc gcc
 4.10158 +do
 4.10159 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.10160 +set dummy $ac_prog; ac_word=$2
 4.10161 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10162 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10163 +if ${ac_cv_path_BUILD_CC+:} false; then :
 4.10164 +  $as_echo_n "(cached) " >&6
 4.10165 +else
 4.10166 +  case $BUILD_CC in
 4.10167 +  [\\/]* | ?:[\\/]*)
 4.10168 +  ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
 4.10169 +  ;;
 4.10170 +  *)
 4.10171 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10172 +for as_dir in $PATH
 4.10173 +do
 4.10174 +  IFS=$as_save_IFS
 4.10175 +  test -z "$as_dir" && as_dir=.
 4.10176 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10177 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10178 +    ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
 4.10179 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10180 +    break 2
 4.10181 +  fi
 4.10182 +done
 4.10183 +  done
 4.10184 +IFS=$as_save_IFS
 4.10185 +
 4.10186 +  ;;
 4.10187 +esac
 4.10188 +fi
 4.10189 +BUILD_CC=$ac_cv_path_BUILD_CC
 4.10190 +if test -n "$BUILD_CC"; then
 4.10191 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
 4.10192 +$as_echo "$BUILD_CC" >&6; }
 4.10193 +else
 4.10194 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10195 +$as_echo "no" >&6; }
 4.10196 +fi
 4.10197 +
 4.10198 +
 4.10199 +  test -n "$BUILD_CC" && break
 4.10200 +done
 4.10201 +
 4.10202 +    else
 4.10203 +      # If it succeeded, then it was overridden by the user. We will use it
 4.10204 +      # for the tool.
 4.10205 +
 4.10206 +      # First remove it from the list of overridden variables, so we can test
 4.10207 +      # for unknown variables in the end.
 4.10208 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.10209 +
 4.10210 +      # Check if the provided tool contains a complete path.
 4.10211 +      tool_specified="$BUILD_CC"
 4.10212 +      tool_basename="${tool_specified##*/}"
 4.10213 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.10214 +        # A command without a complete path is provided, search $PATH.
 4.10215 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_CC=$tool_basename" >&5
 4.10216 +$as_echo "$as_me: Will search for user supplied tool BUILD_CC=$tool_basename" >&6;}
 4.10217 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.10218 +set dummy $tool_basename; ac_word=$2
 4.10219 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10220 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10221 +if ${ac_cv_path_BUILD_CC+:} false; then :
 4.10222 +  $as_echo_n "(cached) " >&6
 4.10223 +else
 4.10224 +  case $BUILD_CC in
 4.10225 +  [\\/]* | ?:[\\/]*)
 4.10226 +  ac_cv_path_BUILD_CC="$BUILD_CC" # Let the user override the test with a path.
 4.10227 +  ;;
 4.10228 +  *)
 4.10229 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10230 +for as_dir in $PATH
 4.10231 +do
 4.10232 +  IFS=$as_save_IFS
 4.10233 +  test -z "$as_dir" && as_dir=.
 4.10234 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10235 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10236 +    ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
 4.10237 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10238 +    break 2
 4.10239 +  fi
 4.10240 +done
 4.10241 +  done
 4.10242 +IFS=$as_save_IFS
 4.10243 +
 4.10244 +  ;;
 4.10245 +esac
 4.10246 +fi
 4.10247 +BUILD_CC=$ac_cv_path_BUILD_CC
 4.10248 +if test -n "$BUILD_CC"; then
 4.10249 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
 4.10250 +$as_echo "$BUILD_CC" >&6; }
 4.10251 +else
 4.10252 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10253 +$as_echo "no" >&6; }
 4.10254 +fi
 4.10255 +
 4.10256 +
 4.10257 +        if test "x$BUILD_CC" = x; then
 4.10258 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.10259 +        fi
 4.10260 +      else
 4.10261 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.10262 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_CC=$tool_specified" >&5
 4.10263 +$as_echo "$as_me: Will use user supplied tool BUILD_CC=$tool_specified" >&6;}
 4.10264 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_CC" >&5
 4.10265 +$as_echo_n "checking for BUILD_CC... " >&6; }
 4.10266 +        if test ! -x "$tool_specified"; then
 4.10267 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.10268 +$as_echo "not found" >&6; }
 4.10269 +          as_fn_error $? "User supplied tool BUILD_CC=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.10270 +        fi
 4.10271 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.10272 +$as_echo "$tool_specified" >&6; }
 4.10273 +      fi
 4.10274 +    fi
 4.10275 +  fi
 4.10276 +
 4.10277 +
 4.10278  
 4.10279    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 4.10280  
 4.10281 @@ -18496,6 +26771,13 @@
 4.10282  $as_echo "$as_me: Rewriting BUILD_CC to \"$new_complete\"" >&6;}
 4.10283    fi
 4.10284  
 4.10285 +
 4.10286 +
 4.10287 +  # Publish this variable in the help.
 4.10288 +
 4.10289 +
 4.10290 +  if test "x$BUILD_CXX" = x; then
 4.10291 +    # The variable is not set by user, try to locate tool using the code snippet
 4.10292      for ac_prog in cl CC g++
 4.10293  do
 4.10294    # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.10295 @@ -18541,6 +26823,140 @@
 4.10296    test -n "$BUILD_CXX" && break
 4.10297  done
 4.10298  
 4.10299 +  else
 4.10300 +    # The variable is set, but is it from the command line or the environment?
 4.10301 +
 4.10302 +    # Try to remove the string !BUILD_CXX! from our list.
 4.10303 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_CXX!/}
 4.10304 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.10305 +      # If it failed, the variable was not from the command line. Ignore it,
 4.10306 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.10307 +      if test "xBUILD_CXX" != xBASH; then
 4.10308 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&5
 4.10309 +$as_echo "$as_me: WARNING: Ignoring value of BUILD_CXX from the environment. Use command line variables instead." >&2;}
 4.10310 +      fi
 4.10311 +      # Try to locate tool using the code snippet
 4.10312 +      for ac_prog in cl CC g++
 4.10313 +do
 4.10314 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.10315 +set dummy $ac_prog; ac_word=$2
 4.10316 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10317 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10318 +if ${ac_cv_path_BUILD_CXX+:} false; then :
 4.10319 +  $as_echo_n "(cached) " >&6
 4.10320 +else
 4.10321 +  case $BUILD_CXX in
 4.10322 +  [\\/]* | ?:[\\/]*)
 4.10323 +  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
 4.10324 +  ;;
 4.10325 +  *)
 4.10326 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10327 +for as_dir in $PATH
 4.10328 +do
 4.10329 +  IFS=$as_save_IFS
 4.10330 +  test -z "$as_dir" && as_dir=.
 4.10331 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10332 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10333 +    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
 4.10334 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10335 +    break 2
 4.10336 +  fi
 4.10337 +done
 4.10338 +  done
 4.10339 +IFS=$as_save_IFS
 4.10340 +
 4.10341 +  ;;
 4.10342 +esac
 4.10343 +fi
 4.10344 +BUILD_CXX=$ac_cv_path_BUILD_CXX
 4.10345 +if test -n "$BUILD_CXX"; then
 4.10346 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
 4.10347 +$as_echo "$BUILD_CXX" >&6; }
 4.10348 +else
 4.10349 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10350 +$as_echo "no" >&6; }
 4.10351 +fi
 4.10352 +
 4.10353 +
 4.10354 +  test -n "$BUILD_CXX" && break
 4.10355 +done
 4.10356 +
 4.10357 +    else
 4.10358 +      # If it succeeded, then it was overridden by the user. We will use it
 4.10359 +      # for the tool.
 4.10360 +
 4.10361 +      # First remove it from the list of overridden variables, so we can test
 4.10362 +      # for unknown variables in the end.
 4.10363 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.10364 +
 4.10365 +      # Check if the provided tool contains a complete path.
 4.10366 +      tool_specified="$BUILD_CXX"
 4.10367 +      tool_basename="${tool_specified##*/}"
 4.10368 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.10369 +        # A command without a complete path is provided, search $PATH.
 4.10370 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_CXX=$tool_basename" >&5
 4.10371 +$as_echo "$as_me: Will search for user supplied tool BUILD_CXX=$tool_basename" >&6;}
 4.10372 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.10373 +set dummy $tool_basename; ac_word=$2
 4.10374 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10375 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10376 +if ${ac_cv_path_BUILD_CXX+:} false; then :
 4.10377 +  $as_echo_n "(cached) " >&6
 4.10378 +else
 4.10379 +  case $BUILD_CXX in
 4.10380 +  [\\/]* | ?:[\\/]*)
 4.10381 +  ac_cv_path_BUILD_CXX="$BUILD_CXX" # Let the user override the test with a path.
 4.10382 +  ;;
 4.10383 +  *)
 4.10384 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10385 +for as_dir in $PATH
 4.10386 +do
 4.10387 +  IFS=$as_save_IFS
 4.10388 +  test -z "$as_dir" && as_dir=.
 4.10389 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10390 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10391 +    ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
 4.10392 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10393 +    break 2
 4.10394 +  fi
 4.10395 +done
 4.10396 +  done
 4.10397 +IFS=$as_save_IFS
 4.10398 +
 4.10399 +  ;;
 4.10400 +esac
 4.10401 +fi
 4.10402 +BUILD_CXX=$ac_cv_path_BUILD_CXX
 4.10403 +if test -n "$BUILD_CXX"; then
 4.10404 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CXX" >&5
 4.10405 +$as_echo "$BUILD_CXX" >&6; }
 4.10406 +else
 4.10407 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10408 +$as_echo "no" >&6; }
 4.10409 +fi
 4.10410 +
 4.10411 +
 4.10412 +        if test "x$BUILD_CXX" = x; then
 4.10413 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.10414 +        fi
 4.10415 +      else
 4.10416 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.10417 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_CXX=$tool_specified" >&5
 4.10418 +$as_echo "$as_me: Will use user supplied tool BUILD_CXX=$tool_specified" >&6;}
 4.10419 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_CXX" >&5
 4.10420 +$as_echo_n "checking for BUILD_CXX... " >&6; }
 4.10421 +        if test ! -x "$tool_specified"; then
 4.10422 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.10423 +$as_echo "not found" >&6; }
 4.10424 +          as_fn_error $? "User supplied tool BUILD_CXX=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.10425 +        fi
 4.10426 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.10427 +$as_echo "$tool_specified" >&6; }
 4.10428 +      fi
 4.10429 +    fi
 4.10430 +  fi
 4.10431 +
 4.10432 +
 4.10433  
 4.10434    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 4.10435  
 4.10436 @@ -18807,8 +27223,17 @@
 4.10437  $as_echo "$as_me: Rewriting BUILD_CXX to \"$new_complete\"" >&6;}
 4.10438    fi
 4.10439  
 4.10440 -    # Extract the first word of "ld", so it can be a program name with args.
 4.10441 -set dummy ld; ac_word=$2
 4.10442 +
 4.10443 +
 4.10444 +  # Publish this variable in the help.
 4.10445 +
 4.10446 +
 4.10447 +  if test "x$BUILD_LD" = x; then
 4.10448 +    # The variable is not set by user, try to locate tool using the code snippet
 4.10449 +    for ac_prog in ld
 4.10450 +do
 4.10451 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.10452 +set dummy $ac_prog; ac_word=$2
 4.10453  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10454  $as_echo_n "checking for $ac_word... " >&6; }
 4.10455  if ${ac_cv_path_BUILD_LD+:} false; then :
 4.10456 @@ -18847,6 +27272,143 @@
 4.10457  fi
 4.10458  
 4.10459  
 4.10460 +  test -n "$BUILD_LD" && break
 4.10461 +done
 4.10462 +
 4.10463 +  else
 4.10464 +    # The variable is set, but is it from the command line or the environment?
 4.10465 +
 4.10466 +    # Try to remove the string !BUILD_LD! from our list.
 4.10467 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!BUILD_LD!/}
 4.10468 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.10469 +      # If it failed, the variable was not from the command line. Ignore it,
 4.10470 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.10471 +      if test "xBUILD_LD" != xBASH; then
 4.10472 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of BUILD_LD from the environment. Use command line variables instead." >&5
 4.10473 +$as_echo "$as_me: WARNING: Ignoring value of BUILD_LD from the environment. Use command line variables instead." >&2;}
 4.10474 +      fi
 4.10475 +      # Try to locate tool using the code snippet
 4.10476 +      for ac_prog in ld
 4.10477 +do
 4.10478 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.10479 +set dummy $ac_prog; ac_word=$2
 4.10480 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10481 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10482 +if ${ac_cv_path_BUILD_LD+:} false; then :
 4.10483 +  $as_echo_n "(cached) " >&6
 4.10484 +else
 4.10485 +  case $BUILD_LD in
 4.10486 +  [\\/]* | ?:[\\/]*)
 4.10487 +  ac_cv_path_BUILD_LD="$BUILD_LD" # Let the user override the test with a path.
 4.10488 +  ;;
 4.10489 +  *)
 4.10490 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10491 +for as_dir in $PATH
 4.10492 +do
 4.10493 +  IFS=$as_save_IFS
 4.10494 +  test -z "$as_dir" && as_dir=.
 4.10495 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10496 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10497 +    ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext"
 4.10498 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10499 +    break 2
 4.10500 +  fi
 4.10501 +done
 4.10502 +  done
 4.10503 +IFS=$as_save_IFS
 4.10504 +
 4.10505 +  ;;
 4.10506 +esac
 4.10507 +fi
 4.10508 +BUILD_LD=$ac_cv_path_BUILD_LD
 4.10509 +if test -n "$BUILD_LD"; then
 4.10510 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_LD" >&5
 4.10511 +$as_echo "$BUILD_LD" >&6; }
 4.10512 +else
 4.10513 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10514 +$as_echo "no" >&6; }
 4.10515 +fi
 4.10516 +
 4.10517 +
 4.10518 +  test -n "$BUILD_LD" && break
 4.10519 +done
 4.10520 +
 4.10521 +    else
 4.10522 +      # If it succeeded, then it was overridden by the user. We will use it
 4.10523 +      # for the tool.
 4.10524 +
 4.10525 +      # First remove it from the list of overridden variables, so we can test
 4.10526 +      # for unknown variables in the end.
 4.10527 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.10528 +
 4.10529 +      # Check if the provided tool contains a complete path.
 4.10530 +      tool_specified="$BUILD_LD"
 4.10531 +      tool_basename="${tool_specified##*/}"
 4.10532 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.10533 +        # A command without a complete path is provided, search $PATH.
 4.10534 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool BUILD_LD=$tool_basename" >&5
 4.10535 +$as_echo "$as_me: Will search for user supplied tool BUILD_LD=$tool_basename" >&6;}
 4.10536 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.10537 +set dummy $tool_basename; ac_word=$2
 4.10538 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10539 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10540 +if ${ac_cv_path_BUILD_LD+:} false; then :
 4.10541 +  $as_echo_n "(cached) " >&6
 4.10542 +else
 4.10543 +  case $BUILD_LD in
 4.10544 +  [\\/]* | ?:[\\/]*)
 4.10545 +  ac_cv_path_BUILD_LD="$BUILD_LD" # Let the user override the test with a path.
 4.10546 +  ;;
 4.10547 +  *)
 4.10548 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10549 +for as_dir in $PATH
 4.10550 +do
 4.10551 +  IFS=$as_save_IFS
 4.10552 +  test -z "$as_dir" && as_dir=.
 4.10553 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10554 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10555 +    ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext"
 4.10556 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10557 +    break 2
 4.10558 +  fi
 4.10559 +done
 4.10560 +  done
 4.10561 +IFS=$as_save_IFS
 4.10562 +
 4.10563 +  ;;
 4.10564 +esac
 4.10565 +fi
 4.10566 +BUILD_LD=$ac_cv_path_BUILD_LD
 4.10567 +if test -n "$BUILD_LD"; then
 4.10568 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_LD" >&5
 4.10569 +$as_echo "$BUILD_LD" >&6; }
 4.10570 +else
 4.10571 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10572 +$as_echo "no" >&6; }
 4.10573 +fi
 4.10574 +
 4.10575 +
 4.10576 +        if test "x$BUILD_LD" = x; then
 4.10577 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.10578 +        fi
 4.10579 +      else
 4.10580 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.10581 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool BUILD_LD=$tool_specified" >&5
 4.10582 +$as_echo "$as_me: Will use user supplied tool BUILD_LD=$tool_specified" >&6;}
 4.10583 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BUILD_LD" >&5
 4.10584 +$as_echo_n "checking for BUILD_LD... " >&6; }
 4.10585 +        if test ! -x "$tool_specified"; then
 4.10586 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.10587 +$as_echo "not found" >&6; }
 4.10588 +          as_fn_error $? "User supplied tool BUILD_LD=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.10589 +        fi
 4.10590 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.10591 +$as_echo "$tool_specified" >&6; }
 4.10592 +      fi
 4.10593 +    fi
 4.10594 +  fi
 4.10595 +
 4.10596 +
 4.10597  
 4.10598    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 4.10599  
 4.10600 @@ -22843,9 +31405,18 @@
 4.10601  
 4.10602  
 4.10603    if test "x$OPENJDK_TARGET_OS" != xwindows; then
 4.10604 +
 4.10605 +
 4.10606 +  # Publish this variable in the help.
 4.10607 +
 4.10608 +
 4.10609 +  if test "x$AR" = x; then
 4.10610 +    # The variable is not set by user, try to locate tool using the code snippet
 4.10611      if test -n "$ac_tool_prefix"; then
 4.10612 -  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 4.10613 -set dummy ${ac_tool_prefix}ar; ac_word=$2
 4.10614 +  for ac_prog in ar
 4.10615 +  do
 4.10616 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 4.10617 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 4.10618  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10619  $as_echo_n "checking for $ac_word... " >&6; }
 4.10620  if ${ac_cv_prog_AR+:} false; then :
 4.10621 @@ -22861,7 +31432,7 @@
 4.10622    test -z "$as_dir" && as_dir=.
 4.10623      for ac_exec_ext in '' $ac_executable_extensions; do
 4.10624    if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10625 -    ac_cv_prog_AR="${ac_tool_prefix}ar"
 4.10626 +    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
 4.10627      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10628      break 2
 4.10629    fi
 4.10630 @@ -22881,11 +31452,15 @@
 4.10631  fi
 4.10632  
 4.10633  
 4.10634 -fi
 4.10635 -if test -z "$ac_cv_prog_AR"; then
 4.10636 +    test -n "$AR" && break
 4.10637 +  done
 4.10638 +fi
 4.10639 +if test -z "$AR"; then
 4.10640    ac_ct_AR=$AR
 4.10641 -  # Extract the first word of "ar", so it can be a program name with args.
 4.10642 -set dummy ar; ac_word=$2
 4.10643 +  for ac_prog in ar
 4.10644 +do
 4.10645 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.10646 +set dummy $ac_prog; ac_word=$2
 4.10647  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10648  $as_echo_n "checking for $ac_word... " >&6; }
 4.10649  if ${ac_cv_prog_ac_ct_AR+:} false; then :
 4.10650 @@ -22901,7 +31476,7 @@
 4.10651    test -z "$as_dir" && as_dir=.
 4.10652      for ac_exec_ext in '' $ac_executable_extensions; do
 4.10653    if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10654 -    ac_cv_prog_ac_ct_AR="ar"
 4.10655 +    ac_cv_prog_ac_ct_AR="$ac_prog"
 4.10656      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10657      break 2
 4.10658    fi
 4.10659 @@ -22920,6 +31495,10 @@
 4.10660  $as_echo "no" >&6; }
 4.10661  fi
 4.10662  
 4.10663 +
 4.10664 +  test -n "$ac_ct_AR" && break
 4.10665 +done
 4.10666 +
 4.10667    if test "x$ac_ct_AR" = x; then
 4.10668      AR=""
 4.10669    else
 4.10670 @@ -22931,9 +31510,196 @@
 4.10671  esac
 4.10672      AR=$ac_ct_AR
 4.10673    fi
 4.10674 -else
 4.10675 -  AR="$ac_cv_prog_AR"
 4.10676 -fi
 4.10677 +fi
 4.10678 +
 4.10679 +  else
 4.10680 +    # The variable is set, but is it from the command line or the environment?
 4.10681 +
 4.10682 +    # Try to remove the string !AR! from our list.
 4.10683 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!AR!/}
 4.10684 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.10685 +      # If it failed, the variable was not from the command line. Ignore it,
 4.10686 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.10687 +      if test "xAR" != xBASH; then
 4.10688 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of AR from the environment. Use command line variables instead." >&5
 4.10689 +$as_echo "$as_me: WARNING: Ignoring value of AR from the environment. Use command line variables instead." >&2;}
 4.10690 +      fi
 4.10691 +      # Try to locate tool using the code snippet
 4.10692 +      if test -n "$ac_tool_prefix"; then
 4.10693 +  for ac_prog in ar
 4.10694 +  do
 4.10695 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 4.10696 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 4.10697 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10698 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10699 +if ${ac_cv_prog_AR+:} false; then :
 4.10700 +  $as_echo_n "(cached) " >&6
 4.10701 +else
 4.10702 +  if test -n "$AR"; then
 4.10703 +  ac_cv_prog_AR="$AR" # Let the user override the test.
 4.10704 +else
 4.10705 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10706 +for as_dir in $PATH
 4.10707 +do
 4.10708 +  IFS=$as_save_IFS
 4.10709 +  test -z "$as_dir" && as_dir=.
 4.10710 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10711 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10712 +    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
 4.10713 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10714 +    break 2
 4.10715 +  fi
 4.10716 +done
 4.10717 +  done
 4.10718 +IFS=$as_save_IFS
 4.10719 +
 4.10720 +fi
 4.10721 +fi
 4.10722 +AR=$ac_cv_prog_AR
 4.10723 +if test -n "$AR"; then
 4.10724 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
 4.10725 +$as_echo "$AR" >&6; }
 4.10726 +else
 4.10727 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10728 +$as_echo "no" >&6; }
 4.10729 +fi
 4.10730 +
 4.10731 +
 4.10732 +    test -n "$AR" && break
 4.10733 +  done
 4.10734 +fi
 4.10735 +if test -z "$AR"; then
 4.10736 +  ac_ct_AR=$AR
 4.10737 +  for ac_prog in ar
 4.10738 +do
 4.10739 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.10740 +set dummy $ac_prog; ac_word=$2
 4.10741 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10742 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10743 +if ${ac_cv_prog_ac_ct_AR+:} false; then :
 4.10744 +  $as_echo_n "(cached) " >&6
 4.10745 +else
 4.10746 +  if test -n "$ac_ct_AR"; then
 4.10747 +  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 4.10748 +else
 4.10749 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10750 +for as_dir in $PATH
 4.10751 +do
 4.10752 +  IFS=$as_save_IFS
 4.10753 +  test -z "$as_dir" && as_dir=.
 4.10754 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10755 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10756 +    ac_cv_prog_ac_ct_AR="$ac_prog"
 4.10757 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10758 +    break 2
 4.10759 +  fi
 4.10760 +done
 4.10761 +  done
 4.10762 +IFS=$as_save_IFS
 4.10763 +
 4.10764 +fi
 4.10765 +fi
 4.10766 +ac_ct_AR=$ac_cv_prog_ac_ct_AR
 4.10767 +if test -n "$ac_ct_AR"; then
 4.10768 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
 4.10769 +$as_echo "$ac_ct_AR" >&6; }
 4.10770 +else
 4.10771 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10772 +$as_echo "no" >&6; }
 4.10773 +fi
 4.10774 +
 4.10775 +
 4.10776 +  test -n "$ac_ct_AR" && break
 4.10777 +done
 4.10778 +
 4.10779 +  if test "x$ac_ct_AR" = x; then
 4.10780 +    AR=""
 4.10781 +  else
 4.10782 +    case $cross_compiling:$ac_tool_warned in
 4.10783 +yes:)
 4.10784 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 4.10785 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 4.10786 +ac_tool_warned=yes ;;
 4.10787 +esac
 4.10788 +    AR=$ac_ct_AR
 4.10789 +  fi
 4.10790 +fi
 4.10791 +
 4.10792 +    else
 4.10793 +      # If it succeeded, then it was overridden by the user. We will use it
 4.10794 +      # for the tool.
 4.10795 +
 4.10796 +      # First remove it from the list of overridden variables, so we can test
 4.10797 +      # for unknown variables in the end.
 4.10798 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.10799 +
 4.10800 +      # Check if the provided tool contains a complete path.
 4.10801 +      tool_specified="$AR"
 4.10802 +      tool_basename="${tool_specified##*/}"
 4.10803 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.10804 +        # A command without a complete path is provided, search $PATH.
 4.10805 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool AR=$tool_basename" >&5
 4.10806 +$as_echo "$as_me: Will search for user supplied tool AR=$tool_basename" >&6;}
 4.10807 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.10808 +set dummy $tool_basename; ac_word=$2
 4.10809 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10810 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10811 +if ${ac_cv_path_AR+:} false; then :
 4.10812 +  $as_echo_n "(cached) " >&6
 4.10813 +else
 4.10814 +  case $AR in
 4.10815 +  [\\/]* | ?:[\\/]*)
 4.10816 +  ac_cv_path_AR="$AR" # Let the user override the test with a path.
 4.10817 +  ;;
 4.10818 +  *)
 4.10819 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10820 +for as_dir in $PATH
 4.10821 +do
 4.10822 +  IFS=$as_save_IFS
 4.10823 +  test -z "$as_dir" && as_dir=.
 4.10824 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10825 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10826 +    ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
 4.10827 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10828 +    break 2
 4.10829 +  fi
 4.10830 +done
 4.10831 +  done
 4.10832 +IFS=$as_save_IFS
 4.10833 +
 4.10834 +  ;;
 4.10835 +esac
 4.10836 +fi
 4.10837 +AR=$ac_cv_path_AR
 4.10838 +if test -n "$AR"; then
 4.10839 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
 4.10840 +$as_echo "$AR" >&6; }
 4.10841 +else
 4.10842 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10843 +$as_echo "no" >&6; }
 4.10844 +fi
 4.10845 +
 4.10846 +
 4.10847 +        if test "x$AR" = x; then
 4.10848 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.10849 +        fi
 4.10850 +      else
 4.10851 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.10852 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool AR=$tool_specified" >&5
 4.10853 +$as_echo "$as_me: Will use user supplied tool AR=$tool_specified" >&6;}
 4.10854 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AR" >&5
 4.10855 +$as_echo_n "checking for AR... " >&6; }
 4.10856 +        if test ! -x "$tool_specified"; then
 4.10857 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.10858 +$as_echo "not found" >&6; }
 4.10859 +          as_fn_error $? "User supplied tool AR=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.10860 +        fi
 4.10861 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.10862 +$as_echo "$tool_specified" >&6; }
 4.10863 +      fi
 4.10864 +    fi
 4.10865 +  fi
 4.10866 +
 4.10867  
 4.10868  
 4.10869    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 4.10870 @@ -25724,8 +34490,17 @@
 4.10871  
 4.10872    # Find the right assembler.
 4.10873    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 4.10874 -    # Extract the first word of "as", so it can be a program name with args.
 4.10875 -set dummy as; ac_word=$2
 4.10876 +
 4.10877 +
 4.10878 +  # Publish this variable in the help.
 4.10879 +
 4.10880 +
 4.10881 +  if test "x$AS" = x; then
 4.10882 +    # The variable is not set by user, try to locate tool using the code snippet
 4.10883 +    for ac_prog in as
 4.10884 +do
 4.10885 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.10886 +set dummy $ac_prog; ac_word=$2
 4.10887  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10888  $as_echo_n "checking for $ac_word... " >&6; }
 4.10889  if ${ac_cv_path_AS+:} false; then :
 4.10890 @@ -25764,6 +34539,143 @@
 4.10891  fi
 4.10892  
 4.10893  
 4.10894 +  test -n "$AS" && break
 4.10895 +done
 4.10896 +
 4.10897 +  else
 4.10898 +    # The variable is set, but is it from the command line or the environment?
 4.10899 +
 4.10900 +    # Try to remove the string !AS! from our list.
 4.10901 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!AS!/}
 4.10902 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.10903 +      # If it failed, the variable was not from the command line. Ignore it,
 4.10904 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.10905 +      if test "xAS" != xBASH; then
 4.10906 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of AS from the environment. Use command line variables instead." >&5
 4.10907 +$as_echo "$as_me: WARNING: Ignoring value of AS from the environment. Use command line variables instead." >&2;}
 4.10908 +      fi
 4.10909 +      # Try to locate tool using the code snippet
 4.10910 +      for ac_prog in as
 4.10911 +do
 4.10912 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.10913 +set dummy $ac_prog; ac_word=$2
 4.10914 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10915 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10916 +if ${ac_cv_path_AS+:} false; then :
 4.10917 +  $as_echo_n "(cached) " >&6
 4.10918 +else
 4.10919 +  case $AS in
 4.10920 +  [\\/]* | ?:[\\/]*)
 4.10921 +  ac_cv_path_AS="$AS" # Let the user override the test with a path.
 4.10922 +  ;;
 4.10923 +  *)
 4.10924 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10925 +for as_dir in $PATH
 4.10926 +do
 4.10927 +  IFS=$as_save_IFS
 4.10928 +  test -z "$as_dir" && as_dir=.
 4.10929 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10930 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10931 +    ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext"
 4.10932 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10933 +    break 2
 4.10934 +  fi
 4.10935 +done
 4.10936 +  done
 4.10937 +IFS=$as_save_IFS
 4.10938 +
 4.10939 +  ;;
 4.10940 +esac
 4.10941 +fi
 4.10942 +AS=$ac_cv_path_AS
 4.10943 +if test -n "$AS"; then
 4.10944 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
 4.10945 +$as_echo "$AS" >&6; }
 4.10946 +else
 4.10947 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.10948 +$as_echo "no" >&6; }
 4.10949 +fi
 4.10950 +
 4.10951 +
 4.10952 +  test -n "$AS" && break
 4.10953 +done
 4.10954 +
 4.10955 +    else
 4.10956 +      # If it succeeded, then it was overridden by the user. We will use it
 4.10957 +      # for the tool.
 4.10958 +
 4.10959 +      # First remove it from the list of overridden variables, so we can test
 4.10960 +      # for unknown variables in the end.
 4.10961 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.10962 +
 4.10963 +      # Check if the provided tool contains a complete path.
 4.10964 +      tool_specified="$AS"
 4.10965 +      tool_basename="${tool_specified##*/}"
 4.10966 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.10967 +        # A command without a complete path is provided, search $PATH.
 4.10968 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool AS=$tool_basename" >&5
 4.10969 +$as_echo "$as_me: Will search for user supplied tool AS=$tool_basename" >&6;}
 4.10970 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.10971 +set dummy $tool_basename; ac_word=$2
 4.10972 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.10973 +$as_echo_n "checking for $ac_word... " >&6; }
 4.10974 +if ${ac_cv_path_AS+:} false; then :
 4.10975 +  $as_echo_n "(cached) " >&6
 4.10976 +else
 4.10977 +  case $AS in
 4.10978 +  [\\/]* | ?:[\\/]*)
 4.10979 +  ac_cv_path_AS="$AS" # Let the user override the test with a path.
 4.10980 +  ;;
 4.10981 +  *)
 4.10982 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.10983 +for as_dir in $PATH
 4.10984 +do
 4.10985 +  IFS=$as_save_IFS
 4.10986 +  test -z "$as_dir" && as_dir=.
 4.10987 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.10988 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.10989 +    ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext"
 4.10990 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.10991 +    break 2
 4.10992 +  fi
 4.10993 +done
 4.10994 +  done
 4.10995 +IFS=$as_save_IFS
 4.10996 +
 4.10997 +  ;;
 4.10998 +esac
 4.10999 +fi
 4.11000 +AS=$ac_cv_path_AS
 4.11001 +if test -n "$AS"; then
 4.11002 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
 4.11003 +$as_echo "$AS" >&6; }
 4.11004 +else
 4.11005 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11006 +$as_echo "no" >&6; }
 4.11007 +fi
 4.11008 +
 4.11009 +
 4.11010 +        if test "x$AS" = x; then
 4.11011 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.11012 +        fi
 4.11013 +      else
 4.11014 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.11015 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool AS=$tool_specified" >&5
 4.11016 +$as_echo "$as_me: Will use user supplied tool AS=$tool_specified" >&6;}
 4.11017 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AS" >&5
 4.11018 +$as_echo_n "checking for AS... " >&6; }
 4.11019 +        if test ! -x "$tool_specified"; then
 4.11020 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.11021 +$as_echo "not found" >&6; }
 4.11022 +          as_fn_error $? "User supplied tool AS=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.11023 +        fi
 4.11024 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.11025 +$as_echo "$tool_specified" >&6; }
 4.11026 +      fi
 4.11027 +    fi
 4.11028 +  fi
 4.11029 +
 4.11030 +
 4.11031  
 4.11032    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 4.11033  
 4.11034 @@ -26036,8 +34948,17 @@
 4.11035  
 4.11036  
 4.11037    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
 4.11038 -    # Extract the first word of "nm", so it can be a program name with args.
 4.11039 -set dummy nm; ac_word=$2
 4.11040 +
 4.11041 +
 4.11042 +  # Publish this variable in the help.
 4.11043 +
 4.11044 +
 4.11045 +  if test "x$NM" = x; then
 4.11046 +    # The variable is not set by user, try to locate tool using the code snippet
 4.11047 +    for ac_prog in nm
 4.11048 +do
 4.11049 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.11050 +set dummy $ac_prog; ac_word=$2
 4.11051  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11052  $as_echo_n "checking for $ac_word... " >&6; }
 4.11053  if ${ac_cv_path_NM+:} false; then :
 4.11054 @@ -26076,6 +34997,143 @@
 4.11055  fi
 4.11056  
 4.11057  
 4.11058 +  test -n "$NM" && break
 4.11059 +done
 4.11060 +
 4.11061 +  else
 4.11062 +    # The variable is set, but is it from the command line or the environment?
 4.11063 +
 4.11064 +    # Try to remove the string !NM! from our list.
 4.11065 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!NM!/}
 4.11066 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.11067 +      # If it failed, the variable was not from the command line. Ignore it,
 4.11068 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.11069 +      if test "xNM" != xBASH; then
 4.11070 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of NM from the environment. Use command line variables instead." >&5
 4.11071 +$as_echo "$as_me: WARNING: Ignoring value of NM from the environment. Use command line variables instead." >&2;}
 4.11072 +      fi
 4.11073 +      # Try to locate tool using the code snippet
 4.11074 +      for ac_prog in nm
 4.11075 +do
 4.11076 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.11077 +set dummy $ac_prog; ac_word=$2
 4.11078 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11079 +$as_echo_n "checking for $ac_word... " >&6; }
 4.11080 +if ${ac_cv_path_NM+:} false; then :
 4.11081 +  $as_echo_n "(cached) " >&6
 4.11082 +else
 4.11083 +  case $NM in
 4.11084 +  [\\/]* | ?:[\\/]*)
 4.11085 +  ac_cv_path_NM="$NM" # Let the user override the test with a path.
 4.11086 +  ;;
 4.11087 +  *)
 4.11088 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.11089 +for as_dir in $PATH
 4.11090 +do
 4.11091 +  IFS=$as_save_IFS
 4.11092 +  test -z "$as_dir" && as_dir=.
 4.11093 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.11094 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11095 +    ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
 4.11096 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11097 +    break 2
 4.11098 +  fi
 4.11099 +done
 4.11100 +  done
 4.11101 +IFS=$as_save_IFS
 4.11102 +
 4.11103 +  ;;
 4.11104 +esac
 4.11105 +fi
 4.11106 +NM=$ac_cv_path_NM
 4.11107 +if test -n "$NM"; then
 4.11108 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
 4.11109 +$as_echo "$NM" >&6; }
 4.11110 +else
 4.11111 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11112 +$as_echo "no" >&6; }
 4.11113 +fi
 4.11114 +
 4.11115 +
 4.11116 +  test -n "$NM" && break
 4.11117 +done
 4.11118 +
 4.11119 +    else
 4.11120 +      # If it succeeded, then it was overridden by the user. We will use it
 4.11121 +      # for the tool.
 4.11122 +
 4.11123 +      # First remove it from the list of overridden variables, so we can test
 4.11124 +      # for unknown variables in the end.
 4.11125 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.11126 +
 4.11127 +      # Check if the provided tool contains a complete path.
 4.11128 +      tool_specified="$NM"
 4.11129 +      tool_basename="${tool_specified##*/}"
 4.11130 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.11131 +        # A command without a complete path is provided, search $PATH.
 4.11132 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool NM=$tool_basename" >&5
 4.11133 +$as_echo "$as_me: Will search for user supplied tool NM=$tool_basename" >&6;}
 4.11134 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.11135 +set dummy $tool_basename; ac_word=$2
 4.11136 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11137 +$as_echo_n "checking for $ac_word... " >&6; }
 4.11138 +if ${ac_cv_path_NM+:} false; then :
 4.11139 +  $as_echo_n "(cached) " >&6
 4.11140 +else
 4.11141 +  case $NM in
 4.11142 +  [\\/]* | ?:[\\/]*)
 4.11143 +  ac_cv_path_NM="$NM" # Let the user override the test with a path.
 4.11144 +  ;;
 4.11145 +  *)
 4.11146 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.11147 +for as_dir in $PATH
 4.11148 +do
 4.11149 +  IFS=$as_save_IFS
 4.11150 +  test -z "$as_dir" && as_dir=.
 4.11151 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.11152 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11153 +    ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
 4.11154 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11155 +    break 2
 4.11156 +  fi
 4.11157 +done
 4.11158 +  done
 4.11159 +IFS=$as_save_IFS
 4.11160 +
 4.11161 +  ;;
 4.11162 +esac
 4.11163 +fi
 4.11164 +NM=$ac_cv_path_NM
 4.11165 +if test -n "$NM"; then
 4.11166 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
 4.11167 +$as_echo "$NM" >&6; }
 4.11168 +else
 4.11169 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11170 +$as_echo "no" >&6; }
 4.11171 +fi
 4.11172 +
 4.11173 +
 4.11174 +        if test "x$NM" = x; then
 4.11175 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.11176 +        fi
 4.11177 +      else
 4.11178 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.11179 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool NM=$tool_specified" >&5
 4.11180 +$as_echo "$as_me: Will use user supplied tool NM=$tool_specified" >&6;}
 4.11181 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NM" >&5
 4.11182 +$as_echo_n "checking for NM... " >&6; }
 4.11183 +        if test ! -x "$tool_specified"; then
 4.11184 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.11185 +$as_echo "not found" >&6; }
 4.11186 +          as_fn_error $? "User supplied tool NM=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.11187 +        fi
 4.11188 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.11189 +$as_echo "$tool_specified" >&6; }
 4.11190 +      fi
 4.11191 +    fi
 4.11192 +  fi
 4.11193 +
 4.11194 +
 4.11195  
 4.11196    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 4.11197  
 4.11198 @@ -26342,8 +35400,17 @@
 4.11199  $as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
 4.11200    fi
 4.11201  
 4.11202 -    # Extract the first word of "gnm", so it can be a program name with args.
 4.11203 -set dummy gnm; ac_word=$2
 4.11204 +
 4.11205 +
 4.11206 +  # Publish this variable in the help.
 4.11207 +
 4.11208 +
 4.11209 +  if test "x$GNM" = x; then
 4.11210 +    # The variable is not set by user, try to locate tool using the code snippet
 4.11211 +    for ac_prog in gnm
 4.11212 +do
 4.11213 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.11214 +set dummy $ac_prog; ac_word=$2
 4.11215  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11216  $as_echo_n "checking for $ac_word... " >&6; }
 4.11217  if ${ac_cv_path_GNM+:} false; then :
 4.11218 @@ -26382,6 +35449,143 @@
 4.11219  fi
 4.11220  
 4.11221  
 4.11222 +  test -n "$GNM" && break
 4.11223 +done
 4.11224 +
 4.11225 +  else
 4.11226 +    # The variable is set, but is it from the command line or the environment?
 4.11227 +
 4.11228 +    # Try to remove the string !GNM! from our list.
 4.11229 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!GNM!/}
 4.11230 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.11231 +      # If it failed, the variable was not from the command line. Ignore it,
 4.11232 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.11233 +      if test "xGNM" != xBASH; then
 4.11234 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of GNM from the environment. Use command line variables instead." >&5
 4.11235 +$as_echo "$as_me: WARNING: Ignoring value of GNM from the environment. Use command line variables instead." >&2;}
 4.11236 +      fi
 4.11237 +      # Try to locate tool using the code snippet
 4.11238 +      for ac_prog in gnm
 4.11239 +do
 4.11240 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.11241 +set dummy $ac_prog; ac_word=$2
 4.11242 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11243 +$as_echo_n "checking for $ac_word... " >&6; }
 4.11244 +if ${ac_cv_path_GNM+:} false; then :
 4.11245 +  $as_echo_n "(cached) " >&6
 4.11246 +else
 4.11247 +  case $GNM in
 4.11248 +  [\\/]* | ?:[\\/]*)
 4.11249 +  ac_cv_path_GNM="$GNM" # Let the user override the test with a path.
 4.11250 +  ;;
 4.11251 +  *)
 4.11252 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.11253 +for as_dir in $PATH
 4.11254 +do
 4.11255 +  IFS=$as_save_IFS
 4.11256 +  test -z "$as_dir" && as_dir=.
 4.11257 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.11258 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11259 +    ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext"
 4.11260 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11261 +    break 2
 4.11262 +  fi
 4.11263 +done
 4.11264 +  done
 4.11265 +IFS=$as_save_IFS
 4.11266 +
 4.11267 +  ;;
 4.11268 +esac
 4.11269 +fi
 4.11270 +GNM=$ac_cv_path_GNM
 4.11271 +if test -n "$GNM"; then
 4.11272 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNM" >&5
 4.11273 +$as_echo "$GNM" >&6; }
 4.11274 +else
 4.11275 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11276 +$as_echo "no" >&6; }
 4.11277 +fi
 4.11278 +
 4.11279 +
 4.11280 +  test -n "$GNM" && break
 4.11281 +done
 4.11282 +
 4.11283 +    else
 4.11284 +      # If it succeeded, then it was overridden by the user. We will use it
 4.11285 +      # for the tool.
 4.11286 +
 4.11287 +      # First remove it from the list of overridden variables, so we can test
 4.11288 +      # for unknown variables in the end.
 4.11289 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.11290 +
 4.11291 +      # Check if the provided tool contains a complete path.
 4.11292 +      tool_specified="$GNM"
 4.11293 +      tool_basename="${tool_specified##*/}"
 4.11294 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.11295 +        # A command without a complete path is provided, search $PATH.
 4.11296 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool GNM=$tool_basename" >&5
 4.11297 +$as_echo "$as_me: Will search for user supplied tool GNM=$tool_basename" >&6;}
 4.11298 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.11299 +set dummy $tool_basename; ac_word=$2
 4.11300 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11301 +$as_echo_n "checking for $ac_word... " >&6; }
 4.11302 +if ${ac_cv_path_GNM+:} false; then :
 4.11303 +  $as_echo_n "(cached) " >&6
 4.11304 +else
 4.11305 +  case $GNM in
 4.11306 +  [\\/]* | ?:[\\/]*)
 4.11307 +  ac_cv_path_GNM="$GNM" # Let the user override the test with a path.
 4.11308 +  ;;
 4.11309 +  *)
 4.11310 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.11311 +for as_dir in $PATH
 4.11312 +do
 4.11313 +  IFS=$as_save_IFS
 4.11314 +  test -z "$as_dir" && as_dir=.
 4.11315 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.11316 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11317 +    ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext"
 4.11318 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11319 +    break 2
 4.11320 +  fi
 4.11321 +done
 4.11322 +  done
 4.11323 +IFS=$as_save_IFS
 4.11324 +
 4.11325 +  ;;
 4.11326 +esac
 4.11327 +fi
 4.11328 +GNM=$ac_cv_path_GNM
 4.11329 +if test -n "$GNM"; then
 4.11330 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNM" >&5
 4.11331 +$as_echo "$GNM" >&6; }
 4.11332 +else
 4.11333 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11334 +$as_echo "no" >&6; }
 4.11335 +fi
 4.11336 +
 4.11337 +
 4.11338 +        if test "x$GNM" = x; then
 4.11339 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.11340 +        fi
 4.11341 +      else
 4.11342 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.11343 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool GNM=$tool_specified" >&5
 4.11344 +$as_echo "$as_me: Will use user supplied tool GNM=$tool_specified" >&6;}
 4.11345 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNM" >&5
 4.11346 +$as_echo_n "checking for GNM... " >&6; }
 4.11347 +        if test ! -x "$tool_specified"; then
 4.11348 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.11349 +$as_echo "not found" >&6; }
 4.11350 +          as_fn_error $? "User supplied tool GNM=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.11351 +        fi
 4.11352 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.11353 +$as_echo "$tool_specified" >&6; }
 4.11354 +      fi
 4.11355 +    fi
 4.11356 +  fi
 4.11357 +
 4.11358 +
 4.11359  
 4.11360    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 4.11361  
 4.11362 @@ -26648,8 +35852,17 @@
 4.11363  $as_echo "$as_me: Rewriting GNM to \"$new_complete\"" >&6;}
 4.11364    fi
 4.11365  
 4.11366 -    # Extract the first word of "strip", so it can be a program name with args.
 4.11367 -set dummy strip; ac_word=$2
 4.11368 +
 4.11369 +
 4.11370 +  # Publish this variable in the help.
 4.11371 +
 4.11372 +
 4.11373 +  if test "x$STRIP" = x; then
 4.11374 +    # The variable is not set by user, try to locate tool using the code snippet
 4.11375 +    for ac_prog in strip
 4.11376 +do
 4.11377 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.11378 +set dummy $ac_prog; ac_word=$2
 4.11379  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11380  $as_echo_n "checking for $ac_word... " >&6; }
 4.11381  if ${ac_cv_path_STRIP+:} false; then :
 4.11382 @@ -26688,6 +35901,143 @@
 4.11383  fi
 4.11384  
 4.11385  
 4.11386 +  test -n "$STRIP" && break
 4.11387 +done
 4.11388 +
 4.11389 +  else
 4.11390 +    # The variable is set, but is it from the command line or the environment?
 4.11391 +
 4.11392 +    # Try to remove the string !STRIP! from our list.
 4.11393 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!STRIP!/}
 4.11394 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.11395 +      # If it failed, the variable was not from the command line. Ignore it,
 4.11396 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.11397 +      if test "xSTRIP" != xBASH; then
 4.11398 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&5
 4.11399 +$as_echo "$as_me: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&2;}
 4.11400 +      fi
 4.11401 +      # Try to locate tool using the code snippet
 4.11402 +      for ac_prog in strip
 4.11403 +do
 4.11404 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.11405 +set dummy $ac_prog; ac_word=$2
 4.11406 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11407 +$as_echo_n "checking for $ac_word... " >&6; }
 4.11408 +if ${ac_cv_path_STRIP+:} false; then :
 4.11409 +  $as_echo_n "(cached) " >&6
 4.11410 +else
 4.11411 +  case $STRIP in
 4.11412 +  [\\/]* | ?:[\\/]*)
 4.11413 +  ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
 4.11414 +  ;;
 4.11415 +  *)
 4.11416 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.11417 +for as_dir in $PATH
 4.11418 +do
 4.11419 +  IFS=$as_save_IFS
 4.11420 +  test -z "$as_dir" && as_dir=.
 4.11421 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.11422 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11423 +    ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
 4.11424 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11425 +    break 2
 4.11426 +  fi
 4.11427 +done
 4.11428 +  done
 4.11429 +IFS=$as_save_IFS
 4.11430 +
 4.11431 +  ;;
 4.11432 +esac
 4.11433 +fi
 4.11434 +STRIP=$ac_cv_path_STRIP
 4.11435 +if test -n "$STRIP"; then
 4.11436 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 4.11437 +$as_echo "$STRIP" >&6; }
 4.11438 +else
 4.11439 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11440 +$as_echo "no" >&6; }
 4.11441 +fi
 4.11442 +
 4.11443 +
 4.11444 +  test -n "$STRIP" && break
 4.11445 +done
 4.11446 +
 4.11447 +    else
 4.11448 +      # If it succeeded, then it was overridden by the user. We will use it
 4.11449 +      # for the tool.
 4.11450 +
 4.11451 +      # First remove it from the list of overridden variables, so we can test
 4.11452 +      # for unknown variables in the end.
 4.11453 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.11454 +
 4.11455 +      # Check if the provided tool contains a complete path.
 4.11456 +      tool_specified="$STRIP"
 4.11457 +      tool_basename="${tool_specified##*/}"
 4.11458 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.11459 +        # A command without a complete path is provided, search $PATH.
 4.11460 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool STRIP=$tool_basename" >&5
 4.11461 +$as_echo "$as_me: Will search for user supplied tool STRIP=$tool_basename" >&6;}
 4.11462 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.11463 +set dummy $tool_basename; ac_word=$2
 4.11464 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11465 +$as_echo_n "checking for $ac_word... " >&6; }
 4.11466 +if ${ac_cv_path_STRIP+:} false; then :
 4.11467 +  $as_echo_n "(cached) " >&6
 4.11468 +else
 4.11469 +  case $STRIP in
 4.11470 +  [\\/]* | ?:[\\/]*)
 4.11471 +  ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
 4.11472 +  ;;
 4.11473 +  *)
 4.11474 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.11475 +for as_dir in $PATH
 4.11476 +do
 4.11477 +  IFS=$as_save_IFS
 4.11478 +  test -z "$as_dir" && as_dir=.
 4.11479 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.11480 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11481 +    ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
 4.11482 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11483 +    break 2
 4.11484 +  fi
 4.11485 +done
 4.11486 +  done
 4.11487 +IFS=$as_save_IFS
 4.11488 +
 4.11489 +  ;;
 4.11490 +esac
 4.11491 +fi
 4.11492 +STRIP=$ac_cv_path_STRIP
 4.11493 +if test -n "$STRIP"; then
 4.11494 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 4.11495 +$as_echo "$STRIP" >&6; }
 4.11496 +else
 4.11497 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11498 +$as_echo "no" >&6; }
 4.11499 +fi
 4.11500 +
 4.11501 +
 4.11502 +        if test "x$STRIP" = x; then
 4.11503 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.11504 +        fi
 4.11505 +      else
 4.11506 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.11507 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool STRIP=$tool_specified" >&5
 4.11508 +$as_echo "$as_me: Will use user supplied tool STRIP=$tool_specified" >&6;}
 4.11509 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STRIP" >&5
 4.11510 +$as_echo_n "checking for STRIP... " >&6; }
 4.11511 +        if test ! -x "$tool_specified"; then
 4.11512 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.11513 +$as_echo "not found" >&6; }
 4.11514 +          as_fn_error $? "User supplied tool STRIP=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.11515 +        fi
 4.11516 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.11517 +$as_echo "$tool_specified" >&6; }
 4.11518 +      fi
 4.11519 +    fi
 4.11520 +  fi
 4.11521 +
 4.11522 +
 4.11523  
 4.11524    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 4.11525  
 4.11526 @@ -26954,8 +36304,17 @@
 4.11527  $as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
 4.11528    fi
 4.11529  
 4.11530 -    # Extract the first word of "mcs", so it can be a program name with args.
 4.11531 -set dummy mcs; ac_word=$2
 4.11532 +
 4.11533 +
 4.11534 +  # Publish this variable in the help.
 4.11535 +
 4.11536 +
 4.11537 +  if test "x$MCS" = x; then
 4.11538 +    # The variable is not set by user, try to locate tool using the code snippet
 4.11539 +    for ac_prog in mcs
 4.11540 +do
 4.11541 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.11542 +set dummy $ac_prog; ac_word=$2
 4.11543  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11544  $as_echo_n "checking for $ac_word... " >&6; }
 4.11545  if ${ac_cv_path_MCS+:} false; then :
 4.11546 @@ -26994,6 +36353,143 @@
 4.11547  fi
 4.11548  
 4.11549  
 4.11550 +  test -n "$MCS" && break
 4.11551 +done
 4.11552 +
 4.11553 +  else
 4.11554 +    # The variable is set, but is it from the command line or the environment?
 4.11555 +
 4.11556 +    # Try to remove the string !MCS! from our list.
 4.11557 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!MCS!/}
 4.11558 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.11559 +      # If it failed, the variable was not from the command line. Ignore it,
 4.11560 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.11561 +      if test "xMCS" != xBASH; then
 4.11562 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of MCS from the environment. Use command line variables instead." >&5
 4.11563 +$as_echo "$as_me: WARNING: Ignoring value of MCS from the environment. Use command line variables instead." >&2;}
 4.11564 +      fi
 4.11565 +      # Try to locate tool using the code snippet
 4.11566 +      for ac_prog in mcs
 4.11567 +do
 4.11568 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.11569 +set dummy $ac_prog; ac_word=$2
 4.11570 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11571 +$as_echo_n "checking for $ac_word... " >&6; }
 4.11572 +if ${ac_cv_path_MCS+:} false; then :
 4.11573 +  $as_echo_n "(cached) " >&6
 4.11574 +else
 4.11575 +  case $MCS in
 4.11576 +  [\\/]* | ?:[\\/]*)
 4.11577 +  ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
 4.11578 +  ;;
 4.11579 +  *)
 4.11580 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.11581 +for as_dir in $PATH
 4.11582 +do
 4.11583 +  IFS=$as_save_IFS
 4.11584 +  test -z "$as_dir" && as_dir=.
 4.11585 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.11586 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11587 +    ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
 4.11588 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11589 +    break 2
 4.11590 +  fi
 4.11591 +done
 4.11592 +  done
 4.11593 +IFS=$as_save_IFS
 4.11594 +
 4.11595 +  ;;
 4.11596 +esac
 4.11597 +fi
 4.11598 +MCS=$ac_cv_path_MCS
 4.11599 +if test -n "$MCS"; then
 4.11600 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
 4.11601 +$as_echo "$MCS" >&6; }
 4.11602 +else
 4.11603 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11604 +$as_echo "no" >&6; }
 4.11605 +fi
 4.11606 +
 4.11607 +
 4.11608 +  test -n "$MCS" && break
 4.11609 +done
 4.11610 +
 4.11611 +    else
 4.11612 +      # If it succeeded, then it was overridden by the user. We will use it
 4.11613 +      # for the tool.
 4.11614 +
 4.11615 +      # First remove it from the list of overridden variables, so we can test
 4.11616 +      # for unknown variables in the end.
 4.11617 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.11618 +
 4.11619 +      # Check if the provided tool contains a complete path.
 4.11620 +      tool_specified="$MCS"
 4.11621 +      tool_basename="${tool_specified##*/}"
 4.11622 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.11623 +        # A command without a complete path is provided, search $PATH.
 4.11624 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool MCS=$tool_basename" >&5
 4.11625 +$as_echo "$as_me: Will search for user supplied tool MCS=$tool_basename" >&6;}
 4.11626 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.11627 +set dummy $tool_basename; ac_word=$2
 4.11628 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11629 +$as_echo_n "checking for $ac_word... " >&6; }
 4.11630 +if ${ac_cv_path_MCS+:} false; then :
 4.11631 +  $as_echo_n "(cached) " >&6
 4.11632 +else
 4.11633 +  case $MCS in
 4.11634 +  [\\/]* | ?:[\\/]*)
 4.11635 +  ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
 4.11636 +  ;;
 4.11637 +  *)
 4.11638 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.11639 +for as_dir in $PATH
 4.11640 +do
 4.11641 +  IFS=$as_save_IFS
 4.11642 +  test -z "$as_dir" && as_dir=.
 4.11643 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.11644 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11645 +    ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
 4.11646 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11647 +    break 2
 4.11648 +  fi
 4.11649 +done
 4.11650 +  done
 4.11651 +IFS=$as_save_IFS
 4.11652 +
 4.11653 +  ;;
 4.11654 +esac
 4.11655 +fi
 4.11656 +MCS=$ac_cv_path_MCS
 4.11657 +if test -n "$MCS"; then
 4.11658 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
 4.11659 +$as_echo "$MCS" >&6; }
 4.11660 +else
 4.11661 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11662 +$as_echo "no" >&6; }
 4.11663 +fi
 4.11664 +
 4.11665 +
 4.11666 +        if test "x$MCS" = x; then
 4.11667 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.11668 +        fi
 4.11669 +      else
 4.11670 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.11671 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool MCS=$tool_specified" >&5
 4.11672 +$as_echo "$as_me: Will use user supplied tool MCS=$tool_specified" >&6;}
 4.11673 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MCS" >&5
 4.11674 +$as_echo_n "checking for MCS... " >&6; }
 4.11675 +        if test ! -x "$tool_specified"; then
 4.11676 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.11677 +$as_echo "not found" >&6; }
 4.11678 +          as_fn_error $? "User supplied tool MCS=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.11679 +        fi
 4.11680 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.11681 +$as_echo "$tool_specified" >&6; }
 4.11682 +      fi
 4.11683 +    fi
 4.11684 +  fi
 4.11685 +
 4.11686 +
 4.11687  
 4.11688    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 4.11689  
 4.11690 @@ -27304,9 +36800,18 @@
 4.11691      if test "x$OTOOL" = "x"; then
 4.11692        OTOOL="true"
 4.11693      fi
 4.11694 +
 4.11695 +
 4.11696 +  # Publish this variable in the help.
 4.11697 +
 4.11698 +
 4.11699 +  if test "x$NM" = x; then
 4.11700 +    # The variable is not set by user, try to locate tool using the code snippet
 4.11701      if test -n "$ac_tool_prefix"; then
 4.11702 -  # Extract the first word of "${ac_tool_prefix}nm", so it can be a program name with args.
 4.11703 -set dummy ${ac_tool_prefix}nm; ac_word=$2
 4.11704 +  for ac_prog in nm
 4.11705 +  do
 4.11706 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 4.11707 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 4.11708  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11709  $as_echo_n "checking for $ac_word... " >&6; }
 4.11710  if ${ac_cv_prog_NM+:} false; then :
 4.11711 @@ -27322,7 +36827,7 @@
 4.11712    test -z "$as_dir" && as_dir=.
 4.11713      for ac_exec_ext in '' $ac_executable_extensions; do
 4.11714    if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11715 -    ac_cv_prog_NM="${ac_tool_prefix}nm"
 4.11716 +    ac_cv_prog_NM="$ac_tool_prefix$ac_prog"
 4.11717      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11718      break 2
 4.11719    fi
 4.11720 @@ -27342,11 +36847,15 @@
 4.11721  fi
 4.11722  
 4.11723  
 4.11724 -fi
 4.11725 -if test -z "$ac_cv_prog_NM"; then
 4.11726 +    test -n "$NM" && break
 4.11727 +  done
 4.11728 +fi
 4.11729 +if test -z "$NM"; then
 4.11730    ac_ct_NM=$NM
 4.11731 -  # Extract the first word of "nm", so it can be a program name with args.
 4.11732 -set dummy nm; ac_word=$2
 4.11733 +  for ac_prog in nm
 4.11734 +do
 4.11735 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.11736 +set dummy $ac_prog; ac_word=$2
 4.11737  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11738  $as_echo_n "checking for $ac_word... " >&6; }
 4.11739  if ${ac_cv_prog_ac_ct_NM+:} false; then :
 4.11740 @@ -27362,7 +36871,7 @@
 4.11741    test -z "$as_dir" && as_dir=.
 4.11742      for ac_exec_ext in '' $ac_executable_extensions; do
 4.11743    if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11744 -    ac_cv_prog_ac_ct_NM="nm"
 4.11745 +    ac_cv_prog_ac_ct_NM="$ac_prog"
 4.11746      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11747      break 2
 4.11748    fi
 4.11749 @@ -27381,6 +36890,10 @@
 4.11750  $as_echo "no" >&6; }
 4.11751  fi
 4.11752  
 4.11753 +
 4.11754 +  test -n "$ac_ct_NM" && break
 4.11755 +done
 4.11756 +
 4.11757    if test "x$ac_ct_NM" = x; then
 4.11758      NM=""
 4.11759    else
 4.11760 @@ -27392,9 +36905,196 @@
 4.11761  esac
 4.11762      NM=$ac_ct_NM
 4.11763    fi
 4.11764 -else
 4.11765 -  NM="$ac_cv_prog_NM"
 4.11766 -fi
 4.11767 +fi
 4.11768 +
 4.11769 +  else
 4.11770 +    # The variable is set, but is it from the command line or the environment?
 4.11771 +
 4.11772 +    # Try to remove the string !NM! from our list.
 4.11773 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!NM!/}
 4.11774 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.11775 +      # If it failed, the variable was not from the command line. Ignore it,
 4.11776 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.11777 +      if test "xNM" != xBASH; then
 4.11778 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of NM from the environment. Use command line variables instead." >&5
 4.11779 +$as_echo "$as_me: WARNING: Ignoring value of NM from the environment. Use command line variables instead." >&2;}
 4.11780 +      fi
 4.11781 +      # Try to locate tool using the code snippet
 4.11782 +      if test -n "$ac_tool_prefix"; then
 4.11783 +  for ac_prog in nm
 4.11784 +  do
 4.11785 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 4.11786 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 4.11787 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11788 +$as_echo_n "checking for $ac_word... " >&6; }
 4.11789 +if ${ac_cv_prog_NM+:} false; then :
 4.11790 +  $as_echo_n "(cached) " >&6
 4.11791 +else
 4.11792 +  if test -n "$NM"; then
 4.11793 +  ac_cv_prog_NM="$NM" # Let the user override the test.
 4.11794 +else
 4.11795 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.11796 +for as_dir in $PATH
 4.11797 +do
 4.11798 +  IFS=$as_save_IFS
 4.11799 +  test -z "$as_dir" && as_dir=.
 4.11800 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.11801 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11802 +    ac_cv_prog_NM="$ac_tool_prefix$ac_prog"
 4.11803 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11804 +    break 2
 4.11805 +  fi
 4.11806 +done
 4.11807 +  done
 4.11808 +IFS=$as_save_IFS
 4.11809 +
 4.11810 +fi
 4.11811 +fi
 4.11812 +NM=$ac_cv_prog_NM
 4.11813 +if test -n "$NM"; then
 4.11814 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
 4.11815 +$as_echo "$NM" >&6; }
 4.11816 +else
 4.11817 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11818 +$as_echo "no" >&6; }
 4.11819 +fi
 4.11820 +
 4.11821 +
 4.11822 +    test -n "$NM" && break
 4.11823 +  done
 4.11824 +fi
 4.11825 +if test -z "$NM"; then
 4.11826 +  ac_ct_NM=$NM
 4.11827 +  for ac_prog in nm
 4.11828 +do
 4.11829 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.11830 +set dummy $ac_prog; ac_word=$2
 4.11831 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11832 +$as_echo_n "checking for $ac_word... " >&6; }
 4.11833 +if ${ac_cv_prog_ac_ct_NM+:} false; then :
 4.11834 +  $as_echo_n "(cached) " >&6
 4.11835 +else
 4.11836 +  if test -n "$ac_ct_NM"; then
 4.11837 +  ac_cv_prog_ac_ct_NM="$ac_ct_NM" # Let the user override the test.
 4.11838 +else
 4.11839 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.11840 +for as_dir in $PATH
 4.11841 +do
 4.11842 +  IFS=$as_save_IFS
 4.11843 +  test -z "$as_dir" && as_dir=.
 4.11844 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.11845 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11846 +    ac_cv_prog_ac_ct_NM="$ac_prog"
 4.11847 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11848 +    break 2
 4.11849 +  fi
 4.11850 +done
 4.11851 +  done
 4.11852 +IFS=$as_save_IFS
 4.11853 +
 4.11854 +fi
 4.11855 +fi
 4.11856 +ac_ct_NM=$ac_cv_prog_ac_ct_NM
 4.11857 +if test -n "$ac_ct_NM"; then
 4.11858 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NM" >&5
 4.11859 +$as_echo "$ac_ct_NM" >&6; }
 4.11860 +else
 4.11861 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11862 +$as_echo "no" >&6; }
 4.11863 +fi
 4.11864 +
 4.11865 +
 4.11866 +  test -n "$ac_ct_NM" && break
 4.11867 +done
 4.11868 +
 4.11869 +  if test "x$ac_ct_NM" = x; then
 4.11870 +    NM=""
 4.11871 +  else
 4.11872 +    case $cross_compiling:$ac_tool_warned in
 4.11873 +yes:)
 4.11874 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 4.11875 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 4.11876 +ac_tool_warned=yes ;;
 4.11877 +esac
 4.11878 +    NM=$ac_ct_NM
 4.11879 +  fi
 4.11880 +fi
 4.11881 +
 4.11882 +    else
 4.11883 +      # If it succeeded, then it was overridden by the user. We will use it
 4.11884 +      # for the tool.
 4.11885 +
 4.11886 +      # First remove it from the list of overridden variables, so we can test
 4.11887 +      # for unknown variables in the end.
 4.11888 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.11889 +
 4.11890 +      # Check if the provided tool contains a complete path.
 4.11891 +      tool_specified="$NM"
 4.11892 +      tool_basename="${tool_specified##*/}"
 4.11893 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.11894 +        # A command without a complete path is provided, search $PATH.
 4.11895 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool NM=$tool_basename" >&5
 4.11896 +$as_echo "$as_me: Will search for user supplied tool NM=$tool_basename" >&6;}
 4.11897 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.11898 +set dummy $tool_basename; ac_word=$2
 4.11899 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11900 +$as_echo_n "checking for $ac_word... " >&6; }
 4.11901 +if ${ac_cv_path_NM+:} false; then :
 4.11902 +  $as_echo_n "(cached) " >&6
 4.11903 +else
 4.11904 +  case $NM in
 4.11905 +  [\\/]* | ?:[\\/]*)
 4.11906 +  ac_cv_path_NM="$NM" # Let the user override the test with a path.
 4.11907 +  ;;
 4.11908 +  *)
 4.11909 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.11910 +for as_dir in $PATH
 4.11911 +do
 4.11912 +  IFS=$as_save_IFS
 4.11913 +  test -z "$as_dir" && as_dir=.
 4.11914 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.11915 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11916 +    ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
 4.11917 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11918 +    break 2
 4.11919 +  fi
 4.11920 +done
 4.11921 +  done
 4.11922 +IFS=$as_save_IFS
 4.11923 +
 4.11924 +  ;;
 4.11925 +esac
 4.11926 +fi
 4.11927 +NM=$ac_cv_path_NM
 4.11928 +if test -n "$NM"; then
 4.11929 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NM" >&5
 4.11930 +$as_echo "$NM" >&6; }
 4.11931 +else
 4.11932 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.11933 +$as_echo "no" >&6; }
 4.11934 +fi
 4.11935 +
 4.11936 +
 4.11937 +        if test "x$NM" = x; then
 4.11938 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.11939 +        fi
 4.11940 +      else
 4.11941 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.11942 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool NM=$tool_specified" >&5
 4.11943 +$as_echo "$as_me: Will use user supplied tool NM=$tool_specified" >&6;}
 4.11944 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NM" >&5
 4.11945 +$as_echo_n "checking for NM... " >&6; }
 4.11946 +        if test ! -x "$tool_specified"; then
 4.11947 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.11948 +$as_echo "not found" >&6; }
 4.11949 +          as_fn_error $? "User supplied tool NM=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.11950 +        fi
 4.11951 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.11952 +$as_echo "$tool_specified" >&6; }
 4.11953 +      fi
 4.11954 +    fi
 4.11955 +  fi
 4.11956 +
 4.11957  
 4.11958  
 4.11959    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 4.11960 @@ -27664,9 +37364,18 @@
 4.11961  
 4.11962      GNM="$NM"
 4.11963  
 4.11964 +
 4.11965 +
 4.11966 +  # Publish this variable in the help.
 4.11967 +
 4.11968 +
 4.11969 +  if test "x$STRIP" = x; then
 4.11970 +    # The variable is not set by user, try to locate tool using the code snippet
 4.11971      if test -n "$ac_tool_prefix"; then
 4.11972 -  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 4.11973 -set dummy ${ac_tool_prefix}strip; ac_word=$2
 4.11974 +  for ac_prog in strip
 4.11975 +  do
 4.11976 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 4.11977 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 4.11978  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.11979  $as_echo_n "checking for $ac_word... " >&6; }
 4.11980  if ${ac_cv_prog_STRIP+:} false; then :
 4.11981 @@ -27682,7 +37391,7 @@
 4.11982    test -z "$as_dir" && as_dir=.
 4.11983      for ac_exec_ext in '' $ac_executable_extensions; do
 4.11984    if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.11985 -    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 4.11986 +    ac_cv_prog_STRIP="$ac_tool_prefix$ac_prog"
 4.11987      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.11988      break 2
 4.11989    fi
 4.11990 @@ -27702,11 +37411,15 @@
 4.11991  fi
 4.11992  
 4.11993  
 4.11994 -fi
 4.11995 -if test -z "$ac_cv_prog_STRIP"; then
 4.11996 +    test -n "$STRIP" && break
 4.11997 +  done
 4.11998 +fi
 4.11999 +if test -z "$STRIP"; then
 4.12000    ac_ct_STRIP=$STRIP
 4.12001 -  # Extract the first word of "strip", so it can be a program name with args.
 4.12002 -set dummy strip; ac_word=$2
 4.12003 +  for ac_prog in strip
 4.12004 +do
 4.12005 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.12006 +set dummy $ac_prog; ac_word=$2
 4.12007  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12008  $as_echo_n "checking for $ac_word... " >&6; }
 4.12009  if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
 4.12010 @@ -27722,7 +37435,7 @@
 4.12011    test -z "$as_dir" && as_dir=.
 4.12012      for ac_exec_ext in '' $ac_executable_extensions; do
 4.12013    if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12014 -    ac_cv_prog_ac_ct_STRIP="strip"
 4.12015 +    ac_cv_prog_ac_ct_STRIP="$ac_prog"
 4.12016      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12017      break 2
 4.12018    fi
 4.12019 @@ -27741,6 +37454,10 @@
 4.12020  $as_echo "no" >&6; }
 4.12021  fi
 4.12022  
 4.12023 +
 4.12024 +  test -n "$ac_ct_STRIP" && break
 4.12025 +done
 4.12026 +
 4.12027    if test "x$ac_ct_STRIP" = x; then
 4.12028      STRIP=""
 4.12029    else
 4.12030 @@ -27752,9 +37469,196 @@
 4.12031  esac
 4.12032      STRIP=$ac_ct_STRIP
 4.12033    fi
 4.12034 -else
 4.12035 -  STRIP="$ac_cv_prog_STRIP"
 4.12036 -fi
 4.12037 +fi
 4.12038 +
 4.12039 +  else
 4.12040 +    # The variable is set, but is it from the command line or the environment?
 4.12041 +
 4.12042 +    # Try to remove the string !STRIP! from our list.
 4.12043 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!STRIP!/}
 4.12044 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.12045 +      # If it failed, the variable was not from the command line. Ignore it,
 4.12046 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.12047 +      if test "xSTRIP" != xBASH; then
 4.12048 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&5
 4.12049 +$as_echo "$as_me: WARNING: Ignoring value of STRIP from the environment. Use command line variables instead." >&2;}
 4.12050 +      fi
 4.12051 +      # Try to locate tool using the code snippet
 4.12052 +      if test -n "$ac_tool_prefix"; then
 4.12053 +  for ac_prog in strip
 4.12054 +  do
 4.12055 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 4.12056 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 4.12057 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12058 +$as_echo_n "checking for $ac_word... " >&6; }
 4.12059 +if ${ac_cv_prog_STRIP+:} false; then :
 4.12060 +  $as_echo_n "(cached) " >&6
 4.12061 +else
 4.12062 +  if test -n "$STRIP"; then
 4.12063 +  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 4.12064 +else
 4.12065 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.12066 +for as_dir in $PATH
 4.12067 +do
 4.12068 +  IFS=$as_save_IFS
 4.12069 +  test -z "$as_dir" && as_dir=.
 4.12070 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.12071 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12072 +    ac_cv_prog_STRIP="$ac_tool_prefix$ac_prog"
 4.12073 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12074 +    break 2
 4.12075 +  fi
 4.12076 +done
 4.12077 +  done
 4.12078 +IFS=$as_save_IFS
 4.12079 +
 4.12080 +fi
 4.12081 +fi
 4.12082 +STRIP=$ac_cv_prog_STRIP
 4.12083 +if test -n "$STRIP"; then
 4.12084 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 4.12085 +$as_echo "$STRIP" >&6; }
 4.12086 +else
 4.12087 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.12088 +$as_echo "no" >&6; }
 4.12089 +fi
 4.12090 +
 4.12091 +
 4.12092 +    test -n "$STRIP" && break
 4.12093 +  done
 4.12094 +fi
 4.12095 +if test -z "$STRIP"; then
 4.12096 +  ac_ct_STRIP=$STRIP
 4.12097 +  for ac_prog in strip
 4.12098 +do
 4.12099 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.12100 +set dummy $ac_prog; ac_word=$2
 4.12101 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12102 +$as_echo_n "checking for $ac_word... " >&6; }
 4.12103 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
 4.12104 +  $as_echo_n "(cached) " >&6
 4.12105 +else
 4.12106 +  if test -n "$ac_ct_STRIP"; then
 4.12107 +  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 4.12108 +else
 4.12109 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.12110 +for as_dir in $PATH
 4.12111 +do
 4.12112 +  IFS=$as_save_IFS
 4.12113 +  test -z "$as_dir" && as_dir=.
 4.12114 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.12115 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12116 +    ac_cv_prog_ac_ct_STRIP="$ac_prog"
 4.12117 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12118 +    break 2
 4.12119 +  fi
 4.12120 +done
 4.12121 +  done
 4.12122 +IFS=$as_save_IFS
 4.12123 +
 4.12124 +fi
 4.12125 +fi
 4.12126 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 4.12127 +if test -n "$ac_ct_STRIP"; then
 4.12128 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 4.12129 +$as_echo "$ac_ct_STRIP" >&6; }
 4.12130 +else
 4.12131 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.12132 +$as_echo "no" >&6; }
 4.12133 +fi
 4.12134 +
 4.12135 +
 4.12136 +  test -n "$ac_ct_STRIP" && break
 4.12137 +done
 4.12138 +
 4.12139 +  if test "x$ac_ct_STRIP" = x; then
 4.12140 +    STRIP=""
 4.12141 +  else
 4.12142 +    case $cross_compiling:$ac_tool_warned in
 4.12143 +yes:)
 4.12144 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 4.12145 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 4.12146 +ac_tool_warned=yes ;;
 4.12147 +esac
 4.12148 +    STRIP=$ac_ct_STRIP
 4.12149 +  fi
 4.12150 +fi
 4.12151 +
 4.12152 +    else
 4.12153 +      # If it succeeded, then it was overridden by the user. We will use it
 4.12154 +      # for the tool.
 4.12155 +
 4.12156 +      # First remove it from the list of overridden variables, so we can test
 4.12157 +      # for unknown variables in the end.
 4.12158 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.12159 +
 4.12160 +      # Check if the provided tool contains a complete path.
 4.12161 +      tool_specified="$STRIP"
 4.12162 +      tool_basename="${tool_specified##*/}"
 4.12163 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.12164 +        # A command without a complete path is provided, search $PATH.
 4.12165 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool STRIP=$tool_basename" >&5
 4.12166 +$as_echo "$as_me: Will search for user supplied tool STRIP=$tool_basename" >&6;}
 4.12167 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.12168 +set dummy $tool_basename; ac_word=$2
 4.12169 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12170 +$as_echo_n "checking for $ac_word... " >&6; }
 4.12171 +if ${ac_cv_path_STRIP+:} false; then :
 4.12172 +  $as_echo_n "(cached) " >&6
 4.12173 +else
 4.12174 +  case $STRIP in
 4.12175 +  [\\/]* | ?:[\\/]*)
 4.12176 +  ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path.
 4.12177 +  ;;
 4.12178 +  *)
 4.12179 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.12180 +for as_dir in $PATH
 4.12181 +do
 4.12182 +  IFS=$as_save_IFS
 4.12183 +  test -z "$as_dir" && as_dir=.
 4.12184 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.12185 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12186 +    ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
 4.12187 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12188 +    break 2
 4.12189 +  fi
 4.12190 +done
 4.12191 +  done
 4.12192 +IFS=$as_save_IFS
 4.12193 +
 4.12194 +  ;;
 4.12195 +esac
 4.12196 +fi
 4.12197 +STRIP=$ac_cv_path_STRIP
 4.12198 +if test -n "$STRIP"; then
 4.12199 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 4.12200 +$as_echo "$STRIP" >&6; }
 4.12201 +else
 4.12202 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.12203 +$as_echo "no" >&6; }
 4.12204 +fi
 4.12205 +
 4.12206 +
 4.12207 +        if test "x$STRIP" = x; then
 4.12208 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.12209 +        fi
 4.12210 +      else
 4.12211 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.12212 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool STRIP=$tool_specified" >&5
 4.12213 +$as_echo "$as_me: Will use user supplied tool STRIP=$tool_specified" >&6;}
 4.12214 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STRIP" >&5
 4.12215 +$as_echo_n "checking for STRIP... " >&6; }
 4.12216 +        if test ! -x "$tool_specified"; then
 4.12217 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.12218 +$as_echo "not found" >&6; }
 4.12219 +          as_fn_error $? "User supplied tool STRIP=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.12220 +        fi
 4.12221 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.12222 +$as_echo "$tool_specified" >&6; }
 4.12223 +      fi
 4.12224 +    fi
 4.12225 +  fi
 4.12226 +
 4.12227  
 4.12228  
 4.12229    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
 4.12230 @@ -28027,6 +37931,13 @@
 4.12231    # objcopy is used for moving debug symbols to separate files when
 4.12232    # full debug symbols are enabled.
 4.12233    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
 4.12234 +
 4.12235 +
 4.12236 +  # Publish this variable in the help.
 4.12237 +
 4.12238 +
 4.12239 +  if test "x$OBJCOPY" = x; then
 4.12240 +    # The variable is not set by user, try to locate tool using the code snippet
 4.12241      if test -n "$ac_tool_prefix"; then
 4.12242    for ac_prog in gobjcopy objcopy
 4.12243    do
 4.12244 @@ -28127,6 +38038,195 @@
 4.12245    fi
 4.12246  fi
 4.12247  
 4.12248 +  else
 4.12249 +    # The variable is set, but is it from the command line or the environment?
 4.12250 +
 4.12251 +    # Try to remove the string !OBJCOPY! from our list.
 4.12252 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!OBJCOPY!/}
 4.12253 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.12254 +      # If it failed, the variable was not from the command line. Ignore it,
 4.12255 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.12256 +      if test "xOBJCOPY" != xBASH; then
 4.12257 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of OBJCOPY from the environment. Use command line variables instead." >&5
 4.12258 +$as_echo "$as_me: WARNING: Ignoring value of OBJCOPY from the environment. Use command line variables instead." >&2;}
 4.12259 +      fi
 4.12260 +      # Try to locate tool using the code snippet
 4.12261 +      if test -n "$ac_tool_prefix"; then
 4.12262 +  for ac_prog in gobjcopy objcopy
 4.12263 +  do
 4.12264 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 4.12265 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 4.12266 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12267 +$as_echo_n "checking for $ac_word... " >&6; }
 4.12268 +if ${ac_cv_prog_OBJCOPY+:} false; then :
 4.12269 +  $as_echo_n "(cached) " >&6
 4.12270 +else
 4.12271 +  if test -n "$OBJCOPY"; then
 4.12272 +  ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
 4.12273 +else
 4.12274 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.12275 +for as_dir in $PATH
 4.12276 +do
 4.12277 +  IFS=$as_save_IFS
 4.12278 +  test -z "$as_dir" && as_dir=.
 4.12279 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.12280 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12281 +    ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
 4.12282 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12283 +    break 2
 4.12284 +  fi
 4.12285 +done
 4.12286 +  done
 4.12287 +IFS=$as_save_IFS
 4.12288 +
 4.12289 +fi
 4.12290 +fi
 4.12291 +OBJCOPY=$ac_cv_prog_OBJCOPY
 4.12292 +if test -n "$OBJCOPY"; then
 4.12293 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
 4.12294 +$as_echo "$OBJCOPY" >&6; }
 4.12295 +else
 4.12296 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.12297 +$as_echo "no" >&6; }
 4.12298 +fi
 4.12299 +
 4.12300 +
 4.12301 +    test -n "$OBJCOPY" && break
 4.12302 +  done
 4.12303 +fi
 4.12304 +if test -z "$OBJCOPY"; then
 4.12305 +  ac_ct_OBJCOPY=$OBJCOPY
 4.12306 +  for ac_prog in gobjcopy objcopy
 4.12307 +do
 4.12308 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.12309 +set dummy $ac_prog; ac_word=$2
 4.12310 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12311 +$as_echo_n "checking for $ac_word... " >&6; }
 4.12312 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
 4.12313 +  $as_echo_n "(cached) " >&6
 4.12314 +else
 4.12315 +  if test -n "$ac_ct_OBJCOPY"; then
 4.12316 +  ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
 4.12317 +else
 4.12318 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.12319 +for as_dir in $PATH
 4.12320 +do
 4.12321 +  IFS=$as_save_IFS
 4.12322 +  test -z "$as_dir" && as_dir=.
 4.12323 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.12324 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12325 +    ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
 4.12326 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12327 +    break 2
 4.12328 +  fi
 4.12329 +done
 4.12330 +  done
 4.12331 +IFS=$as_save_IFS
 4.12332 +
 4.12333 +fi
 4.12334 +fi
 4.12335 +ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
 4.12336 +if test -n "$ac_ct_OBJCOPY"; then
 4.12337 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCOPY" >&5
 4.12338 +$as_echo "$ac_ct_OBJCOPY" >&6; }
 4.12339 +else
 4.12340 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.12341 +$as_echo "no" >&6; }
 4.12342 +fi
 4.12343 +
 4.12344 +
 4.12345 +  test -n "$ac_ct_OBJCOPY" && break
 4.12346 +done
 4.12347 +
 4.12348 +  if test "x$ac_ct_OBJCOPY" = x; then
 4.12349 +    OBJCOPY=""
 4.12350 +  else
 4.12351 +    case $cross_compiling:$ac_tool_warned in
 4.12352 +yes:)
 4.12353 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 4.12354 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 4.12355 +ac_tool_warned=yes ;;
 4.12356 +esac
 4.12357 +    OBJCOPY=$ac_ct_OBJCOPY
 4.12358 +  fi
 4.12359 +fi
 4.12360 +
 4.12361 +    else
 4.12362 +      # If it succeeded, then it was overridden by the user. We will use it
 4.12363 +      # for the tool.
 4.12364 +
 4.12365 +      # First remove it from the list of overridden variables, so we can test
 4.12366 +      # for unknown variables in the end.
 4.12367 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.12368 +
 4.12369 +      # Check if the provided tool contains a complete path.
 4.12370 +      tool_specified="$OBJCOPY"
 4.12371 +      tool_basename="${tool_specified##*/}"
 4.12372 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.12373 +        # A command without a complete path is provided, search $PATH.
 4.12374 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool OBJCOPY=$tool_basename" >&5
 4.12375 +$as_echo "$as_me: Will search for user supplied tool OBJCOPY=$tool_basename" >&6;}
 4.12376 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.12377 +set dummy $tool_basename; ac_word=$2
 4.12378 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12379 +$as_echo_n "checking for $ac_word... " >&6; }
 4.12380 +if ${ac_cv_path_OBJCOPY+:} false; then :
 4.12381 +  $as_echo_n "(cached) " >&6
 4.12382 +else
 4.12383 +  case $OBJCOPY in
 4.12384 +  [\\/]* | ?:[\\/]*)
 4.12385 +  ac_cv_path_OBJCOPY="$OBJCOPY" # Let the user override the test with a path.
 4.12386 +  ;;
 4.12387 +  *)
 4.12388 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.12389 +for as_dir in $PATH
 4.12390 +do
 4.12391 +  IFS=$as_save_IFS
 4.12392 +  test -z "$as_dir" && as_dir=.
 4.12393 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.12394 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12395 +    ac_cv_path_OBJCOPY="$as_dir/$ac_word$ac_exec_ext"
 4.12396 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12397 +    break 2
 4.12398 +  fi
 4.12399 +done
 4.12400 +  done
 4.12401 +IFS=$as_save_IFS
 4.12402 +
 4.12403 +  ;;
 4.12404 +esac
 4.12405 +fi
 4.12406 +OBJCOPY=$ac_cv_path_OBJCOPY
 4.12407 +if test -n "$OBJCOPY"; then
 4.12408 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCOPY" >&5
 4.12409 +$as_echo "$OBJCOPY" >&6; }
 4.12410 +else
 4.12411 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.12412 +$as_echo "no" >&6; }
 4.12413 +fi
 4.12414 +
 4.12415 +
 4.12416 +        if test "x$OBJCOPY" = x; then
 4.12417 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.12418 +        fi
 4.12419 +      else
 4.12420 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.12421 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool OBJCOPY=$tool_specified" >&5
 4.12422 +$as_echo "$as_me: Will use user supplied tool OBJCOPY=$tool_specified" >&6;}
 4.12423 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OBJCOPY" >&5
 4.12424 +$as_echo_n "checking for OBJCOPY... " >&6; }
 4.12425 +        if test ! -x "$tool_specified"; then
 4.12426 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.12427 +$as_echo "not found" >&6; }
 4.12428 +          as_fn_error $? "User supplied tool OBJCOPY=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.12429 +        fi
 4.12430 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.12431 +$as_echo "$tool_specified" >&6; }
 4.12432 +      fi
 4.12433 +    fi
 4.12434 +  fi
 4.12435 +
 4.12436 +
 4.12437      # Only call fixup if objcopy was found.
 4.12438      if test -n "$OBJCOPY"; then
 4.12439  
 4.12440 @@ -28398,7 +38498,14 @@
 4.12441      fi
 4.12442    fi
 4.12443  
 4.12444 -  if test -n "$ac_tool_prefix"; then
 4.12445 +
 4.12446 +
 4.12447 +  # Publish this variable in the help.
 4.12448 +
 4.12449 +
 4.12450 +  if test "x$OBJDUMP" = x; then
 4.12451 +    # The variable is not set by user, try to locate tool using the code snippet
 4.12452 +    if test -n "$ac_tool_prefix"; then
 4.12453    for ac_prog in gobjdump objdump
 4.12454    do
 4.12455      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 4.12456 @@ -28498,6 +38605,195 @@
 4.12457    fi
 4.12458  fi
 4.12459  
 4.12460 +  else
 4.12461 +    # The variable is set, but is it from the command line or the environment?
 4.12462 +
 4.12463 +    # Try to remove the string !OBJDUMP! from our list.
 4.12464 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!OBJDUMP!/}
 4.12465 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.12466 +      # If it failed, the variable was not from the command line. Ignore it,
 4.12467 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.12468 +      if test "xOBJDUMP" != xBASH; then
 4.12469 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of OBJDUMP from the environment. Use command line variables instead." >&5
 4.12470 +$as_echo "$as_me: WARNING: Ignoring value of OBJDUMP from the environment. Use command line variables instead." >&2;}
 4.12471 +      fi
 4.12472 +      # Try to locate tool using the code snippet
 4.12473 +      if test -n "$ac_tool_prefix"; then
 4.12474 +  for ac_prog in gobjdump objdump
 4.12475 +  do
 4.12476 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 4.12477 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 4.12478 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12479 +$as_echo_n "checking for $ac_word... " >&6; }
 4.12480 +if ${ac_cv_prog_OBJDUMP+:} false; then :
 4.12481 +  $as_echo_n "(cached) " >&6
 4.12482 +else
 4.12483 +  if test -n "$OBJDUMP"; then
 4.12484 +  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 4.12485 +else
 4.12486 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.12487 +for as_dir in $PATH
 4.12488 +do
 4.12489 +  IFS=$as_save_IFS
 4.12490 +  test -z "$as_dir" && as_dir=.
 4.12491 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.12492 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12493 +    ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog"
 4.12494 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12495 +    break 2
 4.12496 +  fi
 4.12497 +done
 4.12498 +  done
 4.12499 +IFS=$as_save_IFS
 4.12500 +
 4.12501 +fi
 4.12502 +fi
 4.12503 +OBJDUMP=$ac_cv_prog_OBJDUMP
 4.12504 +if test -n "$OBJDUMP"; then
 4.12505 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
 4.12506 +$as_echo "$OBJDUMP" >&6; }
 4.12507 +else
 4.12508 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.12509 +$as_echo "no" >&6; }
 4.12510 +fi
 4.12511 +
 4.12512 +
 4.12513 +    test -n "$OBJDUMP" && break
 4.12514 +  done
 4.12515 +fi
 4.12516 +if test -z "$OBJDUMP"; then
 4.12517 +  ac_ct_OBJDUMP=$OBJDUMP
 4.12518 +  for ac_prog in gobjdump objdump
 4.12519 +do
 4.12520 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.12521 +set dummy $ac_prog; ac_word=$2
 4.12522 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12523 +$as_echo_n "checking for $ac_word... " >&6; }
 4.12524 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
 4.12525 +  $as_echo_n "(cached) " >&6
 4.12526 +else
 4.12527 +  if test -n "$ac_ct_OBJDUMP"; then
 4.12528 +  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 4.12529 +else
 4.12530 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.12531 +for as_dir in $PATH
 4.12532 +do
 4.12533 +  IFS=$as_save_IFS
 4.12534 +  test -z "$as_dir" && as_dir=.
 4.12535 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.12536 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12537 +    ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
 4.12538 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12539 +    break 2
 4.12540 +  fi
 4.12541 +done
 4.12542 +  done
 4.12543 +IFS=$as_save_IFS
 4.12544 +
 4.12545 +fi
 4.12546 +fi
 4.12547 +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 4.12548 +if test -n "$ac_ct_OBJDUMP"; then
 4.12549 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
 4.12550 +$as_echo "$ac_ct_OBJDUMP" >&6; }
 4.12551 +else
 4.12552 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.12553 +$as_echo "no" >&6; }
 4.12554 +fi
 4.12555 +
 4.12556 +
 4.12557 +  test -n "$ac_ct_OBJDUMP" && break
 4.12558 +done
 4.12559 +
 4.12560 +  if test "x$ac_ct_OBJDUMP" = x; then
 4.12561 +    OBJDUMP=""
 4.12562 +  else
 4.12563 +    case $cross_compiling:$ac_tool_warned in
 4.12564 +yes:)
 4.12565 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 4.12566 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 4.12567 +ac_tool_warned=yes ;;
 4.12568 +esac
 4.12569 +    OBJDUMP=$ac_ct_OBJDUMP
 4.12570 +  fi
 4.12571 +fi
 4.12572 +
 4.12573 +    else
 4.12574 +      # If it succeeded, then it was overridden by the user. We will use it
 4.12575 +      # for the tool.
 4.12576 +
 4.12577 +      # First remove it from the list of overridden variables, so we can test
 4.12578 +      # for unknown variables in the end.
 4.12579 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.12580 +
 4.12581 +      # Check if the provided tool contains a complete path.
 4.12582 +      tool_specified="$OBJDUMP"
 4.12583 +      tool_basename="${tool_specified##*/}"
 4.12584 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.12585 +        # A command without a complete path is provided, search $PATH.
 4.12586 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool OBJDUMP=$tool_basename" >&5
 4.12587 +$as_echo "$as_me: Will search for user supplied tool OBJDUMP=$tool_basename" >&6;}
 4.12588 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.12589 +set dummy $tool_basename; ac_word=$2
 4.12590 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12591 +$as_echo_n "checking for $ac_word... " >&6; }
 4.12592 +if ${ac_cv_path_OBJDUMP+:} false; then :
 4.12593 +  $as_echo_n "(cached) " >&6
 4.12594 +else
 4.12595 +  case $OBJDUMP in
 4.12596 +  [\\/]* | ?:[\\/]*)
 4.12597 +  ac_cv_path_OBJDUMP="$OBJDUMP" # Let the user override the test with a path.
 4.12598 +  ;;
 4.12599 +  *)
 4.12600 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.12601 +for as_dir in $PATH
 4.12602 +do
 4.12603 +  IFS=$as_save_IFS
 4.12604 +  test -z "$as_dir" && as_dir=.
 4.12605 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.12606 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12607 +    ac_cv_path_OBJDUMP="$as_dir/$ac_word$ac_exec_ext"
 4.12608 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12609 +    break 2
 4.12610 +  fi
 4.12611 +done
 4.12612 +  done
 4.12613 +IFS=$as_save_IFS
 4.12614 +
 4.12615 +  ;;
 4.12616 +esac
 4.12617 +fi
 4.12618 +OBJDUMP=$ac_cv_path_OBJDUMP
 4.12619 +if test -n "$OBJDUMP"; then
 4.12620 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
 4.12621 +$as_echo "$OBJDUMP" >&6; }
 4.12622 +else
 4.12623 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.12624 +$as_echo "no" >&6; }
 4.12625 +fi
 4.12626 +
 4.12627 +
 4.12628 +        if test "x$OBJDUMP" = x; then
 4.12629 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.12630 +        fi
 4.12631 +      else
 4.12632 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.12633 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool OBJDUMP=$tool_specified" >&5
 4.12634 +$as_echo "$as_me: Will use user supplied tool OBJDUMP=$tool_specified" >&6;}
 4.12635 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OBJDUMP" >&5
 4.12636 +$as_echo_n "checking for OBJDUMP... " >&6; }
 4.12637 +        if test ! -x "$tool_specified"; then
 4.12638 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.12639 +$as_echo "not found" >&6; }
 4.12640 +          as_fn_error $? "User supplied tool OBJDUMP=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.12641 +        fi
 4.12642 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.12643 +$as_echo "$tool_specified" >&6; }
 4.12644 +      fi
 4.12645 +    fi
 4.12646 +  fi
 4.12647 +
 4.12648 +
 4.12649    if test "x$OBJDUMP" != x; then
 4.12650      # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
 4.12651  
 4.12652 @@ -36408,7 +46704,14 @@
 4.12653        PATH=$TOOLS_DIR:$PATH
 4.12654      fi
 4.12655  
 4.12656 -  for ac_prog in ccache
 4.12657 +
 4.12658 +
 4.12659 +  # Publish this variable in the help.
 4.12660 +
 4.12661 +
 4.12662 +  if test "x$CCACHE" = x; then
 4.12663 +    # The variable is not set by user, try to locate tool using the code snippet
 4.12664 +    for ac_prog in ccache
 4.12665  do
 4.12666    # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.12667  set dummy $ac_prog; ac_word=$2
 4.12668 @@ -36453,16 +46756,143 @@
 4.12669    test -n "$CCACHE" && break
 4.12670  done
 4.12671  
 4.12672 +  else
 4.12673 +    # The variable is set, but is it from the command line or the environment?
 4.12674 +
 4.12675 +    # Try to remove the string !CCACHE! from our list.
 4.12676 +    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!CCACHE!/}
 4.12677 +    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
 4.12678 +      # If it failed, the variable was not from the command line. Ignore it,
 4.12679 +      # but warn the user (except for BASH, which is always set by the calling BASH).
 4.12680 +      if test "xCCACHE" != xBASH; then
 4.12681 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring value of CCACHE from the environment. Use command line variables instead." >&5
 4.12682 +$as_echo "$as_me: WARNING: Ignoring value of CCACHE from the environment. Use command line variables instead." >&2;}
 4.12683 +      fi
 4.12684 +      # Try to locate tool using the code snippet
 4.12685 +      for ac_prog in ccache
 4.12686 +do
 4.12687 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 4.12688 +set dummy $ac_prog; ac_word=$2
 4.12689 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12690 +$as_echo_n "checking for $ac_word... " >&6; }
 4.12691 +if ${ac_cv_path_CCACHE+:} false; then :
 4.12692 +  $as_echo_n "(cached) " >&6
 4.12693 +else
 4.12694 +  case $CCACHE in
 4.12695 +  [\\/]* | ?:[\\/]*)
 4.12696 +  ac_cv_path_CCACHE="$CCACHE" # Let the user override the test with a path.
 4.12697 +  ;;
 4.12698 +  *)
 4.12699 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.12700 +for as_dir in $PATH
 4.12701 +do
 4.12702 +  IFS=$as_save_IFS
 4.12703 +  test -z "$as_dir" && as_dir=.
 4.12704 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.12705 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12706 +    ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext"
 4.12707 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12708 +    break 2
 4.12709 +  fi
 4.12710 +done
 4.12711 +  done
 4.12712 +IFS=$as_save_IFS
 4.12713 +
 4.12714 +  ;;
 4.12715 +esac
 4.12716 +fi
 4.12717 +CCACHE=$ac_cv_path_CCACHE
 4.12718 +if test -n "$CCACHE"; then
 4.12719 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCACHE" >&5
 4.12720 +$as_echo "$CCACHE" >&6; }
 4.12721 +else
 4.12722 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.12723 +$as_echo "no" >&6; }
 4.12724 +fi
 4.12725 +
 4.12726 +
 4.12727 +  test -n "$CCACHE" && break
 4.12728 +done
 4.12729 +
 4.12730 +    else
 4.12731 +      # If it succeeded, then it was overridden by the user. We will use it
 4.12732 +      # for the tool.
 4.12733 +
 4.12734 +      # First remove it from the list of overridden variables, so we can test
 4.12735 +      # for unknown variables in the end.
 4.12736 +      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
 4.12737 +
 4.12738 +      # Check if the provided tool contains a complete path.
 4.12739 +      tool_specified="$CCACHE"
 4.12740 +      tool_basename="${tool_specified##*/}"
 4.12741 +      if test "x$tool_basename" = "x$tool_specified"; then
 4.12742 +        # A command without a complete path is provided, search $PATH.
 4.12743 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for user supplied tool CCACHE=$tool_basename" >&5
 4.12744 +$as_echo "$as_me: Will search for user supplied tool CCACHE=$tool_basename" >&6;}
 4.12745 +        # Extract the first word of "$tool_basename", so it can be a program name with args.
 4.12746 +set dummy $tool_basename; ac_word=$2
 4.12747 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 4.12748 +$as_echo_n "checking for $ac_word... " >&6; }
 4.12749 +if ${ac_cv_path_CCACHE+:} false; then :
 4.12750 +  $as_echo_n "(cached) " >&6
 4.12751 +else
 4.12752 +  case $CCACHE in
 4.12753 +  [\\/]* | ?:[\\/]*)
 4.12754 +  ac_cv_path_CCACHE="$CCACHE" # Let the user override the test with a path.
 4.12755 +  ;;
 4.12756 +  *)
 4.12757 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 4.12758 +for as_dir in $PATH
 4.12759 +do
 4.12760 +  IFS=$as_save_IFS
 4.12761 +  test -z "$as_dir" && as_dir=.
 4.12762 +    for ac_exec_ext in '' $ac_executable_extensions; do
 4.12763 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 4.12764 +    ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext"
 4.12765 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 4.12766 +    break 2
 4.12767 +  fi
 4.12768 +done
 4.12769 +  done
 4.12770 +IFS=$as_save_IFS
 4.12771 +
 4.12772 +  ;;
 4.12773 +esac
 4.12774 +fi
 4.12775 +CCACHE=$ac_cv_path_CCACHE
 4.12776 +if test -n "$CCACHE"; then
 4.12777 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCACHE" >&5
 4.12778 +$as_echo "$CCACHE" >&6; }
 4.12779 +else
 4.12780 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 4.12781 +$as_echo "no" >&6; }
 4.12782 +fi
 4.12783 +
 4.12784 +
 4.12785 +        if test "x$CCACHE" = x; then
 4.12786 +          as_fn_error $? "User supplied tool $tool_basename could not be found" "$LINENO" 5
 4.12787 +        fi
 4.12788 +      else
 4.12789 +        # Otherwise we believe it is a complete path. Use it as it is.
 4.12790 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will use user supplied tool CCACHE=$tool_specified" >&5
 4.12791 +$as_echo "$as_me: Will use user supplied tool CCACHE=$tool_specified" >&6;}
 4.12792 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CCACHE" >&5
 4.12793 +$as_echo_n "checking for CCACHE... " >&6; }
 4.12794 +        if test ! -x "$tool_specified"; then
 4.12795 +          { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
 4.12796 +$as_echo "not found" >&6; }
 4.12797 +          as_fn_error $? "User supplied tool CCACHE=$tool_specified does not exist or is not executable" "$LINENO" 5
 4.12798 +        fi
 4.12799 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tool_specified" >&5
 4.12800 +$as_echo "$tool_specified" >&6; }
 4.12801 +      fi
 4.12802 +    fi
 4.12803 +  fi
 4.12804 +
 4.12805 +
 4.12806  
 4.12807    if test "x$CCACHE" = x; then
 4.12808 -    if test "xccache" = x; then
 4.12809 -      PROG_NAME=ccache
 4.12810 -    else
 4.12811 -      PROG_NAME=ccache
 4.12812 -    fi
 4.12813 -    { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
 4.12814 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
 4.12815 -    as_fn_error $? "Cannot continue" "$LINENO" 5
 4.12816 +    as_fn_error $? "Could not find required tool for CCACHE" "$LINENO" 5
 4.12817    fi
 4.12818  
 4.12819  
 4.12820 @@ -36578,6 +47008,15 @@
 4.12821    fi
 4.12822  
 4.12823  
 4.12824 +  # Did user specify any unknown variables?
 4.12825 +
 4.12826 +  if test "x$CONFIGURE_OVERRIDDEN_VARIABLES" != x; then
 4.12827 +    # Replace the separating ! with spaces before presenting for end user.
 4.12828 +    unknown_variables=${CONFIGURE_OVERRIDDEN_VARIABLES//!/ }
 4.12829 +    as_fn_error $? "The following variables are unknown to configure: $unknown_variables" "$LINENO" 5
 4.12830 +  fi
 4.12831 +
 4.12832 +
 4.12833    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if build directory is on local disk" >&5
 4.12834  $as_echo_n "checking if build directory is on local disk... " >&6; }
 4.12835  
     5.1 --- a/common/autoconf/toolchain.m4	Sun Mar 18 15:15:36 2018 -0700
     5.2 +++ b/common/autoconf/toolchain.m4	Tue Mar 20 09:19:10 2018 -0700
     5.3 @@ -265,11 +265,11 @@
     5.4      # otherwise we might pick up cross-compilers which don't use standard naming.
     5.5      # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have
     5.6      # to wait until they are properly discovered.
     5.7 -    AC_PATH_PROGS(BUILD_CC, [cl cc gcc])
     5.8 +    BASIC_PATH_PROGS(BUILD_CC, [cl cc gcc])
     5.9      BASIC_FIXUP_EXECUTABLE(BUILD_CC)
    5.10 -    AC_PATH_PROGS(BUILD_CXX, [cl CC g++])
    5.11 +    BASIC_PATH_PROGS(BUILD_CXX, [cl CC g++])
    5.12      BASIC_FIXUP_EXECUTABLE(BUILD_CXX)
    5.13 -    AC_PATH_PROG(BUILD_LD, ld)
    5.14 +    BASIC_PATH_PROGS(BUILD_LD, ld)
    5.15      BASIC_FIXUP_EXECUTABLE(BUILD_LD)
    5.16    fi
    5.17    AC_SUBST(BUILD_CC)
    5.18 @@ -470,7 +470,7 @@
    5.19    AC_SUBST(LDEXECXX)
    5.20  
    5.21    if test "x$OPENJDK_TARGET_OS" != xwindows; then
    5.22 -    AC_CHECK_TOOL(AR, ar)
    5.23 +    BASIC_CHECK_TOOLS(AR, ar)
    5.24      BASIC_FIXUP_EXECUTABLE(AR)
    5.25    fi
    5.26    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
    5.27 @@ -598,7 +598,7 @@
    5.28  
    5.29    # Find the right assembler.
    5.30    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
    5.31 -    AC_PATH_PROG(AS, as)
    5.32 +    BASIC_PATH_PROGS(AS, as)
    5.33      BASIC_FIXUP_EXECUTABLE(AS)
    5.34    else
    5.35      AS="$CC -c"
    5.36 @@ -606,38 +606,38 @@
    5.37    AC_SUBST(AS)
    5.38  
    5.39    if test "x$OPENJDK_TARGET_OS" = xsolaris; then
    5.40 -    AC_PATH_PROG(NM, nm)
    5.41 +    BASIC_PATH_PROGS(NM, nm)
    5.42      BASIC_FIXUP_EXECUTABLE(NM)
    5.43 -    AC_PATH_PROG(GNM, gnm)
    5.44 +    BASIC_PATH_PROGS(GNM, gnm)
    5.45      BASIC_FIXUP_EXECUTABLE(GNM)
    5.46 -    AC_PATH_PROG(STRIP, strip)
    5.47 +    BASIC_PATH_PROGS(STRIP, strip)
    5.48      BASIC_FIXUP_EXECUTABLE(STRIP)
    5.49 -    AC_PATH_PROG(MCS, mcs)
    5.50 +    BASIC_PATH_PROGS(MCS, mcs)
    5.51      BASIC_FIXUP_EXECUTABLE(MCS)
    5.52    elif test "x$OPENJDK_TARGET_OS" != xwindows; then
    5.53      AC_PATH_PROG(OTOOL, otool)
    5.54      if test "x$OTOOL" = "x"; then
    5.55        OTOOL="true"
    5.56      fi
    5.57 -    AC_CHECK_TOOL(NM, nm)
    5.58 +    BASIC_CHECK_TOOLS(NM, nm)
    5.59      BASIC_FIXUP_EXECUTABLE(NM)
    5.60      GNM="$NM"
    5.61      AC_SUBST(GNM)
    5.62 -    AC_CHECK_TOOL(STRIP, strip)
    5.63 +    BASIC_CHECK_TOOLS(STRIP, strip)
    5.64      BASIC_FIXUP_EXECUTABLE(STRIP)
    5.65    fi
    5.66  
    5.67    # objcopy is used for moving debug symbols to separate files when
    5.68    # full debug symbols are enabled.
    5.69    if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then
    5.70 -    AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
    5.71 +    BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy])
    5.72      # Only call fixup if objcopy was found.
    5.73      if test -n "$OBJCOPY"; then
    5.74        BASIC_FIXUP_EXECUTABLE(OBJCOPY)
    5.75      fi
    5.76    fi
    5.77  
    5.78 -  AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
    5.79 +  BASIC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
    5.80    if test "x$OBJDUMP" != x; then
    5.81      # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing.
    5.82      BASIC_FIXUP_EXECUTABLE(OBJDUMP)
    5.83 @@ -1413,7 +1413,7 @@
    5.84        AC_MSG_RESULT($JTREGEXE)
    5.85      else
    5.86        # try to find jtreg on path
    5.87 -      BASIC_REQUIRE_PROG(JTREGEXE, jtreg)
    5.88 +      BASIC_REQUIRE_PROGS(JTREGEXE, jtreg)
    5.89        JT_HOME="`$DIRNAME $JTREGEXE`"
    5.90      fi
    5.91    fi

mercurial