1.1 --- a/common/autoconf/generated-configure.sh Fri Aug 16 16:22:23 2013 -0700
1.2 +++ b/common/autoconf/generated-configure.sh Thu Sep 05 10:58:25 2013 -0700
1.3 @@ -1,13 +1,11 @@
1.4 #! /bin/sh
1.5 # Guess values for system-dependent variables and create Makefiles.
1.6 -# Generated by GNU Autoconf 2.67 for OpenJDK jdk8.
1.7 +# Generated by GNU Autoconf 2.69 for OpenJDK jdk8.
1.8 #
1.9 # Report bugs to <build-dev@openjdk.java.net>.
1.10 #
1.11 #
1.12 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1.13 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
1.14 -# Foundation, Inc.
1.15 +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
1.16 #
1.17 #
1.18 # This configure script is free software; the Free Software Foundation
1.19 @@ -91,6 +89,7 @@
1.20 IFS=" "" $as_nl"
1.21
1.22 # Find who we are. Look in the path if we contain no directory separator.
1.23 +as_myself=
1.24 case $0 in #((
1.25 *[\\/]* ) as_myself=$0 ;;
1.26 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.27 @@ -135,6 +134,31 @@
1.28 # CDPATH.
1.29 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1.30
1.31 +# Use a proper internal environment variable to ensure we don't fall
1.32 + # into an infinite loop, continuously re-executing ourselves.
1.33 + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
1.34 + _as_can_reexec=no; export _as_can_reexec;
1.35 + # We cannot yet assume a decent shell, so we have to provide a
1.36 +# neutralization value for shells without unset; and this also
1.37 +# works around shells that cannot unset nonexistent variables.
1.38 +# Preserve -v and -x to the replacement shell.
1.39 +BASH_ENV=/dev/null
1.40 +ENV=/dev/null
1.41 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
1.42 +case $- in # ((((
1.43 + *v*x* | *x*v* ) as_opts=-vx ;;
1.44 + *v* ) as_opts=-v ;;
1.45 + *x* ) as_opts=-x ;;
1.46 + * ) as_opts= ;;
1.47 +esac
1.48 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
1.49 +# Admittedly, this is quite paranoid, since all the known shells bail
1.50 +# out after a failed `exec'.
1.51 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
1.52 +as_fn_exit 255
1.53 + fi
1.54 + # We don't want this to propagate to other subprocesses.
1.55 + { _as_can_reexec=; unset _as_can_reexec;}
1.56 if test "x$CONFIG_SHELL" = x; then
1.57 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
1.58 emulate sh
1.59 @@ -168,7 +192,8 @@
1.60 else
1.61 exitcode=1; echo positional parameters were not saved.
1.62 fi
1.63 -test x\$exitcode = x0 || exit 1"
1.64 +test x\$exitcode = x0 || exit 1
1.65 +test -x / || exit 1"
1.66 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
1.67 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
1.68 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
1.69 @@ -213,14 +238,25 @@
1.70
1.71
1.72 if test "x$CONFIG_SHELL" != x; then :
1.73 - # We cannot yet assume a decent shell, so we have to provide a
1.74 - # neutralization value for shells without unset; and this also
1.75 - # works around shells that cannot unset nonexistent variables.
1.76 - BASH_ENV=/dev/null
1.77 - ENV=/dev/null
1.78 - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
1.79 - export CONFIG_SHELL
1.80 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1.81 + export CONFIG_SHELL
1.82 + # We cannot yet assume a decent shell, so we have to provide a
1.83 +# neutralization value for shells without unset; and this also
1.84 +# works around shells that cannot unset nonexistent variables.
1.85 +# Preserve -v and -x to the replacement shell.
1.86 +BASH_ENV=/dev/null
1.87 +ENV=/dev/null
1.88 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
1.89 +case $- in # ((((
1.90 + *v*x* | *x*v* ) as_opts=-vx ;;
1.91 + *v* ) as_opts=-v ;;
1.92 + *x* ) as_opts=-x ;;
1.93 + * ) as_opts= ;;
1.94 +esac
1.95 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
1.96 +# Admittedly, this is quite paranoid, since all the known shells bail
1.97 +# out after a failed `exec'.
1.98 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
1.99 +exit 255
1.100 fi
1.101
1.102 if test x$as_have_required = xno; then :
1.103 @@ -323,6 +359,14 @@
1.104
1.105
1.106 } # as_fn_mkdir_p
1.107 +
1.108 +# as_fn_executable_p FILE
1.109 +# -----------------------
1.110 +# Test if FILE is an executable regular file.
1.111 +as_fn_executable_p ()
1.112 +{
1.113 + test -f "$1" && test -x "$1"
1.114 +} # as_fn_executable_p
1.115 # as_fn_append VAR VALUE
1.116 # ----------------------
1.117 # Append the text in VALUE to the end of the definition contained in VAR. Take
1.118 @@ -444,6 +488,10 @@
1.119 chmod +x "$as_me.lineno" ||
1.120 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
1.121
1.122 + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
1.123 + # already done that, so ensure we don't try to do so again and fall
1.124 + # in an infinite loop. This has already happened in practice.
1.125 + _as_can_reexec=no; export _as_can_reexec
1.126 # Don't try to exec as it changes $[0], causing all sort of problems
1.127 # (the dirname of $[0] is not the place where we might find the
1.128 # original and so on. Autoconf is especially sensitive to this).
1.129 @@ -478,16 +526,16 @@
1.130 # ... but there are two gotchas:
1.131 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
1.132 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
1.133 - # In both cases, we have to default to `cp -p'.
1.134 + # In both cases, we have to default to `cp -pR'.
1.135 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
1.136 - as_ln_s='cp -p'
1.137 + as_ln_s='cp -pR'
1.138 elif ln conf$$.file conf$$ 2>/dev/null; then
1.139 as_ln_s=ln
1.140 else
1.141 - as_ln_s='cp -p'
1.142 - fi
1.143 -else
1.144 - as_ln_s='cp -p'
1.145 + as_ln_s='cp -pR'
1.146 + fi
1.147 +else
1.148 + as_ln_s='cp -pR'
1.149 fi
1.150 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
1.151 rmdir conf$$.dir 2>/dev/null
1.152 @@ -499,28 +547,8 @@
1.153 as_mkdir_p=false
1.154 fi
1.155
1.156 -if test -x / >/dev/null 2>&1; then
1.157 - as_test_x='test -x'
1.158 -else
1.159 - if ls -dL / >/dev/null 2>&1; then
1.160 - as_ls_L_option=L
1.161 - else
1.162 - as_ls_L_option=
1.163 - fi
1.164 - as_test_x='
1.165 - eval sh -c '\''
1.166 - if test -d "$1"; then
1.167 - test -d "$1/.";
1.168 - else
1.169 - case $1 in #(
1.170 - -*)set "./$1";;
1.171 - esac;
1.172 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
1.173 - ???[sx]*):;;*)false;;esac;fi
1.174 - '\'' sh
1.175 - '
1.176 -fi
1.177 -as_executable_p=$as_test_x
1.178 +as_test_x='test -x'
1.179 +as_executable_p=as_fn_executable_p
1.180
1.181 # Sed expression to map a string onto a valid CPP name.
1.182 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
1.183 @@ -682,6 +710,7 @@
1.184 SHARED_LIBRARY
1.185 OBJ_SUFFIX
1.186 COMPILER_NAME
1.187 +TARGET_BITS_FLAG
1.188 JT_HOME
1.189 JTREGEXE
1.190 LIPO
1.191 @@ -1465,7 +1494,7 @@
1.192 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1.193 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1.194 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1.195 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
1.196 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
1.197 ;;
1.198
1.199 esac
1.200 @@ -1516,8 +1545,6 @@
1.201 if test "x$host_alias" != x; then
1.202 if test "x$build_alias" = x; then
1.203 cross_compiling=maybe
1.204 - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1.205 - If a cross compiler is detected then cross compile mode will be used" >&2
1.206 elif test "x$build_alias" != "x$host_alias"; then
1.207 cross_compiling=yes
1.208 fi
1.209 @@ -1903,9 +1930,9 @@
1.210 if $ac_init_version; then
1.211 cat <<\_ACEOF
1.212 OpenJDK configure jdk8
1.213 -generated by GNU Autoconf 2.67
1.214 -
1.215 -Copyright (C) 2010 Free Software Foundation, Inc.
1.216 +generated by GNU Autoconf 2.69
1.217 +
1.218 +Copyright (C) 2012 Free Software Foundation, Inc.
1.219 This configure script is free software; the Free Software Foundation
1.220 gives unlimited permission to copy, distribute and modify it.
1.221 _ACEOF
1.222 @@ -1949,7 +1976,7 @@
1.223
1.224 ac_retval=1
1.225 fi
1.226 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.227 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.228 as_fn_set_status $ac_retval
1.229
1.230 } # ac_fn_c_try_compile
1.231 @@ -1987,7 +2014,7 @@
1.232
1.233 ac_retval=1
1.234 fi
1.235 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.236 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.237 as_fn_set_status $ac_retval
1.238
1.239 } # ac_fn_cxx_try_compile
1.240 @@ -2025,7 +2052,7 @@
1.241
1.242 ac_retval=1
1.243 fi
1.244 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.245 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.246 as_fn_set_status $ac_retval
1.247
1.248 } # ac_fn_objc_try_compile
1.249 @@ -2062,7 +2089,7 @@
1.250
1.251 ac_retval=1
1.252 fi
1.253 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.254 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.255 as_fn_set_status $ac_retval
1.256
1.257 } # ac_fn_c_try_cpp
1.258 @@ -2099,7 +2126,7 @@
1.259
1.260 ac_retval=1
1.261 fi
1.262 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.263 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.264 as_fn_set_status $ac_retval
1.265
1.266 } # ac_fn_cxx_try_cpp
1.267 @@ -2112,10 +2139,10 @@
1.268 ac_fn_cxx_check_header_mongrel ()
1.269 {
1.270 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.271 - if eval "test \"\${$3+set}\"" = set; then :
1.272 + if eval \${$3+:} false; then :
1.273 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.274 $as_echo_n "checking for $2... " >&6; }
1.275 -if eval "test \"\${$3+set}\"" = set; then :
1.276 +if eval \${$3+:} false; then :
1.277 $as_echo_n "(cached) " >&6
1.278 fi
1.279 eval ac_res=\$$3
1.280 @@ -2182,7 +2209,7 @@
1.281 esac
1.282 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.283 $as_echo_n "checking for $2... " >&6; }
1.284 -if eval "test \"\${$3+set}\"" = set; then :
1.285 +if eval \${$3+:} false; then :
1.286 $as_echo_n "(cached) " >&6
1.287 else
1.288 eval "$3=\$ac_header_compiler"
1.289 @@ -2191,7 +2218,7 @@
1.290 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.291 $as_echo "$ac_res" >&6; }
1.292 fi
1.293 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.294 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.295
1.296 } # ac_fn_cxx_check_header_mongrel
1.297
1.298 @@ -2232,7 +2259,7 @@
1.299 ac_retval=$ac_status
1.300 fi
1.301 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1.302 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.303 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.304 as_fn_set_status $ac_retval
1.305
1.306 } # ac_fn_cxx_try_run
1.307 @@ -2246,7 +2273,7 @@
1.308 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.309 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.310 $as_echo_n "checking for $2... " >&6; }
1.311 -if eval "test \"\${$3+set}\"" = set; then :
1.312 +if eval \${$3+:} false; then :
1.313 $as_echo_n "(cached) " >&6
1.314 else
1.315 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.316 @@ -2264,7 +2291,7 @@
1.317 eval ac_res=\$$3
1.318 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.319 $as_echo "$ac_res" >&6; }
1.320 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.321 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.322
1.323 } # ac_fn_cxx_check_header_compile
1.324
1.325 @@ -2285,7 +2312,8 @@
1.326 main ()
1.327 {
1.328 static int test_array [1 - 2 * !(($2) >= 0)];
1.329 -test_array [0] = 0
1.330 +test_array [0] = 0;
1.331 +return test_array [0];
1.332
1.333 ;
1.334 return 0;
1.335 @@ -2301,7 +2329,8 @@
1.336 main ()
1.337 {
1.338 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
1.339 -test_array [0] = 0
1.340 +test_array [0] = 0;
1.341 +return test_array [0];
1.342
1.343 ;
1.344 return 0;
1.345 @@ -2327,7 +2356,8 @@
1.346 main ()
1.347 {
1.348 static int test_array [1 - 2 * !(($2) < 0)];
1.349 -test_array [0] = 0
1.350 +test_array [0] = 0;
1.351 +return test_array [0];
1.352
1.353 ;
1.354 return 0;
1.355 @@ -2343,7 +2373,8 @@
1.356 main ()
1.357 {
1.358 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
1.359 -test_array [0] = 0
1.360 +test_array [0] = 0;
1.361 +return test_array [0];
1.362
1.363 ;
1.364 return 0;
1.365 @@ -2377,7 +2408,8 @@
1.366 main ()
1.367 {
1.368 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
1.369 -test_array [0] = 0
1.370 +test_array [0] = 0;
1.371 +return test_array [0];
1.372
1.373 ;
1.374 return 0;
1.375 @@ -2441,7 +2473,7 @@
1.376 rm -f conftest.val
1.377
1.378 fi
1.379 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.380 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.381 as_fn_set_status $ac_retval
1.382
1.383 } # ac_fn_cxx_compute_int
1.384 @@ -2473,7 +2505,7 @@
1.385 test ! -s conftest.err
1.386 } && test -s conftest$ac_exeext && {
1.387 test "$cross_compiling" = yes ||
1.388 - $as_test_x conftest$ac_exeext
1.389 + test -x conftest$ac_exeext
1.390 }; then :
1.391 ac_retval=0
1.392 else
1.393 @@ -2487,7 +2519,7 @@
1.394 # interfere with the next link command; also delete a directory that is
1.395 # left behind by Apple's compiler. We do this before executing the actions.
1.396 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1.397 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.398 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.399 as_fn_set_status $ac_retval
1.400
1.401 } # ac_fn_cxx_try_link
1.402 @@ -2500,7 +2532,7 @@
1.403 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.404 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.405 $as_echo_n "checking for $2... " >&6; }
1.406 -if eval "test \"\${$3+set}\"" = set; then :
1.407 +if eval \${$3+:} false; then :
1.408 $as_echo_n "(cached) " >&6
1.409 else
1.410 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.411 @@ -2555,7 +2587,7 @@
1.412 eval ac_res=\$$3
1.413 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.414 $as_echo "$ac_res" >&6; }
1.415 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.416 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.417
1.418 } # ac_fn_cxx_check_func
1.419
1.420 @@ -2568,7 +2600,7 @@
1.421 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.422 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.423 $as_echo_n "checking for $2... " >&6; }
1.424 -if eval "test \"\${$3+set}\"" = set; then :
1.425 +if eval \${$3+:} false; then :
1.426 $as_echo_n "(cached) " >&6
1.427 else
1.428 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.429 @@ -2586,7 +2618,7 @@
1.430 eval ac_res=\$$3
1.431 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.432 $as_echo "$ac_res" >&6; }
1.433 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.434 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.435
1.436 } # ac_fn_c_check_header_compile
1.437 cat >config.log <<_ACEOF
1.438 @@ -2594,7 +2626,7 @@
1.439 running configure, to aid debugging if configure makes a mistake.
1.440
1.441 It was created by OpenJDK $as_me jdk8, which was
1.442 -generated by GNU Autoconf 2.67. Invocation command line was
1.443 +generated by GNU Autoconf 2.69. Invocation command line was
1.444
1.445 $ $0 $@
1.446
1.447 @@ -3438,7 +3470,7 @@
1.448 pulse)
1.449 PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
1.450 x11)
1.451 - PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev" ;;
1.452 + PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev" ;;
1.453 ccache)
1.454 PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
1.455 * )
1.456 @@ -3457,11 +3489,11 @@
1.457 cups)
1.458 PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
1.459 freetype2)
1.460 - PKGHANDLER_COMMAND="sudo yum install freetype2-devel" ;;
1.461 + PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
1.462 pulse)
1.463 PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
1.464 x11)
1.465 - PKGHANDLER_COMMAND="sudo yum install libXtst-devel" ;;
1.466 + PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel" ;;
1.467 ccache)
1.468 PKGHANDLER_COMMAND="sudo yum install ccache" ;;
1.469 * )
1.470 @@ -3794,7 +3826,7 @@
1.471 #CUSTOM_AUTOCONF_INCLUDE
1.472
1.473 # Do not change or remove the following line, it is needed for consistency checks:
1.474 -DATE_WHEN_GENERATED=1376695332
1.475 +DATE_WHEN_GENERATED=1378403883
1.476
1.477 ###############################################################################
1.478 #
1.479 @@ -3832,7 +3864,7 @@
1.480 set dummy $ac_prog; ac_word=$2
1.481 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.482 $as_echo_n "checking for $ac_word... " >&6; }
1.483 -if test "${ac_cv_path_BASENAME+set}" = set; then :
1.484 +if ${ac_cv_path_BASENAME+:} false; then :
1.485 $as_echo_n "(cached) " >&6
1.486 else
1.487 case $BASENAME in
1.488 @@ -3846,7 +3878,7 @@
1.489 IFS=$as_save_IFS
1.490 test -z "$as_dir" && as_dir=.
1.491 for ac_exec_ext in '' $ac_executable_extensions; do
1.492 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.493 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.494 ac_cv_path_BASENAME="$as_dir/$ac_word$ac_exec_ext"
1.495 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.496 break 2
1.497 @@ -3891,7 +3923,7 @@
1.498 set dummy $ac_prog; ac_word=$2
1.499 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.500 $as_echo_n "checking for $ac_word... " >&6; }
1.501 -if test "${ac_cv_path_BASH+set}" = set; then :
1.502 +if ${ac_cv_path_BASH+:} false; then :
1.503 $as_echo_n "(cached) " >&6
1.504 else
1.505 case $BASH in
1.506 @@ -3905,7 +3937,7 @@
1.507 IFS=$as_save_IFS
1.508 test -z "$as_dir" && as_dir=.
1.509 for ac_exec_ext in '' $ac_executable_extensions; do
1.510 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.511 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.512 ac_cv_path_BASH="$as_dir/$ac_word$ac_exec_ext"
1.513 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.514 break 2
1.515 @@ -3950,7 +3982,7 @@
1.516 set dummy $ac_prog; ac_word=$2
1.517 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.518 $as_echo_n "checking for $ac_word... " >&6; }
1.519 -if test "${ac_cv_path_CAT+set}" = set; then :
1.520 +if ${ac_cv_path_CAT+:} false; then :
1.521 $as_echo_n "(cached) " >&6
1.522 else
1.523 case $CAT in
1.524 @@ -3964,7 +3996,7 @@
1.525 IFS=$as_save_IFS
1.526 test -z "$as_dir" && as_dir=.
1.527 for ac_exec_ext in '' $ac_executable_extensions; do
1.528 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.529 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.530 ac_cv_path_CAT="$as_dir/$ac_word$ac_exec_ext"
1.531 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.532 break 2
1.533 @@ -4009,7 +4041,7 @@
1.534 set dummy $ac_prog; ac_word=$2
1.535 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.536 $as_echo_n "checking for $ac_word... " >&6; }
1.537 -if test "${ac_cv_path_CHMOD+set}" = set; then :
1.538 +if ${ac_cv_path_CHMOD+:} false; then :
1.539 $as_echo_n "(cached) " >&6
1.540 else
1.541 case $CHMOD in
1.542 @@ -4023,7 +4055,7 @@
1.543 IFS=$as_save_IFS
1.544 test -z "$as_dir" && as_dir=.
1.545 for ac_exec_ext in '' $ac_executable_extensions; do
1.546 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.547 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.548 ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
1.549 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.550 break 2
1.551 @@ -4068,7 +4100,7 @@
1.552 set dummy $ac_prog; ac_word=$2
1.553 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.554 $as_echo_n "checking for $ac_word... " >&6; }
1.555 -if test "${ac_cv_path_CMP+set}" = set; then :
1.556 +if ${ac_cv_path_CMP+:} false; then :
1.557 $as_echo_n "(cached) " >&6
1.558 else
1.559 case $CMP in
1.560 @@ -4082,7 +4114,7 @@
1.561 IFS=$as_save_IFS
1.562 test -z "$as_dir" && as_dir=.
1.563 for ac_exec_ext in '' $ac_executable_extensions; do
1.564 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.565 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.566 ac_cv_path_CMP="$as_dir/$ac_word$ac_exec_ext"
1.567 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.568 break 2
1.569 @@ -4127,7 +4159,7 @@
1.570 set dummy $ac_prog; ac_word=$2
1.571 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.572 $as_echo_n "checking for $ac_word... " >&6; }
1.573 -if test "${ac_cv_path_COMM+set}" = set; then :
1.574 +if ${ac_cv_path_COMM+:} false; then :
1.575 $as_echo_n "(cached) " >&6
1.576 else
1.577 case $COMM in
1.578 @@ -4141,7 +4173,7 @@
1.579 IFS=$as_save_IFS
1.580 test -z "$as_dir" && as_dir=.
1.581 for ac_exec_ext in '' $ac_executable_extensions; do
1.582 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.583 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.584 ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
1.585 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.586 break 2
1.587 @@ -4186,7 +4218,7 @@
1.588 set dummy $ac_prog; ac_word=$2
1.589 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.590 $as_echo_n "checking for $ac_word... " >&6; }
1.591 -if test "${ac_cv_path_CP+set}" = set; then :
1.592 +if ${ac_cv_path_CP+:} false; then :
1.593 $as_echo_n "(cached) " >&6
1.594 else
1.595 case $CP in
1.596 @@ -4200,7 +4232,7 @@
1.597 IFS=$as_save_IFS
1.598 test -z "$as_dir" && as_dir=.
1.599 for ac_exec_ext in '' $ac_executable_extensions; do
1.600 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.601 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.602 ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
1.603 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.604 break 2
1.605 @@ -4245,7 +4277,7 @@
1.606 set dummy $ac_prog; ac_word=$2
1.607 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.608 $as_echo_n "checking for $ac_word... " >&6; }
1.609 -if test "${ac_cv_path_CPIO+set}" = set; then :
1.610 +if ${ac_cv_path_CPIO+:} false; then :
1.611 $as_echo_n "(cached) " >&6
1.612 else
1.613 case $CPIO in
1.614 @@ -4259,7 +4291,7 @@
1.615 IFS=$as_save_IFS
1.616 test -z "$as_dir" && as_dir=.
1.617 for ac_exec_ext in '' $ac_executable_extensions; do
1.618 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.619 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.620 ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
1.621 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.622 break 2
1.623 @@ -4304,7 +4336,7 @@
1.624 set dummy $ac_prog; ac_word=$2
1.625 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.626 $as_echo_n "checking for $ac_word... " >&6; }
1.627 -if test "${ac_cv_path_CUT+set}" = set; then :
1.628 +if ${ac_cv_path_CUT+:} false; then :
1.629 $as_echo_n "(cached) " >&6
1.630 else
1.631 case $CUT in
1.632 @@ -4318,7 +4350,7 @@
1.633 IFS=$as_save_IFS
1.634 test -z "$as_dir" && as_dir=.
1.635 for ac_exec_ext in '' $ac_executable_extensions; do
1.636 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.637 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.638 ac_cv_path_CUT="$as_dir/$ac_word$ac_exec_ext"
1.639 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.640 break 2
1.641 @@ -4363,7 +4395,7 @@
1.642 set dummy $ac_prog; ac_word=$2
1.643 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.644 $as_echo_n "checking for $ac_word... " >&6; }
1.645 -if test "${ac_cv_path_DATE+set}" = set; then :
1.646 +if ${ac_cv_path_DATE+:} false; then :
1.647 $as_echo_n "(cached) " >&6
1.648 else
1.649 case $DATE in
1.650 @@ -4377,7 +4409,7 @@
1.651 IFS=$as_save_IFS
1.652 test -z "$as_dir" && as_dir=.
1.653 for ac_exec_ext in '' $ac_executable_extensions; do
1.654 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.655 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.656 ac_cv_path_DATE="$as_dir/$ac_word$ac_exec_ext"
1.657 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.658 break 2
1.659 @@ -4422,7 +4454,7 @@
1.660 set dummy $ac_prog; ac_word=$2
1.661 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.662 $as_echo_n "checking for $ac_word... " >&6; }
1.663 -if test "${ac_cv_path_DIFF+set}" = set; then :
1.664 +if ${ac_cv_path_DIFF+:} false; then :
1.665 $as_echo_n "(cached) " >&6
1.666 else
1.667 case $DIFF in
1.668 @@ -4436,7 +4468,7 @@
1.669 IFS=$as_save_IFS
1.670 test -z "$as_dir" && as_dir=.
1.671 for ac_exec_ext in '' $ac_executable_extensions; do
1.672 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.673 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.674 ac_cv_path_DIFF="$as_dir/$ac_word$ac_exec_ext"
1.675 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.676 break 2
1.677 @@ -4481,7 +4513,7 @@
1.678 set dummy $ac_prog; ac_word=$2
1.679 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.680 $as_echo_n "checking for $ac_word... " >&6; }
1.681 -if test "${ac_cv_path_DIRNAME+set}" = set; then :
1.682 +if ${ac_cv_path_DIRNAME+:} false; then :
1.683 $as_echo_n "(cached) " >&6
1.684 else
1.685 case $DIRNAME in
1.686 @@ -4495,7 +4527,7 @@
1.687 IFS=$as_save_IFS
1.688 test -z "$as_dir" && as_dir=.
1.689 for ac_exec_ext in '' $ac_executable_extensions; do
1.690 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.691 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.692 ac_cv_path_DIRNAME="$as_dir/$ac_word$ac_exec_ext"
1.693 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.694 break 2
1.695 @@ -4540,7 +4572,7 @@
1.696 set dummy $ac_prog; ac_word=$2
1.697 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.698 $as_echo_n "checking for $ac_word... " >&6; }
1.699 -if test "${ac_cv_path_ECHO+set}" = set; then :
1.700 +if ${ac_cv_path_ECHO+:} false; then :
1.701 $as_echo_n "(cached) " >&6
1.702 else
1.703 case $ECHO in
1.704 @@ -4554,7 +4586,7 @@
1.705 IFS=$as_save_IFS
1.706 test -z "$as_dir" && as_dir=.
1.707 for ac_exec_ext in '' $ac_executable_extensions; do
1.708 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.709 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.710 ac_cv_path_ECHO="$as_dir/$ac_word$ac_exec_ext"
1.711 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.712 break 2
1.713 @@ -4599,7 +4631,7 @@
1.714 set dummy $ac_prog; ac_word=$2
1.715 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.716 $as_echo_n "checking for $ac_word... " >&6; }
1.717 -if test "${ac_cv_path_EXPR+set}" = set; then :
1.718 +if ${ac_cv_path_EXPR+:} false; then :
1.719 $as_echo_n "(cached) " >&6
1.720 else
1.721 case $EXPR in
1.722 @@ -4613,7 +4645,7 @@
1.723 IFS=$as_save_IFS
1.724 test -z "$as_dir" && as_dir=.
1.725 for ac_exec_ext in '' $ac_executable_extensions; do
1.726 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.727 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.728 ac_cv_path_EXPR="$as_dir/$ac_word$ac_exec_ext"
1.729 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.730 break 2
1.731 @@ -4658,7 +4690,7 @@
1.732 set dummy $ac_prog; ac_word=$2
1.733 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.734 $as_echo_n "checking for $ac_word... " >&6; }
1.735 -if test "${ac_cv_path_FILE+set}" = set; then :
1.736 +if ${ac_cv_path_FILE+:} false; then :
1.737 $as_echo_n "(cached) " >&6
1.738 else
1.739 case $FILE in
1.740 @@ -4672,7 +4704,7 @@
1.741 IFS=$as_save_IFS
1.742 test -z "$as_dir" && as_dir=.
1.743 for ac_exec_ext in '' $ac_executable_extensions; do
1.744 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.745 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.746 ac_cv_path_FILE="$as_dir/$ac_word$ac_exec_ext"
1.747 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.748 break 2
1.749 @@ -4717,7 +4749,7 @@
1.750 set dummy $ac_prog; ac_word=$2
1.751 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.752 $as_echo_n "checking for $ac_word... " >&6; }
1.753 -if test "${ac_cv_path_FIND+set}" = set; then :
1.754 +if ${ac_cv_path_FIND+:} false; then :
1.755 $as_echo_n "(cached) " >&6
1.756 else
1.757 case $FIND in
1.758 @@ -4731,7 +4763,7 @@
1.759 IFS=$as_save_IFS
1.760 test -z "$as_dir" && as_dir=.
1.761 for ac_exec_ext in '' $ac_executable_extensions; do
1.762 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.763 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.764 ac_cv_path_FIND="$as_dir/$ac_word$ac_exec_ext"
1.765 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.766 break 2
1.767 @@ -4776,7 +4808,7 @@
1.768 set dummy $ac_prog; ac_word=$2
1.769 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.770 $as_echo_n "checking for $ac_word... " >&6; }
1.771 -if test "${ac_cv_path_HEAD+set}" = set; then :
1.772 +if ${ac_cv_path_HEAD+:} false; then :
1.773 $as_echo_n "(cached) " >&6
1.774 else
1.775 case $HEAD in
1.776 @@ -4790,7 +4822,7 @@
1.777 IFS=$as_save_IFS
1.778 test -z "$as_dir" && as_dir=.
1.779 for ac_exec_ext in '' $ac_executable_extensions; do
1.780 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.781 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.782 ac_cv_path_HEAD="$as_dir/$ac_word$ac_exec_ext"
1.783 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.784 break 2
1.785 @@ -4835,7 +4867,7 @@
1.786 set dummy $ac_prog; ac_word=$2
1.787 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.788 $as_echo_n "checking for $ac_word... " >&6; }
1.789 -if test "${ac_cv_path_LN+set}" = set; then :
1.790 +if ${ac_cv_path_LN+:} false; then :
1.791 $as_echo_n "(cached) " >&6
1.792 else
1.793 case $LN in
1.794 @@ -4849,7 +4881,7 @@
1.795 IFS=$as_save_IFS
1.796 test -z "$as_dir" && as_dir=.
1.797 for ac_exec_ext in '' $ac_executable_extensions; do
1.798 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.799 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.800 ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
1.801 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.802 break 2
1.803 @@ -4894,7 +4926,7 @@
1.804 set dummy $ac_prog; ac_word=$2
1.805 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.806 $as_echo_n "checking for $ac_word... " >&6; }
1.807 -if test "${ac_cv_path_LS+set}" = set; then :
1.808 +if ${ac_cv_path_LS+:} false; then :
1.809 $as_echo_n "(cached) " >&6
1.810 else
1.811 case $LS in
1.812 @@ -4908,7 +4940,7 @@
1.813 IFS=$as_save_IFS
1.814 test -z "$as_dir" && as_dir=.
1.815 for ac_exec_ext in '' $ac_executable_extensions; do
1.816 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.817 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.818 ac_cv_path_LS="$as_dir/$ac_word$ac_exec_ext"
1.819 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.820 break 2
1.821 @@ -4953,7 +4985,7 @@
1.822 set dummy $ac_prog; ac_word=$2
1.823 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.824 $as_echo_n "checking for $ac_word... " >&6; }
1.825 -if test "${ac_cv_path_MKDIR+set}" = set; then :
1.826 +if ${ac_cv_path_MKDIR+:} false; then :
1.827 $as_echo_n "(cached) " >&6
1.828 else
1.829 case $MKDIR in
1.830 @@ -4967,7 +4999,7 @@
1.831 IFS=$as_save_IFS
1.832 test -z "$as_dir" && as_dir=.
1.833 for ac_exec_ext in '' $ac_executable_extensions; do
1.834 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.835 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.836 ac_cv_path_MKDIR="$as_dir/$ac_word$ac_exec_ext"
1.837 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.838 break 2
1.839 @@ -5012,7 +5044,7 @@
1.840 set dummy $ac_prog; ac_word=$2
1.841 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.842 $as_echo_n "checking for $ac_word... " >&6; }
1.843 -if test "${ac_cv_path_MKTEMP+set}" = set; then :
1.844 +if ${ac_cv_path_MKTEMP+:} false; then :
1.845 $as_echo_n "(cached) " >&6
1.846 else
1.847 case $MKTEMP in
1.848 @@ -5026,7 +5058,7 @@
1.849 IFS=$as_save_IFS
1.850 test -z "$as_dir" && as_dir=.
1.851 for ac_exec_ext in '' $ac_executable_extensions; do
1.852 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.853 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.854 ac_cv_path_MKTEMP="$as_dir/$ac_word$ac_exec_ext"
1.855 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.856 break 2
1.857 @@ -5071,7 +5103,7 @@
1.858 set dummy $ac_prog; ac_word=$2
1.859 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.860 $as_echo_n "checking for $ac_word... " >&6; }
1.861 -if test "${ac_cv_path_MV+set}" = set; then :
1.862 +if ${ac_cv_path_MV+:} false; then :
1.863 $as_echo_n "(cached) " >&6
1.864 else
1.865 case $MV in
1.866 @@ -5085,7 +5117,7 @@
1.867 IFS=$as_save_IFS
1.868 test -z "$as_dir" && as_dir=.
1.869 for ac_exec_ext in '' $ac_executable_extensions; do
1.870 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.871 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.872 ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
1.873 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.874 break 2
1.875 @@ -5130,7 +5162,7 @@
1.876 set dummy $ac_prog; ac_word=$2
1.877 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.878 $as_echo_n "checking for $ac_word... " >&6; }
1.879 -if test "${ac_cv_path_PRINTF+set}" = set; then :
1.880 +if ${ac_cv_path_PRINTF+:} false; then :
1.881 $as_echo_n "(cached) " >&6
1.882 else
1.883 case $PRINTF in
1.884 @@ -5144,7 +5176,7 @@
1.885 IFS=$as_save_IFS
1.886 test -z "$as_dir" && as_dir=.
1.887 for ac_exec_ext in '' $ac_executable_extensions; do
1.888 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.889 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.890 ac_cv_path_PRINTF="$as_dir/$ac_word$ac_exec_ext"
1.891 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.892 break 2
1.893 @@ -5189,7 +5221,7 @@
1.894 set dummy $ac_prog; ac_word=$2
1.895 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.896 $as_echo_n "checking for $ac_word... " >&6; }
1.897 -if test "${ac_cv_path_RM+set}" = set; then :
1.898 +if ${ac_cv_path_RM+:} false; then :
1.899 $as_echo_n "(cached) " >&6
1.900 else
1.901 case $RM in
1.902 @@ -5203,7 +5235,7 @@
1.903 IFS=$as_save_IFS
1.904 test -z "$as_dir" && as_dir=.
1.905 for ac_exec_ext in '' $ac_executable_extensions; do
1.906 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.907 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.908 ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
1.909 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.910 break 2
1.911 @@ -5248,7 +5280,7 @@
1.912 set dummy $ac_prog; ac_word=$2
1.913 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.914 $as_echo_n "checking for $ac_word... " >&6; }
1.915 -if test "${ac_cv_path_SH+set}" = set; then :
1.916 +if ${ac_cv_path_SH+:} false; then :
1.917 $as_echo_n "(cached) " >&6
1.918 else
1.919 case $SH in
1.920 @@ -5262,7 +5294,7 @@
1.921 IFS=$as_save_IFS
1.922 test -z "$as_dir" && as_dir=.
1.923 for ac_exec_ext in '' $ac_executable_extensions; do
1.924 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.925 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.926 ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext"
1.927 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.928 break 2
1.929 @@ -5307,7 +5339,7 @@
1.930 set dummy $ac_prog; ac_word=$2
1.931 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.932 $as_echo_n "checking for $ac_word... " >&6; }
1.933 -if test "${ac_cv_path_SORT+set}" = set; then :
1.934 +if ${ac_cv_path_SORT+:} false; then :
1.935 $as_echo_n "(cached) " >&6
1.936 else
1.937 case $SORT in
1.938 @@ -5321,7 +5353,7 @@
1.939 IFS=$as_save_IFS
1.940 test -z "$as_dir" && as_dir=.
1.941 for ac_exec_ext in '' $ac_executable_extensions; do
1.942 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.943 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.944 ac_cv_path_SORT="$as_dir/$ac_word$ac_exec_ext"
1.945 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.946 break 2
1.947 @@ -5366,7 +5398,7 @@
1.948 set dummy $ac_prog; ac_word=$2
1.949 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.950 $as_echo_n "checking for $ac_word... " >&6; }
1.951 -if test "${ac_cv_path_TAIL+set}" = set; then :
1.952 +if ${ac_cv_path_TAIL+:} false; then :
1.953 $as_echo_n "(cached) " >&6
1.954 else
1.955 case $TAIL in
1.956 @@ -5380,7 +5412,7 @@
1.957 IFS=$as_save_IFS
1.958 test -z "$as_dir" && as_dir=.
1.959 for ac_exec_ext in '' $ac_executable_extensions; do
1.960 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.961 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.962 ac_cv_path_TAIL="$as_dir/$ac_word$ac_exec_ext"
1.963 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.964 break 2
1.965 @@ -5425,7 +5457,7 @@
1.966 set dummy $ac_prog; ac_word=$2
1.967 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.968 $as_echo_n "checking for $ac_word... " >&6; }
1.969 -if test "${ac_cv_path_TAR+set}" = set; then :
1.970 +if ${ac_cv_path_TAR+:} false; then :
1.971 $as_echo_n "(cached) " >&6
1.972 else
1.973 case $TAR in
1.974 @@ -5439,7 +5471,7 @@
1.975 IFS=$as_save_IFS
1.976 test -z "$as_dir" && as_dir=.
1.977 for ac_exec_ext in '' $ac_executable_extensions; do
1.978 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.979 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.980 ac_cv_path_TAR="$as_dir/$ac_word$ac_exec_ext"
1.981 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.982 break 2
1.983 @@ -5484,7 +5516,7 @@
1.984 set dummy $ac_prog; ac_word=$2
1.985 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.986 $as_echo_n "checking for $ac_word... " >&6; }
1.987 -if test "${ac_cv_path_TEE+set}" = set; then :
1.988 +if ${ac_cv_path_TEE+:} false; then :
1.989 $as_echo_n "(cached) " >&6
1.990 else
1.991 case $TEE in
1.992 @@ -5498,7 +5530,7 @@
1.993 IFS=$as_save_IFS
1.994 test -z "$as_dir" && as_dir=.
1.995 for ac_exec_ext in '' $ac_executable_extensions; do
1.996 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.997 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.998 ac_cv_path_TEE="$as_dir/$ac_word$ac_exec_ext"
1.999 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1000 break 2
1.1001 @@ -5543,7 +5575,7 @@
1.1002 set dummy $ac_prog; ac_word=$2
1.1003 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1004 $as_echo_n "checking for $ac_word... " >&6; }
1.1005 -if test "${ac_cv_path_TOUCH+set}" = set; then :
1.1006 +if ${ac_cv_path_TOUCH+:} false; then :
1.1007 $as_echo_n "(cached) " >&6
1.1008 else
1.1009 case $TOUCH in
1.1010 @@ -5557,7 +5589,7 @@
1.1011 IFS=$as_save_IFS
1.1012 test -z "$as_dir" && as_dir=.
1.1013 for ac_exec_ext in '' $ac_executable_extensions; do
1.1014 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1015 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1016 ac_cv_path_TOUCH="$as_dir/$ac_word$ac_exec_ext"
1.1017 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1018 break 2
1.1019 @@ -5602,7 +5634,7 @@
1.1020 set dummy $ac_prog; ac_word=$2
1.1021 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1022 $as_echo_n "checking for $ac_word... " >&6; }
1.1023 -if test "${ac_cv_path_TR+set}" = set; then :
1.1024 +if ${ac_cv_path_TR+:} false; then :
1.1025 $as_echo_n "(cached) " >&6
1.1026 else
1.1027 case $TR in
1.1028 @@ -5616,7 +5648,7 @@
1.1029 IFS=$as_save_IFS
1.1030 test -z "$as_dir" && as_dir=.
1.1031 for ac_exec_ext in '' $ac_executable_extensions; do
1.1032 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1033 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1034 ac_cv_path_TR="$as_dir/$ac_word$ac_exec_ext"
1.1035 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1036 break 2
1.1037 @@ -5661,7 +5693,7 @@
1.1038 set dummy $ac_prog; ac_word=$2
1.1039 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1040 $as_echo_n "checking for $ac_word... " >&6; }
1.1041 -if test "${ac_cv_path_UNAME+set}" = set; then :
1.1042 +if ${ac_cv_path_UNAME+:} false; then :
1.1043 $as_echo_n "(cached) " >&6
1.1044 else
1.1045 case $UNAME in
1.1046 @@ -5675,7 +5707,7 @@
1.1047 IFS=$as_save_IFS
1.1048 test -z "$as_dir" && as_dir=.
1.1049 for ac_exec_ext in '' $ac_executable_extensions; do
1.1050 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1051 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1052 ac_cv_path_UNAME="$as_dir/$ac_word$ac_exec_ext"
1.1053 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1054 break 2
1.1055 @@ -5720,7 +5752,7 @@
1.1056 set dummy $ac_prog; ac_word=$2
1.1057 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1058 $as_echo_n "checking for $ac_word... " >&6; }
1.1059 -if test "${ac_cv_path_UNIQ+set}" = set; then :
1.1060 +if ${ac_cv_path_UNIQ+:} false; then :
1.1061 $as_echo_n "(cached) " >&6
1.1062 else
1.1063 case $UNIQ in
1.1064 @@ -5734,7 +5766,7 @@
1.1065 IFS=$as_save_IFS
1.1066 test -z "$as_dir" && as_dir=.
1.1067 for ac_exec_ext in '' $ac_executable_extensions; do
1.1068 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1069 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1070 ac_cv_path_UNIQ="$as_dir/$ac_word$ac_exec_ext"
1.1071 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1072 break 2
1.1073 @@ -5779,7 +5811,7 @@
1.1074 set dummy $ac_prog; ac_word=$2
1.1075 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1076 $as_echo_n "checking for $ac_word... " >&6; }
1.1077 -if test "${ac_cv_path_WC+set}" = set; then :
1.1078 +if ${ac_cv_path_WC+:} false; then :
1.1079 $as_echo_n "(cached) " >&6
1.1080 else
1.1081 case $WC in
1.1082 @@ -5793,7 +5825,7 @@
1.1083 IFS=$as_save_IFS
1.1084 test -z "$as_dir" && as_dir=.
1.1085 for ac_exec_ext in '' $ac_executable_extensions; do
1.1086 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1087 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1088 ac_cv_path_WC="$as_dir/$ac_word$ac_exec_ext"
1.1089 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1090 break 2
1.1091 @@ -5838,7 +5870,7 @@
1.1092 set dummy $ac_prog; ac_word=$2
1.1093 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1094 $as_echo_n "checking for $ac_word... " >&6; }
1.1095 -if test "${ac_cv_path_WHICH+set}" = set; then :
1.1096 +if ${ac_cv_path_WHICH+:} false; then :
1.1097 $as_echo_n "(cached) " >&6
1.1098 else
1.1099 case $WHICH in
1.1100 @@ -5852,7 +5884,7 @@
1.1101 IFS=$as_save_IFS
1.1102 test -z "$as_dir" && as_dir=.
1.1103 for ac_exec_ext in '' $ac_executable_extensions; do
1.1104 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1105 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1106 ac_cv_path_WHICH="$as_dir/$ac_word$ac_exec_ext"
1.1107 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1108 break 2
1.1109 @@ -5897,7 +5929,7 @@
1.1110 set dummy $ac_prog; ac_word=$2
1.1111 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1112 $as_echo_n "checking for $ac_word... " >&6; }
1.1113 -if test "${ac_cv_path_XARGS+set}" = set; then :
1.1114 +if ${ac_cv_path_XARGS+:} false; then :
1.1115 $as_echo_n "(cached) " >&6
1.1116 else
1.1117 case $XARGS in
1.1118 @@ -5911,7 +5943,7 @@
1.1119 IFS=$as_save_IFS
1.1120 test -z "$as_dir" && as_dir=.
1.1121 for ac_exec_ext in '' $ac_executable_extensions; do
1.1122 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1123 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1124 ac_cv_path_XARGS="$as_dir/$ac_word$ac_exec_ext"
1.1125 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1126 break 2
1.1127 @@ -5957,7 +5989,7 @@
1.1128 set dummy $ac_prog; ac_word=$2
1.1129 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1130 $as_echo_n "checking for $ac_word... " >&6; }
1.1131 -if test "${ac_cv_prog_AWK+set}" = set; then :
1.1132 +if ${ac_cv_prog_AWK+:} false; then :
1.1133 $as_echo_n "(cached) " >&6
1.1134 else
1.1135 if test -n "$AWK"; then
1.1136 @@ -5969,7 +6001,7 @@
1.1137 IFS=$as_save_IFS
1.1138 test -z "$as_dir" && as_dir=.
1.1139 for ac_exec_ext in '' $ac_executable_extensions; do
1.1140 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1141 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1142 ac_cv_prog_AWK="$ac_prog"
1.1143 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1144 break 2
1.1145 @@ -6007,7 +6039,7 @@
1.1146
1.1147 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
1.1148 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
1.1149 -if test "${ac_cv_path_GREP+set}" = set; then :
1.1150 +if ${ac_cv_path_GREP+:} false; then :
1.1151 $as_echo_n "(cached) " >&6
1.1152 else
1.1153 if test -z "$GREP"; then
1.1154 @@ -6021,7 +6053,7 @@
1.1155 for ac_prog in grep ggrep; do
1.1156 for ac_exec_ext in '' $ac_executable_extensions; do
1.1157 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
1.1158 - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
1.1159 + as_fn_executable_p "$ac_path_GREP" || continue
1.1160 # Check for GNU ac_path_GREP and select it if it is found.
1.1161 # Check for GNU $ac_path_GREP
1.1162 case `"$ac_path_GREP" --version 2>&1` in
1.1163 @@ -6082,7 +6114,7 @@
1.1164
1.1165 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
1.1166 $as_echo_n "checking for egrep... " >&6; }
1.1167 -if test "${ac_cv_path_EGREP+set}" = set; then :
1.1168 +if ${ac_cv_path_EGREP+:} false; then :
1.1169 $as_echo_n "(cached) " >&6
1.1170 else
1.1171 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
1.1172 @@ -6099,7 +6131,7 @@
1.1173 for ac_prog in egrep; do
1.1174 for ac_exec_ext in '' $ac_executable_extensions; do
1.1175 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
1.1176 - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
1.1177 + as_fn_executable_p "$ac_path_EGREP" || continue
1.1178 # Check for GNU ac_path_EGREP and select it if it is found.
1.1179 # Check for GNU $ac_path_EGREP
1.1180 case `"$ac_path_EGREP" --version 2>&1` in
1.1181 @@ -6161,7 +6193,7 @@
1.1182
1.1183 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
1.1184 $as_echo_n "checking for fgrep... " >&6; }
1.1185 -if test "${ac_cv_path_FGREP+set}" = set; then :
1.1186 +if ${ac_cv_path_FGREP+:} false; then :
1.1187 $as_echo_n "(cached) " >&6
1.1188 else
1.1189 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
1.1190 @@ -6178,7 +6210,7 @@
1.1191 for ac_prog in fgrep; do
1.1192 for ac_exec_ext in '' $ac_executable_extensions; do
1.1193 ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
1.1194 - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
1.1195 + as_fn_executable_p "$ac_path_FGREP" || continue
1.1196 # Check for GNU ac_path_FGREP and select it if it is found.
1.1197 # Check for GNU $ac_path_FGREP
1.1198 case `"$ac_path_FGREP" --version 2>&1` in
1.1199 @@ -6240,7 +6272,7 @@
1.1200
1.1201 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
1.1202 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
1.1203 -if test "${ac_cv_path_SED+set}" = set; then :
1.1204 +if ${ac_cv_path_SED+:} false; then :
1.1205 $as_echo_n "(cached) " >&6
1.1206 else
1.1207 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
1.1208 @@ -6260,7 +6292,7 @@
1.1209 for ac_prog in sed gsed; do
1.1210 for ac_exec_ext in '' $ac_executable_extensions; do
1.1211 ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
1.1212 - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
1.1213 + as_fn_executable_p "$ac_path_SED" || continue
1.1214 # Check for GNU ac_path_SED and select it if it is found.
1.1215 # Check for GNU $ac_path_SED
1.1216 case `"$ac_path_SED" --version 2>&1` in
1.1217 @@ -6326,7 +6358,7 @@
1.1218 set dummy $ac_prog; ac_word=$2
1.1219 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1220 $as_echo_n "checking for $ac_word... " >&6; }
1.1221 -if test "${ac_cv_path_NAWK+set}" = set; then :
1.1222 +if ${ac_cv_path_NAWK+:} false; then :
1.1223 $as_echo_n "(cached) " >&6
1.1224 else
1.1225 case $NAWK in
1.1226 @@ -6340,7 +6372,7 @@
1.1227 IFS=$as_save_IFS
1.1228 test -z "$as_dir" && as_dir=.
1.1229 for ac_exec_ext in '' $ac_executable_extensions; do
1.1230 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1231 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1232 ac_cv_path_NAWK="$as_dir/$ac_word$ac_exec_ext"
1.1233 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1234 break 2
1.1235 @@ -6390,7 +6422,7 @@
1.1236 set dummy cygpath; ac_word=$2
1.1237 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1238 $as_echo_n "checking for $ac_word... " >&6; }
1.1239 -if test "${ac_cv_path_CYGPATH+set}" = set; then :
1.1240 +if ${ac_cv_path_CYGPATH+:} false; then :
1.1241 $as_echo_n "(cached) " >&6
1.1242 else
1.1243 case $CYGPATH in
1.1244 @@ -6404,7 +6436,7 @@
1.1245 IFS=$as_save_IFS
1.1246 test -z "$as_dir" && as_dir=.
1.1247 for ac_exec_ext in '' $ac_executable_extensions; do
1.1248 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1249 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1250 ac_cv_path_CYGPATH="$as_dir/$ac_word$ac_exec_ext"
1.1251 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1252 break 2
1.1253 @@ -6430,7 +6462,7 @@
1.1254 set dummy readlink; ac_word=$2
1.1255 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1256 $as_echo_n "checking for $ac_word... " >&6; }
1.1257 -if test "${ac_cv_path_READLINK+set}" = set; then :
1.1258 +if ${ac_cv_path_READLINK+:} false; then :
1.1259 $as_echo_n "(cached) " >&6
1.1260 else
1.1261 case $READLINK in
1.1262 @@ -6444,7 +6476,7 @@
1.1263 IFS=$as_save_IFS
1.1264 test -z "$as_dir" && as_dir=.
1.1265 for ac_exec_ext in '' $ac_executable_extensions; do
1.1266 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1267 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1268 ac_cv_path_READLINK="$as_dir/$ac_word$ac_exec_ext"
1.1269 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1270 break 2
1.1271 @@ -6470,7 +6502,7 @@
1.1272 set dummy df; ac_word=$2
1.1273 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1274 $as_echo_n "checking for $ac_word... " >&6; }
1.1275 -if test "${ac_cv_path_DF+set}" = set; then :
1.1276 +if ${ac_cv_path_DF+:} false; then :
1.1277 $as_echo_n "(cached) " >&6
1.1278 else
1.1279 case $DF in
1.1280 @@ -6484,7 +6516,7 @@
1.1281 IFS=$as_save_IFS
1.1282 test -z "$as_dir" && as_dir=.
1.1283 for ac_exec_ext in '' $ac_executable_extensions; do
1.1284 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1285 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1286 ac_cv_path_DF="$as_dir/$ac_word$ac_exec_ext"
1.1287 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1288 break 2
1.1289 @@ -6510,7 +6542,7 @@
1.1290 set dummy SetFile; ac_word=$2
1.1291 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1292 $as_echo_n "checking for $ac_word... " >&6; }
1.1293 -if test "${ac_cv_path_SETFILE+set}" = set; then :
1.1294 +if ${ac_cv_path_SETFILE+:} false; then :
1.1295 $as_echo_n "(cached) " >&6
1.1296 else
1.1297 case $SETFILE in
1.1298 @@ -6524,7 +6556,7 @@
1.1299 IFS=$as_save_IFS
1.1300 test -z "$as_dir" && as_dir=.
1.1301 for ac_exec_ext in '' $ac_executable_extensions; do
1.1302 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1303 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1304 ac_cv_path_SETFILE="$as_dir/$ac_word$ac_exec_ext"
1.1305 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1306 break 2
1.1307 @@ -6556,7 +6588,7 @@
1.1308
1.1309 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
1.1310 $as_echo_n "checking build system type... " >&6; }
1.1311 -if test "${ac_cv_build+set}" = set; then :
1.1312 +if ${ac_cv_build+:} false; then :
1.1313 $as_echo_n "(cached) " >&6
1.1314 else
1.1315 ac_build_alias=$build_alias
1.1316 @@ -6590,7 +6622,7 @@
1.1317
1.1318 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
1.1319 $as_echo_n "checking host system type... " >&6; }
1.1320 -if test "${ac_cv_host+set}" = set; then :
1.1321 +if ${ac_cv_host+:} false; then :
1.1322 $as_echo_n "(cached) " >&6
1.1323 else
1.1324 if test "x$host_alias" = x; then
1.1325 @@ -6623,7 +6655,7 @@
1.1326
1.1327 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
1.1328 $as_echo_n "checking target system type... " >&6; }
1.1329 -if test "${ac_cv_target+set}" = set; then :
1.1330 +if ${ac_cv_target+:} false; then :
1.1331 $as_echo_n "(cached) " >&6
1.1332 else
1.1333 if test "x$target_alias" = x; then
1.1334 @@ -8205,7 +8237,7 @@
1.1335 set dummy $ac_prog; ac_word=$2
1.1336 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1337 $as_echo_n "checking for $ac_word... " >&6; }
1.1338 -if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
1.1339 +if ${ac_cv_prog_PKGHANDLER+:} false; then :
1.1340 $as_echo_n "(cached) " >&6
1.1341 else
1.1342 if test -n "$PKGHANDLER"; then
1.1343 @@ -8217,7 +8249,7 @@
1.1344 IFS=$as_save_IFS
1.1345 test -z "$as_dir" && as_dir=.
1.1346 for ac_exec_ext in '' $ac_executable_extensions; do
1.1347 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1348 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1349 ac_cv_prog_PKGHANDLER="$ac_prog"
1.1350 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1351 break 2
1.1352 @@ -8570,7 +8602,7 @@
1.1353 set dummy $ac_prog; ac_word=$2
1.1354 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1355 $as_echo_n "checking for $ac_word... " >&6; }
1.1356 -if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
1.1357 +if ${ac_cv_path_CHECK_GMAKE+:} false; then :
1.1358 $as_echo_n "(cached) " >&6
1.1359 else
1.1360 case $CHECK_GMAKE in
1.1361 @@ -8584,7 +8616,7 @@
1.1362 IFS=$as_save_IFS
1.1363 test -z "$as_dir" && as_dir=.
1.1364 for ac_exec_ext in '' $ac_executable_extensions; do
1.1365 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1366 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1367 ac_cv_path_CHECK_GMAKE="$as_dir/$ac_word$ac_exec_ext"
1.1368 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1369 break 2
1.1370 @@ -8924,7 +8956,7 @@
1.1371 set dummy $ac_prog; ac_word=$2
1.1372 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1373 $as_echo_n "checking for $ac_word... " >&6; }
1.1374 -if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
1.1375 +if ${ac_cv_path_CHECK_MAKE+:} false; then :
1.1376 $as_echo_n "(cached) " >&6
1.1377 else
1.1378 case $CHECK_MAKE in
1.1379 @@ -8938,7 +8970,7 @@
1.1380 IFS=$as_save_IFS
1.1381 test -z "$as_dir" && as_dir=.
1.1382 for ac_exec_ext in '' $ac_executable_extensions; do
1.1383 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1384 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1385 ac_cv_path_CHECK_MAKE="$as_dir/$ac_word$ac_exec_ext"
1.1386 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1387 break 2
1.1388 @@ -9283,7 +9315,7 @@
1.1389 set dummy $ac_prog; ac_word=$2
1.1390 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1391 $as_echo_n "checking for $ac_word... " >&6; }
1.1392 -if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
1.1393 +if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
1.1394 $as_echo_n "(cached) " >&6
1.1395 else
1.1396 case $CHECK_TOOLSDIR_GMAKE in
1.1397 @@ -9297,7 +9329,7 @@
1.1398 IFS=$as_save_IFS
1.1399 test -z "$as_dir" && as_dir=.
1.1400 for ac_exec_ext in '' $ac_executable_extensions; do
1.1401 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1402 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1403 ac_cv_path_CHECK_TOOLSDIR_GMAKE="$as_dir/$ac_word$ac_exec_ext"
1.1404 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1405 break 2
1.1406 @@ -9636,7 +9668,7 @@
1.1407 set dummy $ac_prog; ac_word=$2
1.1408 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1409 $as_echo_n "checking for $ac_word... " >&6; }
1.1410 -if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
1.1411 +if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
1.1412 $as_echo_n "(cached) " >&6
1.1413 else
1.1414 case $CHECK_TOOLSDIR_MAKE in
1.1415 @@ -9650,7 +9682,7 @@
1.1416 IFS=$as_save_IFS
1.1417 test -z "$as_dir" && as_dir=.
1.1418 for ac_exec_ext in '' $ac_executable_extensions; do
1.1419 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1420 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1421 ac_cv_path_CHECK_TOOLSDIR_MAKE="$as_dir/$ac_word$ac_exec_ext"
1.1422 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1423 break 2
1.1424 @@ -10032,7 +10064,7 @@
1.1425 set dummy $ac_prog; ac_word=$2
1.1426 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1427 $as_echo_n "checking for $ac_word... " >&6; }
1.1428 -if test "${ac_cv_path_UNZIP+set}" = set; then :
1.1429 +if ${ac_cv_path_UNZIP+:} false; then :
1.1430 $as_echo_n "(cached) " >&6
1.1431 else
1.1432 case $UNZIP in
1.1433 @@ -10046,7 +10078,7 @@
1.1434 IFS=$as_save_IFS
1.1435 test -z "$as_dir" && as_dir=.
1.1436 for ac_exec_ext in '' $ac_executable_extensions; do
1.1437 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1438 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1439 ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext"
1.1440 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1441 break 2
1.1442 @@ -10091,7 +10123,7 @@
1.1443 set dummy $ac_prog; ac_word=$2
1.1444 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1445 $as_echo_n "checking for $ac_word... " >&6; }
1.1446 -if test "${ac_cv_path_ZIP+set}" = set; then :
1.1447 +if ${ac_cv_path_ZIP+:} false; then :
1.1448 $as_echo_n "(cached) " >&6
1.1449 else
1.1450 case $ZIP in
1.1451 @@ -10105,7 +10137,7 @@
1.1452 IFS=$as_save_IFS
1.1453 test -z "$as_dir" && as_dir=.
1.1454 for ac_exec_ext in '' $ac_executable_extensions; do
1.1455 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1456 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1457 ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext"
1.1458 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1459 break 2
1.1460 @@ -10150,7 +10182,7 @@
1.1461 set dummy ldd; ac_word=$2
1.1462 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1463 $as_echo_n "checking for $ac_word... " >&6; }
1.1464 -if test "${ac_cv_path_LDD+set}" = set; then :
1.1465 +if ${ac_cv_path_LDD+:} false; then :
1.1466 $as_echo_n "(cached) " >&6
1.1467 else
1.1468 case $LDD in
1.1469 @@ -10164,7 +10196,7 @@
1.1470 IFS=$as_save_IFS
1.1471 test -z "$as_dir" && as_dir=.
1.1472 for ac_exec_ext in '' $ac_executable_extensions; do
1.1473 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1474 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1475 ac_cv_path_LDD="$as_dir/$ac_word$ac_exec_ext"
1.1476 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1477 break 2
1.1478 @@ -10196,7 +10228,7 @@
1.1479 set dummy otool; ac_word=$2
1.1480 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1481 $as_echo_n "checking for $ac_word... " >&6; }
1.1482 -if test "${ac_cv_path_OTOOL+set}" = set; then :
1.1483 +if ${ac_cv_path_OTOOL+:} false; then :
1.1484 $as_echo_n "(cached) " >&6
1.1485 else
1.1486 case $OTOOL in
1.1487 @@ -10210,7 +10242,7 @@
1.1488 IFS=$as_save_IFS
1.1489 test -z "$as_dir" && as_dir=.
1.1490 for ac_exec_ext in '' $ac_executable_extensions; do
1.1491 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1492 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1493 ac_cv_path_OTOOL="$as_dir/$ac_word$ac_exec_ext"
1.1494 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1495 break 2
1.1496 @@ -10241,7 +10273,7 @@
1.1497 set dummy $ac_prog; ac_word=$2
1.1498 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1499 $as_echo_n "checking for $ac_word... " >&6; }
1.1500 -if test "${ac_cv_path_READELF+set}" = set; then :
1.1501 +if ${ac_cv_path_READELF+:} false; then :
1.1502 $as_echo_n "(cached) " >&6
1.1503 else
1.1504 case $READELF in
1.1505 @@ -10255,7 +10287,7 @@
1.1506 IFS=$as_save_IFS
1.1507 test -z "$as_dir" && as_dir=.
1.1508 for ac_exec_ext in '' $ac_executable_extensions; do
1.1509 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1510 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1511 ac_cv_path_READELF="$as_dir/$ac_word$ac_exec_ext"
1.1512 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1513 break 2
1.1514 @@ -10284,7 +10316,7 @@
1.1515 set dummy hg; ac_word=$2
1.1516 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1517 $as_echo_n "checking for $ac_word... " >&6; }
1.1518 -if test "${ac_cv_path_HG+set}" = set; then :
1.1519 +if ${ac_cv_path_HG+:} false; then :
1.1520 $as_echo_n "(cached) " >&6
1.1521 else
1.1522 case $HG in
1.1523 @@ -10298,7 +10330,7 @@
1.1524 IFS=$as_save_IFS
1.1525 test -z "$as_dir" && as_dir=.
1.1526 for ac_exec_ext in '' $ac_executable_extensions; do
1.1527 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1528 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1529 ac_cv_path_HG="$as_dir/$ac_word$ac_exec_ext"
1.1530 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1531 break 2
1.1532 @@ -10324,7 +10356,7 @@
1.1533 set dummy stat; ac_word=$2
1.1534 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1535 $as_echo_n "checking for $ac_word... " >&6; }
1.1536 -if test "${ac_cv_path_STAT+set}" = set; then :
1.1537 +if ${ac_cv_path_STAT+:} false; then :
1.1538 $as_echo_n "(cached) " >&6
1.1539 else
1.1540 case $STAT in
1.1541 @@ -10338,7 +10370,7 @@
1.1542 IFS=$as_save_IFS
1.1543 test -z "$as_dir" && as_dir=.
1.1544 for ac_exec_ext in '' $ac_executable_extensions; do
1.1545 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1546 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1547 ac_cv_path_STAT="$as_dir/$ac_word$ac_exec_ext"
1.1548 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1549 break 2
1.1550 @@ -10364,7 +10396,7 @@
1.1551 set dummy time; ac_word=$2
1.1552 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1553 $as_echo_n "checking for $ac_word... " >&6; }
1.1554 -if test "${ac_cv_path_TIME+set}" = set; then :
1.1555 +if ${ac_cv_path_TIME+:} false; then :
1.1556 $as_echo_n "(cached) " >&6
1.1557 else
1.1558 case $TIME in
1.1559 @@ -10378,7 +10410,7 @@
1.1560 IFS=$as_save_IFS
1.1561 test -z "$as_dir" && as_dir=.
1.1562 for ac_exec_ext in '' $ac_executable_extensions; do
1.1563 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1564 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1565 ac_cv_path_TIME="$as_dir/$ac_word$ac_exec_ext"
1.1566 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1567 break 2
1.1568 @@ -10417,7 +10449,7 @@
1.1569 set dummy $ac_prog; ac_word=$2
1.1570 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1571 $as_echo_n "checking for $ac_word... " >&6; }
1.1572 -if test "${ac_cv_path_COMM+set}" = set; then :
1.1573 +if ${ac_cv_path_COMM+:} false; then :
1.1574 $as_echo_n "(cached) " >&6
1.1575 else
1.1576 case $COMM in
1.1577 @@ -10431,7 +10463,7 @@
1.1578 IFS=$as_save_IFS
1.1579 test -z "$as_dir" && as_dir=.
1.1580 for ac_exec_ext in '' $ac_executable_extensions; do
1.1581 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1582 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1583 ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
1.1584 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1585 break 2
1.1586 @@ -10479,7 +10511,7 @@
1.1587 set dummy $ac_prog; ac_word=$2
1.1588 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1589 $as_echo_n "checking for $ac_word... " >&6; }
1.1590 -if test "${ac_cv_path_XATTR+set}" = set; then :
1.1591 +if ${ac_cv_path_XATTR+:} false; then :
1.1592 $as_echo_n "(cached) " >&6
1.1593 else
1.1594 case $XATTR in
1.1595 @@ -10493,7 +10525,7 @@
1.1596 IFS=$as_save_IFS
1.1597 test -z "$as_dir" && as_dir=.
1.1598 for ac_exec_ext in '' $ac_executable_extensions; do
1.1599 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1600 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1601 ac_cv_path_XATTR="$as_dir/$ac_word$ac_exec_ext"
1.1602 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1603 break 2
1.1604 @@ -10535,7 +10567,7 @@
1.1605 set dummy codesign; ac_word=$2
1.1606 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1607 $as_echo_n "checking for $ac_word... " >&6; }
1.1608 -if test "${ac_cv_path_CODESIGN+set}" = set; then :
1.1609 +if ${ac_cv_path_CODESIGN+:} false; then :
1.1610 $as_echo_n "(cached) " >&6
1.1611 else
1.1612 case $CODESIGN in
1.1613 @@ -10549,7 +10581,7 @@
1.1614 IFS=$as_save_IFS
1.1615 test -z "$as_dir" && as_dir=.
1.1616 for ac_exec_ext in '' $ac_executable_extensions; do
1.1617 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1618 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1619 ac_cv_path_CODESIGN="$as_dir/$ac_word$ac_exec_ext"
1.1620 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1621 break 2
1.1622 @@ -10599,7 +10631,7 @@
1.1623 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
1.1624 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1625 $as_echo_n "checking for $ac_word... " >&6; }
1.1626 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
1.1627 +if ${ac_cv_path_PKG_CONFIG+:} false; then :
1.1628 $as_echo_n "(cached) " >&6
1.1629 else
1.1630 case $PKG_CONFIG in
1.1631 @@ -10613,7 +10645,7 @@
1.1632 IFS=$as_save_IFS
1.1633 test -z "$as_dir" && as_dir=.
1.1634 for ac_exec_ext in '' $ac_executable_extensions; do
1.1635 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1636 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1637 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
1.1638 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1639 break 2
1.1640 @@ -10642,7 +10674,7 @@
1.1641 set dummy pkg-config; ac_word=$2
1.1642 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1643 $as_echo_n "checking for $ac_word... " >&6; }
1.1644 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
1.1645 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
1.1646 $as_echo_n "(cached) " >&6
1.1647 else
1.1648 case $ac_pt_PKG_CONFIG in
1.1649 @@ -10656,7 +10688,7 @@
1.1650 IFS=$as_save_IFS
1.1651 test -z "$as_dir" && as_dir=.
1.1652 for ac_exec_ext in '' $ac_executable_extensions; do
1.1653 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1654 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1655 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
1.1656 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1657 break 2
1.1658 @@ -10815,7 +10847,7 @@
1.1659 set dummy $ac_prog; ac_word=$2
1.1660 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1661 $as_echo_n "checking for $ac_word... " >&6; }
1.1662 -if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
1.1663 +if ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
1.1664 $as_echo_n "(cached) " >&6
1.1665 else
1.1666 if test -n "$BDEPS_UNZIP"; then
1.1667 @@ -10827,7 +10859,7 @@
1.1668 IFS=$as_save_IFS
1.1669 test -z "$as_dir" && as_dir=.
1.1670 for ac_exec_ext in '' $ac_executable_extensions; do
1.1671 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1672 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1673 ac_cv_prog_BDEPS_UNZIP="$ac_prog"
1.1674 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1675 break 2
1.1676 @@ -10861,7 +10893,7 @@
1.1677 set dummy $ac_prog; ac_word=$2
1.1678 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1679 $as_echo_n "checking for $ac_word... " >&6; }
1.1680 -if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
1.1681 +if ${ac_cv_prog_BDEPS_FTP+:} false; then :
1.1682 $as_echo_n "(cached) " >&6
1.1683 else
1.1684 if test -n "$BDEPS_FTP"; then
1.1685 @@ -10873,7 +10905,7 @@
1.1686 IFS=$as_save_IFS
1.1687 test -z "$as_dir" && as_dir=.
1.1688 for ac_exec_ext in '' $ac_executable_extensions; do
1.1689 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1690 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1691 ac_cv_prog_BDEPS_FTP="$ac_prog"
1.1692 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1693 break 2
1.1694 @@ -12157,7 +12189,7 @@
1.1695 set dummy javac; ac_word=$2
1.1696 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1697 $as_echo_n "checking for $ac_word... " >&6; }
1.1698 -if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then :
1.1699 +if ${ac_cv_path_JAVAC_CHECK+:} false; then :
1.1700 $as_echo_n "(cached) " >&6
1.1701 else
1.1702 case $JAVAC_CHECK in
1.1703 @@ -12171,7 +12203,7 @@
1.1704 IFS=$as_save_IFS
1.1705 test -z "$as_dir" && as_dir=.
1.1706 for ac_exec_ext in '' $ac_executable_extensions; do
1.1707 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1708 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1709 ac_cv_path_JAVAC_CHECK="$as_dir/$ac_word$ac_exec_ext"
1.1710 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1711 break 2
1.1712 @@ -12197,7 +12229,7 @@
1.1713 set dummy java; ac_word=$2
1.1714 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1715 $as_echo_n "checking for $ac_word... " >&6; }
1.1716 -if test "${ac_cv_path_JAVA_CHECK+set}" = set; then :
1.1717 +if ${ac_cv_path_JAVA_CHECK+:} false; then :
1.1718 $as_echo_n "(cached) " >&6
1.1719 else
1.1720 case $JAVA_CHECK in
1.1721 @@ -12211,7 +12243,7 @@
1.1722 IFS=$as_save_IFS
1.1723 test -z "$as_dir" && as_dir=.
1.1724 for ac_exec_ext in '' $ac_executable_extensions; do
1.1725 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1726 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1727 ac_cv_path_JAVA_CHECK="$as_dir/$ac_word$ac_exec_ext"
1.1728 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1729 break 2
1.1730 @@ -16526,7 +16558,7 @@
1.1731 set dummy $ac_prog; ac_word=$2
1.1732 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1733 $as_echo_n "checking for $ac_word... " >&6; }
1.1734 -if test "${ac_cv_path_JTREGEXE+set}" = set; then :
1.1735 +if ${ac_cv_path_JTREGEXE+:} false; then :
1.1736 $as_echo_n "(cached) " >&6
1.1737 else
1.1738 case $JTREGEXE in
1.1739 @@ -16540,7 +16572,7 @@
1.1740 IFS=$as_save_IFS
1.1741 test -z "$as_dir" && as_dir=.
1.1742 for ac_exec_ext in '' $ac_executable_extensions; do
1.1743 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1744 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1745 ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
1.1746 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1747 break 2
1.1748 @@ -16594,7 +16626,7 @@
1.1749 set dummy link; ac_word=$2
1.1750 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1751 $as_echo_n "checking for $ac_word... " >&6; }
1.1752 -if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then :
1.1753 +if ${ac_cv_path_CYGWIN_LINK+:} false; then :
1.1754 $as_echo_n "(cached) " >&6
1.1755 else
1.1756 case $CYGWIN_LINK in
1.1757 @@ -16608,7 +16640,7 @@
1.1758 IFS=$as_save_IFS
1.1759 test -z "$as_dir" && as_dir=.
1.1760 for ac_exec_ext in '' $ac_executable_extensions; do
1.1761 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1762 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1763 ac_cv_path_CYGWIN_LINK="$as_dir/$ac_word$ac_exec_ext"
1.1764 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1765 break 2
1.1766 @@ -18037,7 +18069,7 @@
1.1767 set dummy $ac_prog; ac_word=$2
1.1768 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1769 $as_echo_n "checking for $ac_word... " >&6; }
1.1770 -if test "${ac_cv_path_BUILD_CC+set}" = set; then :
1.1771 +if ${ac_cv_path_BUILD_CC+:} false; then :
1.1772 $as_echo_n "(cached) " >&6
1.1773 else
1.1774 case $BUILD_CC in
1.1775 @@ -18051,7 +18083,7 @@
1.1776 IFS=$as_save_IFS
1.1777 test -z "$as_dir" && as_dir=.
1.1778 for ac_exec_ext in '' $ac_executable_extensions; do
1.1779 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1780 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1781 ac_cv_path_BUILD_CC="$as_dir/$ac_word$ac_exec_ext"
1.1782 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1783 break 2
1.1784 @@ -18348,7 +18380,7 @@
1.1785 set dummy $ac_prog; ac_word=$2
1.1786 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1787 $as_echo_n "checking for $ac_word... " >&6; }
1.1788 -if test "${ac_cv_path_BUILD_CXX+set}" = set; then :
1.1789 +if ${ac_cv_path_BUILD_CXX+:} false; then :
1.1790 $as_echo_n "(cached) " >&6
1.1791 else
1.1792 case $BUILD_CXX in
1.1793 @@ -18362,7 +18394,7 @@
1.1794 IFS=$as_save_IFS
1.1795 test -z "$as_dir" && as_dir=.
1.1796 for ac_exec_ext in '' $ac_executable_extensions; do
1.1797 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1798 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1799 ac_cv_path_BUILD_CXX="$as_dir/$ac_word$ac_exec_ext"
1.1800 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1801 break 2
1.1802 @@ -18657,7 +18689,7 @@
1.1803 set dummy ld; ac_word=$2
1.1804 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1805 $as_echo_n "checking for $ac_word... " >&6; }
1.1806 -if test "${ac_cv_path_BUILD_LD+set}" = set; then :
1.1807 +if ${ac_cv_path_BUILD_LD+:} false; then :
1.1808 $as_echo_n "(cached) " >&6
1.1809 else
1.1810 case $BUILD_LD in
1.1811 @@ -18671,7 +18703,7 @@
1.1812 IFS=$as_save_IFS
1.1813 test -z "$as_dir" && as_dir=.
1.1814 for ac_exec_ext in '' $ac_executable_extensions; do
1.1815 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1816 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1817 ac_cv_path_BUILD_LD="$as_dir/$ac_word$ac_exec_ext"
1.1818 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1819 break 2
1.1820 @@ -19164,7 +19196,7 @@
1.1821 set dummy $ac_prog; ac_word=$2
1.1822 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1823 $as_echo_n "checking for $ac_word... " >&6; }
1.1824 -if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then :
1.1825 +if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
1.1826 $as_echo_n "(cached) " >&6
1.1827 else
1.1828 case $TOOLS_DIR_CC in
1.1829 @@ -19178,7 +19210,7 @@
1.1830 IFS=$as_save_IFS
1.1831 test -z "$as_dir" && as_dir=.
1.1832 for ac_exec_ext in '' $ac_executable_extensions; do
1.1833 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1834 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1835 ac_cv_path_TOOLS_DIR_CC="$as_dir/$ac_word$ac_exec_ext"
1.1836 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1837 break 2
1.1838 @@ -19216,7 +19248,7 @@
1.1839 set dummy $ac_prog; ac_word=$2
1.1840 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1841 $as_echo_n "checking for $ac_word... " >&6; }
1.1842 -if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
1.1843 +if ${ac_cv_path_POTENTIAL_CC+:} false; then :
1.1844 $as_echo_n "(cached) " >&6
1.1845 else
1.1846 case $POTENTIAL_CC in
1.1847 @@ -19230,7 +19262,7 @@
1.1848 IFS=$as_save_IFS
1.1849 test -z "$as_dir" && as_dir=.
1.1850 for ac_exec_ext in '' $ac_executable_extensions; do
1.1851 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1852 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1853 ac_cv_path_POTENTIAL_CC="$as_dir/$ac_word$ac_exec_ext"
1.1854 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1855 break 2
1.1856 @@ -19629,7 +19661,7 @@
1.1857 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.1858 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1859 $as_echo_n "checking for $ac_word... " >&6; }
1.1860 -if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
1.1861 +if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
1.1862 $as_echo_n "(cached) " >&6
1.1863 else
1.1864 if test -n "$PROPER_COMPILER_CC"; then
1.1865 @@ -19641,7 +19673,7 @@
1.1866 IFS=$as_save_IFS
1.1867 test -z "$as_dir" && as_dir=.
1.1868 for ac_exec_ext in '' $ac_executable_extensions; do
1.1869 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1870 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1871 ac_cv_prog_PROPER_COMPILER_CC="$ac_tool_prefix$ac_prog"
1.1872 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1873 break 2
1.1874 @@ -19673,7 +19705,7 @@
1.1875 set dummy $ac_prog; ac_word=$2
1.1876 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1877 $as_echo_n "checking for $ac_word... " >&6; }
1.1878 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
1.1879 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
1.1880 $as_echo_n "(cached) " >&6
1.1881 else
1.1882 if test -n "$ac_ct_PROPER_COMPILER_CC"; then
1.1883 @@ -19685,7 +19717,7 @@
1.1884 IFS=$as_save_IFS
1.1885 test -z "$as_dir" && as_dir=.
1.1886 for ac_exec_ext in '' $ac_executable_extensions; do
1.1887 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1888 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1889 ac_cv_prog_ac_ct_PROPER_COMPILER_CC="$ac_prog"
1.1890 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1891 break 2
1.1892 @@ -20123,7 +20155,7 @@
1.1893 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.1894 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1895 $as_echo_n "checking for $ac_word... " >&6; }
1.1896 -if test "${ac_cv_prog_CC+set}" = set; then :
1.1897 +if ${ac_cv_prog_CC+:} false; then :
1.1898 $as_echo_n "(cached) " >&6
1.1899 else
1.1900 if test -n "$CC"; then
1.1901 @@ -20135,7 +20167,7 @@
1.1902 IFS=$as_save_IFS
1.1903 test -z "$as_dir" && as_dir=.
1.1904 for ac_exec_ext in '' $ac_executable_extensions; do
1.1905 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1906 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1907 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
1.1908 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1909 break 2
1.1910 @@ -20167,7 +20199,7 @@
1.1911 set dummy $ac_prog; ac_word=$2
1.1912 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1913 $as_echo_n "checking for $ac_word... " >&6; }
1.1914 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
1.1915 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
1.1916 $as_echo_n "(cached) " >&6
1.1917 else
1.1918 if test -n "$ac_ct_CC"; then
1.1919 @@ -20179,7 +20211,7 @@
1.1920 IFS=$as_save_IFS
1.1921 test -z "$as_dir" && as_dir=.
1.1922 for ac_exec_ext in '' $ac_executable_extensions; do
1.1923 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1924 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1925 ac_cv_prog_ac_ct_CC="$ac_prog"
1.1926 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1927 break 2
1.1928 @@ -20448,7 +20480,7 @@
1.1929 ac_clean_files=$ac_clean_files_save
1.1930 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
1.1931 $as_echo_n "checking for suffix of object files... " >&6; }
1.1932 -if test "${ac_cv_objext+set}" = set; then :
1.1933 +if ${ac_cv_objext+:} false; then :
1.1934 $as_echo_n "(cached) " >&6
1.1935 else
1.1936 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.1937 @@ -20499,7 +20531,7 @@
1.1938 ac_objext=$OBJEXT
1.1939 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
1.1940 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1.1941 -if test "${ac_cv_c_compiler_gnu+set}" = set; then :
1.1942 +if ${ac_cv_c_compiler_gnu+:} false; then :
1.1943 $as_echo_n "(cached) " >&6
1.1944 else
1.1945 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.1946 @@ -20536,7 +20568,7 @@
1.1947 ac_save_CFLAGS=$CFLAGS
1.1948 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
1.1949 $as_echo_n "checking whether $CC accepts -g... " >&6; }
1.1950 -if test "${ac_cv_prog_cc_g+set}" = set; then :
1.1951 +if ${ac_cv_prog_cc_g+:} false; then :
1.1952 $as_echo_n "(cached) " >&6
1.1953 else
1.1954 ac_save_c_werror_flag=$ac_c_werror_flag
1.1955 @@ -20614,7 +20646,7 @@
1.1956 fi
1.1957 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
1.1958 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
1.1959 -if test "${ac_cv_prog_cc_c89+set}" = set; then :
1.1960 +if ${ac_cv_prog_cc_c89+:} false; then :
1.1961 $as_echo_n "(cached) " >&6
1.1962 else
1.1963 ac_cv_prog_cc_c89=no
1.1964 @@ -20623,8 +20655,7 @@
1.1965 /* end confdefs.h. */
1.1966 #include <stdarg.h>
1.1967 #include <stdio.h>
1.1968 -#include <sys/types.h>
1.1969 -#include <sys/stat.h>
1.1970 +struct stat;
1.1971 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
1.1972 struct buf { int x; };
1.1973 FILE * (*rcsopen) (struct buf *, struct stat *, int);
1.1974 @@ -20737,7 +20768,7 @@
1.1975 set dummy $ac_prog; ac_word=$2
1.1976 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1977 $as_echo_n "checking for $ac_word... " >&6; }
1.1978 -if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then :
1.1979 +if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
1.1980 $as_echo_n "(cached) " >&6
1.1981 else
1.1982 case $TOOLS_DIR_CXX in
1.1983 @@ -20751,7 +20782,7 @@
1.1984 IFS=$as_save_IFS
1.1985 test -z "$as_dir" && as_dir=.
1.1986 for ac_exec_ext in '' $ac_executable_extensions; do
1.1987 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1988 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.1989 ac_cv_path_TOOLS_DIR_CXX="$as_dir/$ac_word$ac_exec_ext"
1.1990 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1991 break 2
1.1992 @@ -20789,7 +20820,7 @@
1.1993 set dummy $ac_prog; ac_word=$2
1.1994 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1995 $as_echo_n "checking for $ac_word... " >&6; }
1.1996 -if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
1.1997 +if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
1.1998 $as_echo_n "(cached) " >&6
1.1999 else
1.2000 case $POTENTIAL_CXX in
1.2001 @@ -20803,7 +20834,7 @@
1.2002 IFS=$as_save_IFS
1.2003 test -z "$as_dir" && as_dir=.
1.2004 for ac_exec_ext in '' $ac_executable_extensions; do
1.2005 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2006 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2007 ac_cv_path_POTENTIAL_CXX="$as_dir/$ac_word$ac_exec_ext"
1.2008 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2009 break 2
1.2010 @@ -21202,7 +21233,7 @@
1.2011 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.2012 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2013 $as_echo_n "checking for $ac_word... " >&6; }
1.2014 -if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
1.2015 +if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
1.2016 $as_echo_n "(cached) " >&6
1.2017 else
1.2018 if test -n "$PROPER_COMPILER_CXX"; then
1.2019 @@ -21214,7 +21245,7 @@
1.2020 IFS=$as_save_IFS
1.2021 test -z "$as_dir" && as_dir=.
1.2022 for ac_exec_ext in '' $ac_executable_extensions; do
1.2023 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2024 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2025 ac_cv_prog_PROPER_COMPILER_CXX="$ac_tool_prefix$ac_prog"
1.2026 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2027 break 2
1.2028 @@ -21246,7 +21277,7 @@
1.2029 set dummy $ac_prog; ac_word=$2
1.2030 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2031 $as_echo_n "checking for $ac_word... " >&6; }
1.2032 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
1.2033 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
1.2034 $as_echo_n "(cached) " >&6
1.2035 else
1.2036 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
1.2037 @@ -21258,7 +21289,7 @@
1.2038 IFS=$as_save_IFS
1.2039 test -z "$as_dir" && as_dir=.
1.2040 for ac_exec_ext in '' $ac_executable_extensions; do
1.2041 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2042 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2043 ac_cv_prog_ac_ct_PROPER_COMPILER_CXX="$ac_prog"
1.2044 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2045 break 2
1.2046 @@ -21700,7 +21731,7 @@
1.2047 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.2048 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2049 $as_echo_n "checking for $ac_word... " >&6; }
1.2050 -if test "${ac_cv_prog_CXX+set}" = set; then :
1.2051 +if ${ac_cv_prog_CXX+:} false; then :
1.2052 $as_echo_n "(cached) " >&6
1.2053 else
1.2054 if test -n "$CXX"; then
1.2055 @@ -21712,7 +21743,7 @@
1.2056 IFS=$as_save_IFS
1.2057 test -z "$as_dir" && as_dir=.
1.2058 for ac_exec_ext in '' $ac_executable_extensions; do
1.2059 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2060 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2061 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
1.2062 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2063 break 2
1.2064 @@ -21744,7 +21775,7 @@
1.2065 set dummy $ac_prog; ac_word=$2
1.2066 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2067 $as_echo_n "checking for $ac_word... " >&6; }
1.2068 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
1.2069 +if ${ac_cv_prog_ac_ct_CXX+:} false; then :
1.2070 $as_echo_n "(cached) " >&6
1.2071 else
1.2072 if test -n "$ac_ct_CXX"; then
1.2073 @@ -21756,7 +21787,7 @@
1.2074 IFS=$as_save_IFS
1.2075 test -z "$as_dir" && as_dir=.
1.2076 for ac_exec_ext in '' $ac_executable_extensions; do
1.2077 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2078 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2079 ac_cv_prog_ac_ct_CXX="$ac_prog"
1.2080 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2081 break 2
1.2082 @@ -21822,7 +21853,7 @@
1.2083
1.2084 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
1.2085 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
1.2086 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
1.2087 +if ${ac_cv_cxx_compiler_gnu+:} false; then :
1.2088 $as_echo_n "(cached) " >&6
1.2089 else
1.2090 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.2091 @@ -21859,7 +21890,7 @@
1.2092 ac_save_CXXFLAGS=$CXXFLAGS
1.2093 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
1.2094 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
1.2095 -if test "${ac_cv_prog_cxx_g+set}" = set; then :
1.2096 +if ${ac_cv_prog_cxx_g+:} false; then :
1.2097 $as_echo_n "(cached) " >&6
1.2098 else
1.2099 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
1.2100 @@ -21957,7 +21988,7 @@
1.2101 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.2102 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2103 $as_echo_n "checking for $ac_word... " >&6; }
1.2104 -if test "${ac_cv_prog_OBJC+set}" = set; then :
1.2105 +if ${ac_cv_prog_OBJC+:} false; then :
1.2106 $as_echo_n "(cached) " >&6
1.2107 else
1.2108 if test -n "$OBJC"; then
1.2109 @@ -21969,7 +22000,7 @@
1.2110 IFS=$as_save_IFS
1.2111 test -z "$as_dir" && as_dir=.
1.2112 for ac_exec_ext in '' $ac_executable_extensions; do
1.2113 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2114 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2115 ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog"
1.2116 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2117 break 2
1.2118 @@ -22001,7 +22032,7 @@
1.2119 set dummy $ac_prog; ac_word=$2
1.2120 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2121 $as_echo_n "checking for $ac_word... " >&6; }
1.2122 -if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
1.2123 +if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
1.2124 $as_echo_n "(cached) " >&6
1.2125 else
1.2126 if test -n "$ac_ct_OBJC"; then
1.2127 @@ -22013,7 +22044,7 @@
1.2128 IFS=$as_save_IFS
1.2129 test -z "$as_dir" && as_dir=.
1.2130 for ac_exec_ext in '' $ac_executable_extensions; do
1.2131 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2132 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2133 ac_cv_prog_ac_ct_OBJC="$ac_prog"
1.2134 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2135 break 2
1.2136 @@ -22077,7 +22108,7 @@
1.2137
1.2138 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
1.2139 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
1.2140 -if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
1.2141 +if ${ac_cv_objc_compiler_gnu+:} false; then :
1.2142 $as_echo_n "(cached) " >&6
1.2143 else
1.2144 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.2145 @@ -22114,7 +22145,7 @@
1.2146 ac_save_OBJCFLAGS=$OBJCFLAGS
1.2147 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
1.2148 $as_echo_n "checking whether $OBJC accepts -g... " >&6; }
1.2149 -if test "${ac_cv_prog_objc_g+set}" = set; then :
1.2150 +if ${ac_cv_prog_objc_g+:} false; then :
1.2151 $as_echo_n "(cached) " >&6
1.2152 else
1.2153 ac_save_objc_werror_flag=$ac_objc_werror_flag
1.2154 @@ -22490,7 +22521,7 @@
1.2155 set dummy ${ac_tool_prefix}ar; ac_word=$2
1.2156 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2157 $as_echo_n "checking for $ac_word... " >&6; }
1.2158 -if test "${ac_cv_prog_AR+set}" = set; then :
1.2159 +if ${ac_cv_prog_AR+:} false; then :
1.2160 $as_echo_n "(cached) " >&6
1.2161 else
1.2162 if test -n "$AR"; then
1.2163 @@ -22502,7 +22533,7 @@
1.2164 IFS=$as_save_IFS
1.2165 test -z "$as_dir" && as_dir=.
1.2166 for ac_exec_ext in '' $ac_executable_extensions; do
1.2167 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2168 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2169 ac_cv_prog_AR="${ac_tool_prefix}ar"
1.2170 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2171 break 2
1.2172 @@ -22530,7 +22561,7 @@
1.2173 set dummy ar; ac_word=$2
1.2174 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2175 $as_echo_n "checking for $ac_word... " >&6; }
1.2176 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
1.2177 +if ${ac_cv_prog_ac_ct_AR+:} false; then :
1.2178 $as_echo_n "(cached) " >&6
1.2179 else
1.2180 if test -n "$ac_ct_AR"; then
1.2181 @@ -22542,7 +22573,7 @@
1.2182 IFS=$as_save_IFS
1.2183 test -z "$as_dir" && as_dir=.
1.2184 for ac_exec_ext in '' $ac_executable_extensions; do
1.2185 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2186 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2187 ac_cv_prog_ac_ct_AR="ar"
1.2188 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2189 break 2
1.2190 @@ -22872,7 +22903,7 @@
1.2191 set dummy link; ac_word=$2
1.2192 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2193 $as_echo_n "checking for $ac_word... " >&6; }
1.2194 -if test "${ac_cv_prog_WINLD+set}" = set; then :
1.2195 +if ${ac_cv_prog_WINLD+:} false; then :
1.2196 $as_echo_n "(cached) " >&6
1.2197 else
1.2198 if test -n "$WINLD"; then
1.2199 @@ -22885,7 +22916,7 @@
1.2200 IFS=$as_save_IFS
1.2201 test -z "$as_dir" && as_dir=.
1.2202 for ac_exec_ext in '' $ac_executable_extensions; do
1.2203 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2204 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2205 if test "$as_dir/$ac_word$ac_exec_ext" = "$CYGWIN_LINK"; then
1.2206 ac_prog_rejected=yes
1.2207 continue
1.2208 @@ -23211,7 +23242,7 @@
1.2209 set dummy mt; ac_word=$2
1.2210 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2211 $as_echo_n "checking for $ac_word... " >&6; }
1.2212 -if test "${ac_cv_prog_MT+set}" = set; then :
1.2213 +if ${ac_cv_prog_MT+:} false; then :
1.2214 $as_echo_n "(cached) " >&6
1.2215 else
1.2216 if test -n "$MT"; then
1.2217 @@ -23224,7 +23255,7 @@
1.2218 IFS=$as_save_IFS
1.2219 test -z "$as_dir" && as_dir=.
1.2220 for ac_exec_ext in '' $ac_executable_extensions; do
1.2221 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2222 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2223 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/mt"; then
1.2224 ac_prog_rejected=yes
1.2225 continue
1.2226 @@ -23532,7 +23563,7 @@
1.2227 set dummy rc; ac_word=$2
1.2228 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2229 $as_echo_n "checking for $ac_word... " >&6; }
1.2230 -if test "${ac_cv_prog_RC+set}" = set; then :
1.2231 +if ${ac_cv_prog_RC+:} false; then :
1.2232 $as_echo_n "(cached) " >&6
1.2233 else
1.2234 if test -n "$RC"; then
1.2235 @@ -23545,7 +23576,7 @@
1.2236 IFS=$as_save_IFS
1.2237 test -z "$as_dir" && as_dir=.
1.2238 for ac_exec_ext in '' $ac_executable_extensions; do
1.2239 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2240 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2241 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/bin/rc"; then
1.2242 ac_prog_rejected=yes
1.2243 continue
1.2244 @@ -23924,7 +23955,7 @@
1.2245 set dummy lib; ac_word=$2
1.2246 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2247 $as_echo_n "checking for $ac_word... " >&6; }
1.2248 -if test "${ac_cv_prog_WINAR+set}" = set; then :
1.2249 +if ${ac_cv_prog_WINAR+:} false; then :
1.2250 $as_echo_n "(cached) " >&6
1.2251 else
1.2252 if test -n "$WINAR"; then
1.2253 @@ -23936,7 +23967,7 @@
1.2254 IFS=$as_save_IFS
1.2255 test -z "$as_dir" && as_dir=.
1.2256 for ac_exec_ext in '' $ac_executable_extensions; do
1.2257 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2258 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2259 ac_cv_prog_WINAR="lib"
1.2260 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2261 break 2
1.2262 @@ -24230,7 +24261,7 @@
1.2263 set dummy dumpbin; ac_word=$2
1.2264 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2265 $as_echo_n "checking for $ac_word... " >&6; }
1.2266 -if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
1.2267 +if ${ac_cv_prog_DUMPBIN+:} false; then :
1.2268 $as_echo_n "(cached) " >&6
1.2269 else
1.2270 if test -n "$DUMPBIN"; then
1.2271 @@ -24242,7 +24273,7 @@
1.2272 IFS=$as_save_IFS
1.2273 test -z "$as_dir" && as_dir=.
1.2274 for ac_exec_ext in '' $ac_executable_extensions; do
1.2275 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2276 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2277 ac_cv_prog_DUMPBIN="dumpbin"
1.2278 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2279 break 2
1.2280 @@ -24549,7 +24580,7 @@
1.2281 CPP=
1.2282 fi
1.2283 if test -z "$CPP"; then
1.2284 - if test "${ac_cv_prog_CPP+set}" = set; then :
1.2285 + if ${ac_cv_prog_CPP+:} false; then :
1.2286 $as_echo_n "(cached) " >&6
1.2287 else
1.2288 # Double quotes because CPP needs to be expanded
1.2289 @@ -24949,7 +24980,7 @@
1.2290 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
1.2291 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
1.2292 if test -z "$CXXCPP"; then
1.2293 - if test "${ac_cv_prog_CXXCPP+set}" = set; then :
1.2294 + if ${ac_cv_prog_CXXCPP+:} false; then :
1.2295 $as_echo_n "(cached) " >&6
1.2296 else
1.2297 # Double quotes because CXXCPP needs to be expanded
1.2298 @@ -25367,7 +25398,7 @@
1.2299 set dummy as; ac_word=$2
1.2300 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2301 $as_echo_n "checking for $ac_word... " >&6; }
1.2302 -if test "${ac_cv_path_AS+set}" = set; then :
1.2303 +if ${ac_cv_path_AS+:} false; then :
1.2304 $as_echo_n "(cached) " >&6
1.2305 else
1.2306 case $AS in
1.2307 @@ -25381,7 +25412,7 @@
1.2308 IFS=$as_save_IFS
1.2309 test -z "$as_dir" && as_dir=.
1.2310 for ac_exec_ext in '' $ac_executable_extensions; do
1.2311 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2312 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2313 ac_cv_path_AS="$as_dir/$ac_word$ac_exec_ext"
1.2314 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2315 break 2
1.2316 @@ -25679,7 +25710,7 @@
1.2317 set dummy nm; ac_word=$2
1.2318 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2319 $as_echo_n "checking for $ac_word... " >&6; }
1.2320 -if test "${ac_cv_path_NM+set}" = set; then :
1.2321 +if ${ac_cv_path_NM+:} false; then :
1.2322 $as_echo_n "(cached) " >&6
1.2323 else
1.2324 case $NM in
1.2325 @@ -25693,7 +25724,7 @@
1.2326 IFS=$as_save_IFS
1.2327 test -z "$as_dir" && as_dir=.
1.2328 for ac_exec_ext in '' $ac_executable_extensions; do
1.2329 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2330 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2331 ac_cv_path_NM="$as_dir/$ac_word$ac_exec_ext"
1.2332 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2333 break 2
1.2334 @@ -25985,7 +26016,7 @@
1.2335 set dummy gnm; ac_word=$2
1.2336 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2337 $as_echo_n "checking for $ac_word... " >&6; }
1.2338 -if test "${ac_cv_path_GNM+set}" = set; then :
1.2339 +if ${ac_cv_path_GNM+:} false; then :
1.2340 $as_echo_n "(cached) " >&6
1.2341 else
1.2342 case $GNM in
1.2343 @@ -25999,7 +26030,7 @@
1.2344 IFS=$as_save_IFS
1.2345 test -z "$as_dir" && as_dir=.
1.2346 for ac_exec_ext in '' $ac_executable_extensions; do
1.2347 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2348 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2349 ac_cv_path_GNM="$as_dir/$ac_word$ac_exec_ext"
1.2350 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2351 break 2
1.2352 @@ -26291,7 +26322,7 @@
1.2353 set dummy strip; ac_word=$2
1.2354 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2355 $as_echo_n "checking for $ac_word... " >&6; }
1.2356 -if test "${ac_cv_path_STRIP+set}" = set; then :
1.2357 +if ${ac_cv_path_STRIP+:} false; then :
1.2358 $as_echo_n "(cached) " >&6
1.2359 else
1.2360 case $STRIP in
1.2361 @@ -26305,7 +26336,7 @@
1.2362 IFS=$as_save_IFS
1.2363 test -z "$as_dir" && as_dir=.
1.2364 for ac_exec_ext in '' $ac_executable_extensions; do
1.2365 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2366 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2367 ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext"
1.2368 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2369 break 2
1.2370 @@ -26597,7 +26628,7 @@
1.2371 set dummy mcs; ac_word=$2
1.2372 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2373 $as_echo_n "checking for $ac_word... " >&6; }
1.2374 -if test "${ac_cv_path_MCS+set}" = set; then :
1.2375 +if ${ac_cv_path_MCS+:} false; then :
1.2376 $as_echo_n "(cached) " >&6
1.2377 else
1.2378 case $MCS in
1.2379 @@ -26611,7 +26642,7 @@
1.2380 IFS=$as_save_IFS
1.2381 test -z "$as_dir" && as_dir=.
1.2382 for ac_exec_ext in '' $ac_executable_extensions; do
1.2383 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2384 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2385 ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
1.2386 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2387 break 2
1.2388 @@ -26905,7 +26936,7 @@
1.2389 set dummy ${ac_tool_prefix}nm; ac_word=$2
1.2390 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2391 $as_echo_n "checking for $ac_word... " >&6; }
1.2392 -if test "${ac_cv_prog_NM+set}" = set; then :
1.2393 +if ${ac_cv_prog_NM+:} false; then :
1.2394 $as_echo_n "(cached) " >&6
1.2395 else
1.2396 if test -n "$NM"; then
1.2397 @@ -26917,7 +26948,7 @@
1.2398 IFS=$as_save_IFS
1.2399 test -z "$as_dir" && as_dir=.
1.2400 for ac_exec_ext in '' $ac_executable_extensions; do
1.2401 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2402 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2403 ac_cv_prog_NM="${ac_tool_prefix}nm"
1.2404 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2405 break 2
1.2406 @@ -26945,7 +26976,7 @@
1.2407 set dummy nm; ac_word=$2
1.2408 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2409 $as_echo_n "checking for $ac_word... " >&6; }
1.2410 -if test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
1.2411 +if ${ac_cv_prog_ac_ct_NM+:} false; then :
1.2412 $as_echo_n "(cached) " >&6
1.2413 else
1.2414 if test -n "$ac_ct_NM"; then
1.2415 @@ -26957,7 +26988,7 @@
1.2416 IFS=$as_save_IFS
1.2417 test -z "$as_dir" && as_dir=.
1.2418 for ac_exec_ext in '' $ac_executable_extensions; do
1.2419 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2420 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2421 ac_cv_prog_ac_ct_NM="nm"
1.2422 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2423 break 2
1.2424 @@ -27265,7 +27296,7 @@
1.2425 set dummy ${ac_tool_prefix}strip; ac_word=$2
1.2426 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2427 $as_echo_n "checking for $ac_word... " >&6; }
1.2428 -if test "${ac_cv_prog_STRIP+set}" = set; then :
1.2429 +if ${ac_cv_prog_STRIP+:} false; then :
1.2430 $as_echo_n "(cached) " >&6
1.2431 else
1.2432 if test -n "$STRIP"; then
1.2433 @@ -27277,7 +27308,7 @@
1.2434 IFS=$as_save_IFS
1.2435 test -z "$as_dir" && as_dir=.
1.2436 for ac_exec_ext in '' $ac_executable_extensions; do
1.2437 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2438 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2439 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
1.2440 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2441 break 2
1.2442 @@ -27305,7 +27336,7 @@
1.2443 set dummy strip; ac_word=$2
1.2444 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2445 $as_echo_n "checking for $ac_word... " >&6; }
1.2446 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
1.2447 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
1.2448 $as_echo_n "(cached) " >&6
1.2449 else
1.2450 if test -n "$ac_ct_STRIP"; then
1.2451 @@ -27317,7 +27348,7 @@
1.2452 IFS=$as_save_IFS
1.2453 test -z "$as_dir" && as_dir=.
1.2454 for ac_exec_ext in '' $ac_executable_extensions; do
1.2455 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2456 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2457 ac_cv_prog_ac_ct_STRIP="strip"
1.2458 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2459 break 2
1.2460 @@ -27630,7 +27661,7 @@
1.2461 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.2462 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2463 $as_echo_n "checking for $ac_word... " >&6; }
1.2464 -if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
1.2465 +if ${ac_cv_prog_OBJCOPY+:} false; then :
1.2466 $as_echo_n "(cached) " >&6
1.2467 else
1.2468 if test -n "$OBJCOPY"; then
1.2469 @@ -27642,7 +27673,7 @@
1.2470 IFS=$as_save_IFS
1.2471 test -z "$as_dir" && as_dir=.
1.2472 for ac_exec_ext in '' $ac_executable_extensions; do
1.2473 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2474 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2475 ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
1.2476 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2477 break 2
1.2478 @@ -27674,7 +27705,7 @@
1.2479 set dummy $ac_prog; ac_word=$2
1.2480 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2481 $as_echo_n "checking for $ac_word... " >&6; }
1.2482 -if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
1.2483 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
1.2484 $as_echo_n "(cached) " >&6
1.2485 else
1.2486 if test -n "$ac_ct_OBJCOPY"; then
1.2487 @@ -27686,7 +27717,7 @@
1.2488 IFS=$as_save_IFS
1.2489 test -z "$as_dir" && as_dir=.
1.2490 for ac_exec_ext in '' $ac_executable_extensions; do
1.2491 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2492 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2493 ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
1.2494 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2495 break 2
1.2496 @@ -28001,7 +28032,7 @@
1.2497 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.2498 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2499 $as_echo_n "checking for $ac_word... " >&6; }
1.2500 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
1.2501 +if ${ac_cv_prog_OBJDUMP+:} false; then :
1.2502 $as_echo_n "(cached) " >&6
1.2503 else
1.2504 if test -n "$OBJDUMP"; then
1.2505 @@ -28013,7 +28044,7 @@
1.2506 IFS=$as_save_IFS
1.2507 test -z "$as_dir" && as_dir=.
1.2508 for ac_exec_ext in '' $ac_executable_extensions; do
1.2509 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2510 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2511 ac_cv_prog_OBJDUMP="$ac_tool_prefix$ac_prog"
1.2512 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2513 break 2
1.2514 @@ -28045,7 +28076,7 @@
1.2515 set dummy $ac_prog; ac_word=$2
1.2516 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2517 $as_echo_n "checking for $ac_word... " >&6; }
1.2518 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
1.2519 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
1.2520 $as_echo_n "(cached) " >&6
1.2521 else
1.2522 if test -n "$ac_ct_OBJDUMP"; then
1.2523 @@ -28057,7 +28088,7 @@
1.2524 IFS=$as_save_IFS
1.2525 test -z "$as_dir" && as_dir=.
1.2526 for ac_exec_ext in '' $ac_executable_extensions; do
1.2527 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2528 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2529 ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
1.2530 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2531 break 2
1.2532 @@ -28369,7 +28400,7 @@
1.2533 set dummy lipo; ac_word=$2
1.2534 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2535 $as_echo_n "checking for $ac_word... " >&6; }
1.2536 -if test "${ac_cv_path_LIPO+set}" = set; then :
1.2537 +if ${ac_cv_path_LIPO+:} false; then :
1.2538 $as_echo_n "(cached) " >&6
1.2539 else
1.2540 case $LIPO in
1.2541 @@ -28383,7 +28414,7 @@
1.2542 IFS=$as_save_IFS
1.2543 test -z "$as_dir" && as_dir=.
1.2544 for ac_exec_ext in '' $ac_executable_extensions; do
1.2545 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2546 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2547 ac_cv_path_LIPO="$as_dir/$ac_word$ac_exec_ext"
1.2548 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2549 break 2
1.2550 @@ -28686,7 +28717,7 @@
1.2551
1.2552 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
1.2553 $as_echo_n "checking for ANSI C header files... " >&6; }
1.2554 -if test "${ac_cv_header_stdc+set}" = set; then :
1.2555 +if ${ac_cv_header_stdc+:} false; then :
1.2556 $as_echo_n "(cached) " >&6
1.2557 else
1.2558 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.2559 @@ -28826,17 +28857,16 @@
1.2560
1.2561 # keep track of c/cxx flags that we added outselves...
1.2562 # to prevent emitting warning...
1.2563 - ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.2564 - ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.2565 - ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.2566 -
1.2567 - CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
1.2568 - CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
1.2569 - LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
1.2570 -
1.2571 - CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
1.2572 - CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
1.2573 - LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
1.2574 + TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
1.2575 +
1.2576 +
1.2577 + CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}"
1.2578 + CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}"
1.2579 + LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}"
1.2580 +
1.2581 + CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.2582 + CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.2583 + LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.2584
1.2585 elif test "x$COMPILE_TYPE" = xreduced; then
1.2586 if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.2587 @@ -28844,17 +28874,16 @@
1.2588
1.2589 # keep track of c/cxx flags that we added outselves...
1.2590 # to prevent emitting warning...
1.2591 - ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.2592 - ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.2593 - ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.2594 -
1.2595 - CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
1.2596 - CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
1.2597 - LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
1.2598 -
1.2599 - CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
1.2600 - CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
1.2601 - LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
1.2602 + TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
1.2603 +
1.2604 +
1.2605 + CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}"
1.2606 + CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}"
1.2607 + LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}"
1.2608 +
1.2609 + CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.2610 + CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.2611 + LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.2612
1.2613 fi
1.2614 fi
1.2615 @@ -28863,7 +28892,7 @@
1.2616 for ac_header in stdio.h
1.2617 do :
1.2618 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
1.2619 -if test "x$ac_cv_header_stdio_h" = x""yes; then :
1.2620 +if test "x$ac_cv_header_stdio_h" = xyes; then :
1.2621 cat >>confdefs.h <<_ACEOF
1.2622 #define HAVE_STDIO_H 1
1.2623 _ACEOF
1.2624 @@ -28892,7 +28921,7 @@
1.2625 # This bug is HP SR number 8606223364.
1.2626 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
1.2627 $as_echo_n "checking size of int *... " >&6; }
1.2628 -if test "${ac_cv_sizeof_int_p+set}" = set; then :
1.2629 +if ${ac_cv_sizeof_int_p+:} false; then :
1.2630 $as_echo_n "(cached) " >&6
1.2631 else
1.2632 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then :
1.2633 @@ -28949,7 +28978,7 @@
1.2634 #
1.2635 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
1.2636 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
1.2637 -if test "${ac_cv_c_bigendian+set}" = set; then :
1.2638 +if ${ac_cv_c_bigendian+:} false; then :
1.2639 $as_echo_n "(cached) " >&6
1.2640 else
1.2641 ac_cv_c_bigendian=unknown
1.2642 @@ -29623,7 +29652,7 @@
1.2643 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DSOLARIS"
1.2644 fi
1.2645 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.2646 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE"
1.2647 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
1.2648 # Setting these parameters makes it an error to link to macosx APIs that are
1.2649 # newer than the given OS version and makes the linked binaries compatible even
1.2650 # if built on a newer version of the OS.
1.2651 @@ -30147,7 +30176,7 @@
1.2652 else
1.2653 case $x_includes,$x_libraries in #(
1.2654 *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
1.2655 - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
1.2656 + *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
1.2657 $as_echo_n "(cached) " >&6
1.2658 else
1.2659 # One or both of the vars are not set, and there is no cached value.
1.2660 @@ -30424,7 +30453,7 @@
1.2661 else
1.2662 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
1.2663 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
1.2664 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
1.2665 +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
1.2666 $as_echo_n "(cached) " >&6
1.2667 else
1.2668 ac_check_lib_save_LIBS=$LIBS
1.2669 @@ -30458,14 +30487,14 @@
1.2670 fi
1.2671 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
1.2672 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
1.2673 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
1.2674 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
1.2675 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
1.2676 fi
1.2677
1.2678 if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1.2679 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
1.2680 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
1.2681 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
1.2682 +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
1.2683 $as_echo_n "(cached) " >&6
1.2684 else
1.2685 ac_check_lib_save_LIBS=$LIBS
1.2686 @@ -30499,7 +30528,7 @@
1.2687 fi
1.2688 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
1.2689 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
1.2690 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
1.2691 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
1.2692 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
1.2693 fi
1.2694
1.2695 @@ -30518,14 +30547,14 @@
1.2696 # The functions gethostbyname, getservbyname, and inet_addr are
1.2697 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
1.2698 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
1.2699 -if test "x$ac_cv_func_gethostbyname" = x""yes; then :
1.2700 +if test "x$ac_cv_func_gethostbyname" = xyes; then :
1.2701
1.2702 fi
1.2703
1.2704 if test $ac_cv_func_gethostbyname = no; then
1.2705 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
1.2706 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
1.2707 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
1.2708 +if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
1.2709 $as_echo_n "(cached) " >&6
1.2710 else
1.2711 ac_check_lib_save_LIBS=$LIBS
1.2712 @@ -30559,14 +30588,14 @@
1.2713 fi
1.2714 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
1.2715 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
1.2716 -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
1.2717 +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
1.2718 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
1.2719 fi
1.2720
1.2721 if test $ac_cv_lib_nsl_gethostbyname = no; then
1.2722 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
1.2723 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
1.2724 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
1.2725 +if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
1.2726 $as_echo_n "(cached) " >&6
1.2727 else
1.2728 ac_check_lib_save_LIBS=$LIBS
1.2729 @@ -30600,7 +30629,7 @@
1.2730 fi
1.2731 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
1.2732 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
1.2733 -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
1.2734 +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
1.2735 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
1.2736 fi
1.2737
1.2738 @@ -30615,14 +30644,14 @@
1.2739 # must be given before -lnsl if both are needed. We assume that
1.2740 # if connect needs -lnsl, so does gethostbyname.
1.2741 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
1.2742 -if test "x$ac_cv_func_connect" = x""yes; then :
1.2743 +if test "x$ac_cv_func_connect" = xyes; then :
1.2744
1.2745 fi
1.2746
1.2747 if test $ac_cv_func_connect = no; then
1.2748 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
1.2749 $as_echo_n "checking for connect in -lsocket... " >&6; }
1.2750 -if test "${ac_cv_lib_socket_connect+set}" = set; then :
1.2751 +if ${ac_cv_lib_socket_connect+:} false; then :
1.2752 $as_echo_n "(cached) " >&6
1.2753 else
1.2754 ac_check_lib_save_LIBS=$LIBS
1.2755 @@ -30656,7 +30685,7 @@
1.2756 fi
1.2757 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
1.2758 $as_echo "$ac_cv_lib_socket_connect" >&6; }
1.2759 -if test "x$ac_cv_lib_socket_connect" = x""yes; then :
1.2760 +if test "x$ac_cv_lib_socket_connect" = xyes; then :
1.2761 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
1.2762 fi
1.2763
1.2764 @@ -30664,14 +30693,14 @@
1.2765
1.2766 # Guillermo Gomez says -lposix is necessary on A/UX.
1.2767 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove"
1.2768 -if test "x$ac_cv_func_remove" = x""yes; then :
1.2769 +if test "x$ac_cv_func_remove" = xyes; then :
1.2770
1.2771 fi
1.2772
1.2773 if test $ac_cv_func_remove = no; then
1.2774 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
1.2775 $as_echo_n "checking for remove in -lposix... " >&6; }
1.2776 -if test "${ac_cv_lib_posix_remove+set}" = set; then :
1.2777 +if ${ac_cv_lib_posix_remove+:} false; then :
1.2778 $as_echo_n "(cached) " >&6
1.2779 else
1.2780 ac_check_lib_save_LIBS=$LIBS
1.2781 @@ -30705,7 +30734,7 @@
1.2782 fi
1.2783 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
1.2784 $as_echo "$ac_cv_lib_posix_remove" >&6; }
1.2785 -if test "x$ac_cv_lib_posix_remove" = x""yes; then :
1.2786 +if test "x$ac_cv_lib_posix_remove" = xyes; then :
1.2787 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
1.2788 fi
1.2789
1.2790 @@ -30713,14 +30742,14 @@
1.2791
1.2792 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1.2793 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
1.2794 -if test "x$ac_cv_func_shmat" = x""yes; then :
1.2795 +if test "x$ac_cv_func_shmat" = xyes; then :
1.2796
1.2797 fi
1.2798
1.2799 if test $ac_cv_func_shmat = no; then
1.2800 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
1.2801 $as_echo_n "checking for shmat in -lipc... " >&6; }
1.2802 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
1.2803 +if ${ac_cv_lib_ipc_shmat+:} false; then :
1.2804 $as_echo_n "(cached) " >&6
1.2805 else
1.2806 ac_check_lib_save_LIBS=$LIBS
1.2807 @@ -30754,7 +30783,7 @@
1.2808 fi
1.2809 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
1.2810 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
1.2811 -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
1.2812 +if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
1.2813 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
1.2814 fi
1.2815
1.2816 @@ -30772,7 +30801,7 @@
1.2817 # John Interrante, Karl Berry
1.2818 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
1.2819 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
1.2820 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
1.2821 +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
1.2822 $as_echo_n "(cached) " >&6
1.2823 else
1.2824 ac_check_lib_save_LIBS=$LIBS
1.2825 @@ -30806,7 +30835,7 @@
1.2826 fi
1.2827 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
1.2828 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
1.2829 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
1.2830 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
1.2831 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
1.2832 fi
1.2833
1.2834 @@ -30887,7 +30916,7 @@
1.2835 CFLAGS="$CFLAGS $X_CFLAGS"
1.2836
1.2837 # Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
1.2838 -for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h
1.2839 +for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h
1.2840 do :
1.2841 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1.2842 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " # include <X11/Xlib.h>
1.2843 @@ -30940,7 +30969,7 @@
1.2844 HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
1.2845 fi
1.2846
1.2847 - as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG" "$LINENO" 5
1.2848 + as_fn_error $? "Could not find all X11 headers (shape.h Xrender.h XTest.h Intrinsic.h). $HELP_MSG" "$LINENO" 5
1.2849 fi
1.2850
1.2851
1.2852 @@ -31824,7 +31853,7 @@
1.2853 LDFLAGS="$FREETYPE2_LIBS"
1.2854 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
1.2855 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
1.2856 -if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
1.2857 +if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
1.2858 $as_echo_n "(cached) " >&6
1.2859 else
1.2860 ac_check_lib_save_LIBS=$LIBS
1.2861 @@ -31858,7 +31887,7 @@
1.2862 fi
1.2863 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
1.2864 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
1.2865 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then :
1.2866 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
1.2867 FREETYPE2_FOUND=true
1.2868 else
1.2869 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
1.2870 @@ -32146,7 +32175,7 @@
1.2871 for ac_header in alsa/asoundlib.h
1.2872 do :
1.2873 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
1.2874 -if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then :
1.2875 +if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
1.2876 cat >>confdefs.h <<_ACEOF
1.2877 #define HAVE_ALSA_ASOUNDLIB_H 1
1.2878 _ACEOF
1.2879 @@ -32205,7 +32234,7 @@
1.2880 USE_EXTERNAL_LIBJPEG=true
1.2881 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
1.2882 $as_echo_n "checking for main in -ljpeg... " >&6; }
1.2883 -if test "${ac_cv_lib_jpeg_main+set}" = set; then :
1.2884 +if ${ac_cv_lib_jpeg_main+:} false; then :
1.2885 $as_echo_n "(cached) " >&6
1.2886 else
1.2887 ac_check_lib_save_LIBS=$LIBS
1.2888 @@ -32233,7 +32262,7 @@
1.2889 fi
1.2890 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
1.2891 $as_echo "$ac_cv_lib_jpeg_main" >&6; }
1.2892 -if test "x$ac_cv_lib_jpeg_main" = x""yes; then :
1.2893 +if test "x$ac_cv_lib_jpeg_main" = xyes; then :
1.2894 cat >>confdefs.h <<_ACEOF
1.2895 #define HAVE_LIBJPEG 1
1.2896 _ACEOF
1.2897 @@ -32282,7 +32311,7 @@
1.2898 USE_EXTERNAL_LIBGIF=false
1.2899 elif test "x${with_giflib}" = "xsystem"; then
1.2900 ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
1.2901 -if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
1.2902 +if test "x$ac_cv_header_gif_lib_h" = xyes; then :
1.2903
1.2904 else
1.2905 as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5
1.2906 @@ -32291,7 +32320,7 @@
1.2907
1.2908 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5
1.2909 $as_echo_n "checking for DGifGetCode in -lgif... " >&6; }
1.2910 -if test "${ac_cv_lib_gif_DGifGetCode+set}" = set; then :
1.2911 +if ${ac_cv_lib_gif_DGifGetCode+:} false; then :
1.2912 $as_echo_n "(cached) " >&6
1.2913 else
1.2914 ac_check_lib_save_LIBS=$LIBS
1.2915 @@ -32325,7 +32354,7 @@
1.2916 fi
1.2917 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5
1.2918 $as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; }
1.2919 -if test "x$ac_cv_lib_gif_DGifGetCode" = x""yes; then :
1.2920 +if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then :
1.2921 cat >>confdefs.h <<_ACEOF
1.2922 #define HAVE_LIBGIF 1
1.2923 _ACEOF
1.2924 @@ -32357,7 +32386,7 @@
1.2925
1.2926 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
1.2927 $as_echo_n "checking for compress in -lz... " >&6; }
1.2928 -if test "${ac_cv_lib_z_compress+set}" = set; then :
1.2929 +if ${ac_cv_lib_z_compress+:} false; then :
1.2930 $as_echo_n "(cached) " >&6
1.2931 else
1.2932 ac_check_lib_save_LIBS=$LIBS
1.2933 @@ -32391,7 +32420,7 @@
1.2934 fi
1.2935 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
1.2936 $as_echo "$ac_cv_lib_z_compress" >&6; }
1.2937 -if test "x$ac_cv_lib_z_compress" = x""yes; then :
1.2938 +if test "x$ac_cv_lib_z_compress" = xyes; then :
1.2939 ZLIB_FOUND=yes
1.2940 else
1.2941 ZLIB_FOUND=no
1.2942 @@ -32484,7 +32513,7 @@
1.2943
1.2944 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
1.2945 $as_echo_n "checking for cos in -lm... " >&6; }
1.2946 -if test "${ac_cv_lib_m_cos+set}" = set; then :
1.2947 +if ${ac_cv_lib_m_cos+:} false; then :
1.2948 $as_echo_n "(cached) " >&6
1.2949 else
1.2950 ac_check_lib_save_LIBS=$LIBS
1.2951 @@ -32518,7 +32547,7 @@
1.2952 fi
1.2953 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
1.2954 $as_echo "$ac_cv_lib_m_cos" >&6; }
1.2955 -if test "x$ac_cv_lib_m_cos" = x""yes; then :
1.2956 +if test "x$ac_cv_lib_m_cos" = xyes; then :
1.2957 cat >>confdefs.h <<_ACEOF
1.2958 #define HAVE_LIBM 1
1.2959 _ACEOF
1.2960 @@ -32542,7 +32571,7 @@
1.2961 LIBS=""
1.2962 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
1.2963 $as_echo_n "checking for dlopen in -ldl... " >&6; }
1.2964 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
1.2965 +if ${ac_cv_lib_dl_dlopen+:} false; then :
1.2966 $as_echo_n "(cached) " >&6
1.2967 else
1.2968 ac_check_lib_save_LIBS=$LIBS
1.2969 @@ -32576,7 +32605,7 @@
1.2970 fi
1.2971 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
1.2972 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
1.2973 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
1.2974 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
1.2975 cat >>confdefs.h <<_ACEOF
1.2976 #define HAVE_LIBDL 1
1.2977 _ACEOF
1.2978 @@ -32822,7 +32851,7 @@
1.2979 set dummy llvm-config; ac_word=$2
1.2980 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2981 $as_echo_n "checking for $ac_word... " >&6; }
1.2982 -if test "${ac_cv_prog_LLVM_CONFIG+set}" = set; then :
1.2983 +if ${ac_cv_prog_LLVM_CONFIG+:} false; then :
1.2984 $as_echo_n "(cached) " >&6
1.2985 else
1.2986 if test -n "$LLVM_CONFIG"; then
1.2987 @@ -32834,7 +32863,7 @@
1.2988 IFS=$as_save_IFS
1.2989 test -z "$as_dir" && as_dir=.
1.2990 for ac_exec_ext in '' $ac_executable_extensions; do
1.2991 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.2992 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2993 ac_cv_prog_LLVM_CONFIG="llvm-config"
1.2994 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2995 break 2
1.2996 @@ -33438,7 +33467,7 @@
1.2997 set dummy ccache; ac_word=$2
1.2998 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2999 $as_echo_n "checking for $ac_word... " >&6; }
1.3000 -if test "${ac_cv_path_CCACHE+set}" = set; then :
1.3001 +if ${ac_cv_path_CCACHE+:} false; then :
1.3002 $as_echo_n "(cached) " >&6
1.3003 else
1.3004 case $CCACHE in
1.3005 @@ -33452,7 +33481,7 @@
1.3006 IFS=$as_save_IFS
1.3007 test -z "$as_dir" && as_dir=.
1.3008 for ac_exec_ext in '' $ac_executable_extensions; do
1.3009 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.3010 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.3011 ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext"
1.3012 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.3013 break 2
1.3014 @@ -33700,10 +33729,21 @@
1.3015 :end' >>confcache
1.3016 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
1.3017 if test -w "$cache_file"; then
1.3018 - test "x$cache_file" != "x/dev/null" &&
1.3019 + if test "x$cache_file" != "x/dev/null"; then
1.3020 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
1.3021 $as_echo "$as_me: updating cache $cache_file" >&6;}
1.3022 - cat confcache >$cache_file
1.3023 + if test ! -f "$cache_file" || test -h "$cache_file"; then
1.3024 + cat confcache >"$cache_file"
1.3025 + else
1.3026 + case $cache_file in #(
1.3027 + */* | ?:*)
1.3028 + mv -f confcache "$cache_file"$$ &&
1.3029 + mv -f "$cache_file"$$ "$cache_file" ;; #(
1.3030 + *)
1.3031 + mv -f confcache "$cache_file" ;;
1.3032 + esac
1.3033 + fi
1.3034 + fi
1.3035 else
1.3036 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
1.3037 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
1.3038 @@ -33735,7 +33775,7 @@
1.3039
1.3040
1.3041
1.3042 -: ${CONFIG_STATUS=./config.status}
1.3043 +: "${CONFIG_STATUS=./config.status}"
1.3044 ac_write_fail=0
1.3045 ac_clean_files_save=$ac_clean_files
1.3046 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
1.3047 @@ -33836,6 +33876,7 @@
1.3048 IFS=" "" $as_nl"
1.3049
1.3050 # Find who we are. Look in the path if we contain no directory separator.
1.3051 +as_myself=
1.3052 case $0 in #((
1.3053 *[\\/]* ) as_myself=$0 ;;
1.3054 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.3055 @@ -34031,16 +34072,16 @@
1.3056 # ... but there are two gotchas:
1.3057 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
1.3058 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
1.3059 - # In both cases, we have to default to `cp -p'.
1.3060 + # In both cases, we have to default to `cp -pR'.
1.3061 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
1.3062 - as_ln_s='cp -p'
1.3063 + as_ln_s='cp -pR'
1.3064 elif ln conf$$.file conf$$ 2>/dev/null; then
1.3065 as_ln_s=ln
1.3066 else
1.3067 - as_ln_s='cp -p'
1.3068 - fi
1.3069 -else
1.3070 - as_ln_s='cp -p'
1.3071 + as_ln_s='cp -pR'
1.3072 + fi
1.3073 +else
1.3074 + as_ln_s='cp -pR'
1.3075 fi
1.3076 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
1.3077 rmdir conf$$.dir 2>/dev/null
1.3078 @@ -34100,28 +34141,16 @@
1.3079 as_mkdir_p=false
1.3080 fi
1.3081
1.3082 -if test -x / >/dev/null 2>&1; then
1.3083 - as_test_x='test -x'
1.3084 -else
1.3085 - if ls -dL / >/dev/null 2>&1; then
1.3086 - as_ls_L_option=L
1.3087 - else
1.3088 - as_ls_L_option=
1.3089 - fi
1.3090 - as_test_x='
1.3091 - eval sh -c '\''
1.3092 - if test -d "$1"; then
1.3093 - test -d "$1/.";
1.3094 - else
1.3095 - case $1 in #(
1.3096 - -*)set "./$1";;
1.3097 - esac;
1.3098 - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
1.3099 - ???[sx]*):;;*)false;;esac;fi
1.3100 - '\'' sh
1.3101 - '
1.3102 -fi
1.3103 -as_executable_p=$as_test_x
1.3104 +
1.3105 +# as_fn_executable_p FILE
1.3106 +# -----------------------
1.3107 +# Test if FILE is an executable regular file.
1.3108 +as_fn_executable_p ()
1.3109 +{
1.3110 + test -f "$1" && test -x "$1"
1.3111 +} # as_fn_executable_p
1.3112 +as_test_x='test -x'
1.3113 +as_executable_p=as_fn_executable_p
1.3114
1.3115 # Sed expression to map a string onto a valid CPP name.
1.3116 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
1.3117 @@ -34143,7 +34172,7 @@
1.3118 # values after options handling.
1.3119 ac_log="
1.3120 This file was extended by OpenJDK $as_me jdk8, which was
1.3121 -generated by GNU Autoconf 2.67. Invocation command line was
1.3122 +generated by GNU Autoconf 2.69. Invocation command line was
1.3123
1.3124 CONFIG_FILES = $CONFIG_FILES
1.3125 CONFIG_HEADERS = $CONFIG_HEADERS
1.3126 @@ -34206,10 +34235,10 @@
1.3127 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1.3128 ac_cs_version="\\
1.3129 OpenJDK config.status jdk8
1.3130 -configured by $0, generated by GNU Autoconf 2.67,
1.3131 +configured by $0, generated by GNU Autoconf 2.69,
1.3132 with options \\"\$ac_cs_config\\"
1.3133
1.3134 -Copyright (C) 2010 Free Software Foundation, Inc.
1.3135 +Copyright (C) 2012 Free Software Foundation, Inc.
1.3136 This config.status script is free software; the Free Software Foundation
1.3137 gives unlimited permission to copy, distribute and modify it."
1.3138
1.3139 @@ -34298,7 +34327,7 @@
1.3140 _ACEOF
1.3141 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.3142 if \$ac_cs_recheck; then
1.3143 - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
1.3144 + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
1.3145 shift
1.3146 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
1.3147 CONFIG_SHELL='$SHELL'
1.3148 @@ -34357,9 +34386,10 @@
1.3149 # after its creation but before its name has been assigned to `$tmp'.
1.3150 $debug ||
1.3151 {
1.3152 - tmp=
1.3153 + tmp= ac_tmp=
1.3154 trap 'exit_status=$?
1.3155 - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
1.3156 + : "${ac_tmp:=$tmp}"
1.3157 + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
1.3158 ' 0
1.3159 trap 'as_fn_exit 1' 1 2 13 15
1.3160 }
1.3161 @@ -34367,12 +34397,13 @@
1.3162
1.3163 {
1.3164 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
1.3165 - test -n "$tmp" && test -d "$tmp"
1.3166 + test -d "$tmp"
1.3167 } ||
1.3168 {
1.3169 tmp=./conf$$-$RANDOM
1.3170 (umask 077 && mkdir "$tmp")
1.3171 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
1.3172 +ac_tmp=$tmp
1.3173
1.3174 # Set up the scripts for CONFIG_FILES section.
1.3175 # No need to generate them if there are no CONFIG_FILES.
1.3176 @@ -34394,7 +34425,7 @@
1.3177 ac_cs_awk_cr=$ac_cr
1.3178 fi
1.3179
1.3180 -echo 'BEGIN {' >"$tmp/subs1.awk" &&
1.3181 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
1.3182 _ACEOF
1.3183
1.3184
1.3185 @@ -34422,7 +34453,7 @@
1.3186 rm -f conf$$subs.sh
1.3187
1.3188 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.3189 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
1.3190 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
1.3191 _ACEOF
1.3192 sed -n '
1.3193 h
1.3194 @@ -34470,7 +34501,7 @@
1.3195 rm -f conf$$subs.awk
1.3196 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.3197 _ACAWK
1.3198 -cat >>"\$tmp/subs1.awk" <<_ACAWK &&
1.3199 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
1.3200 for (key in S) S_is_set[key] = 1
1.3201 FS = ""
1.3202
1.3203 @@ -34502,7 +34533,7 @@
1.3204 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
1.3205 else
1.3206 cat
1.3207 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
1.3208 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
1.3209 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
1.3210 _ACEOF
1.3211
1.3212 @@ -34536,7 +34567,7 @@
1.3213 # No need to generate them if there are no CONFIG_HEADERS.
1.3214 # This happens for instance with `./config.status Makefile'.
1.3215 if test -n "$CONFIG_HEADERS"; then
1.3216 -cat >"$tmp/defines.awk" <<\_ACAWK ||
1.3217 +cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
1.3218 BEGIN {
1.3219 _ACEOF
1.3220
1.3221 @@ -34548,8 +34579,8 @@
1.3222 # handling of long lines.
1.3223 ac_delim='%!_!# '
1.3224 for ac_last_try in false false :; do
1.3225 - ac_t=`sed -n "/$ac_delim/p" confdefs.h`
1.3226 - if test -z "$ac_t"; then
1.3227 + ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
1.3228 + if test -z "$ac_tt"; then
1.3229 break
1.3230 elif $ac_last_try; then
1.3231 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
1.3232 @@ -34669,7 +34700,7 @@
1.3233 for ac_f
1.3234 do
1.3235 case $ac_f in
1.3236 - -) ac_f="$tmp/stdin";;
1.3237 + -) ac_f="$ac_tmp/stdin";;
1.3238 *) # Look for the file first in the build tree, then in the source tree
1.3239 # (if the path is not absolute). The absolute path cannot be DOS-style,
1.3240 # because $ac_f cannot contain `:'.
1.3241 @@ -34704,7 +34735,7 @@
1.3242 esac
1.3243
1.3244 case $ac_tag in
1.3245 - *:-:* | *:-) cat >"$tmp/stdin" \
1.3246 + *:-:* | *:-) cat >"$ac_tmp/stdin" \
1.3247 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
1.3248 esac
1.3249 ;;
1.3250 @@ -34830,21 +34861,22 @@
1.3251 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
1.3252 $ac_datarootdir_hack
1.3253 "
1.3254 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
1.3255 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.3256 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
1.3257 + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.3258
1.3259 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
1.3260 - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
1.3261 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
1.3262 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
1.3263 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
1.3264 + "$ac_tmp/out"`; test -z "$ac_out"; } &&
1.3265 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1.3266 which seems to be undefined. Please make sure it is defined" >&5
1.3267 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1.3268 which seems to be undefined. Please make sure it is defined" >&2;}
1.3269
1.3270 - rm -f "$tmp/stdin"
1.3271 + rm -f "$ac_tmp/stdin"
1.3272 case $ac_file in
1.3273 - -) cat "$tmp/out" && rm -f "$tmp/out";;
1.3274 - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
1.3275 + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
1.3276 + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
1.3277 esac \
1.3278 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.3279 ;;
1.3280 @@ -34855,20 +34887,20 @@
1.3281 if test x"$ac_file" != x-; then
1.3282 {
1.3283 $as_echo "/* $configure_input */" \
1.3284 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
1.3285 - } >"$tmp/config.h" \
1.3286 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
1.3287 + } >"$ac_tmp/config.h" \
1.3288 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.3289 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
1.3290 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
1.3291 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
1.3292 $as_echo "$as_me: $ac_file is unchanged" >&6;}
1.3293 else
1.3294 rm -f "$ac_file"
1.3295 - mv "$tmp/config.h" "$ac_file" \
1.3296 + mv "$ac_tmp/config.h" "$ac_file" \
1.3297 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.3298 fi
1.3299 else
1.3300 $as_echo "/* $configure_input */" \
1.3301 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
1.3302 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
1.3303 || as_fn_error $? "could not create -" "$LINENO" 5
1.3304 fi
1.3305 ;;
