1.1 --- a/common/autoconf/generated-configure.sh Thu May 30 16:00:16 2013 -0400
1.2 +++ b/common/autoconf/generated-configure.sh Mon Jun 10 16:15:16 2013 -0400
1.3 @@ -1,6 +1,6 @@
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.68 for OpenJDK jdk8.
1.8 #
1.9 # Report bugs to <build-dev@openjdk.java.net>.
1.10 #
1.11 @@ -91,6 +91,7 @@
1.12 IFS=" "" $as_nl"
1.13
1.14 # Find who we are. Look in the path if we contain no directory separator.
1.15 +as_myself=
1.16 case $0 in #((
1.17 *[\\/]* ) as_myself=$0 ;;
1.18 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.19 @@ -216,11 +217,18 @@
1.20 # We cannot yet assume a decent shell, so we have to provide a
1.21 # neutralization value for shells without unset; and this also
1.22 # works around shells that cannot unset nonexistent variables.
1.23 + # Preserve -v and -x to the replacement shell.
1.24 BASH_ENV=/dev/null
1.25 ENV=/dev/null
1.26 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
1.27 export CONFIG_SHELL
1.28 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1.29 + case $- in # ((((
1.30 + *v*x* | *x*v* ) as_opts=-vx ;;
1.31 + *v* ) as_opts=-v ;;
1.32 + *x* ) as_opts=-x ;;
1.33 + * ) as_opts= ;;
1.34 + esac
1.35 + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
1.36 fi
1.37
1.38 if test x$as_have_required = xno; then :
1.39 @@ -681,8 +689,8 @@
1.40 SHARED_LIBRARY
1.41 OBJ_SUFFIX
1.42 COMPILER_NAME
1.43 +JT_HOME
1.44 JTREGEXE
1.45 -JT_HOME
1.46 LIPO
1.47 ac_ct_OBJDUMP
1.48 OBJDUMP
1.49 @@ -797,6 +805,7 @@
1.50 OS_VERSION_MINOR
1.51 OS_VERSION_MAJOR
1.52 PKG_CONFIG
1.53 +CODESIGN
1.54 XATTR
1.55 TIME
1.56 STAT
1.57 @@ -900,7 +909,6 @@
1.58 SORT
1.59 SH
1.60 RM
1.61 -THEPWDCMD
1.62 PRINTF
1.63 MV
1.64 MKTEMP
1.65 @@ -988,6 +996,7 @@
1.66 with_cacerts_file
1.67 enable_unlimited_crypto
1.68 with_milestone
1.69 +with_update_version
1.70 with_build_number
1.71 with_user_release_suffix
1.72 with_boot_jdk
1.73 @@ -1459,7 +1468,7 @@
1.74 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1.75 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1.76 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1.77 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
1.78 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
1.79 ;;
1.80
1.81 esac
1.82 @@ -1727,6 +1736,7 @@
1.83 group
1.84 --with-cacerts-file specify alternative cacerts file
1.85 --with-milestone Set milestone value for build [internal]
1.86 + --with-update-version Set update version value for build [b00]
1.87 --with-build-number Set build number value for build [b00]
1.88 --with-user-release-suffix
1.89 Add a custom string to the version string if build
1.90 @@ -1894,7 +1904,7 @@
1.91 if $ac_init_version; then
1.92 cat <<\_ACEOF
1.93 OpenJDK configure jdk8
1.94 -generated by GNU Autoconf 2.67
1.95 +generated by GNU Autoconf 2.68
1.96
1.97 Copyright (C) 2010 Free Software Foundation, Inc.
1.98 This configure script is free software; the Free Software Foundation
1.99 @@ -1940,7 +1950,7 @@
1.100
1.101 ac_retval=1
1.102 fi
1.103 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.104 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.105 as_fn_set_status $ac_retval
1.106
1.107 } # ac_fn_c_try_compile
1.108 @@ -1978,7 +1988,7 @@
1.109
1.110 ac_retval=1
1.111 fi
1.112 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.113 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.114 as_fn_set_status $ac_retval
1.115
1.116 } # ac_fn_cxx_try_compile
1.117 @@ -2016,7 +2026,7 @@
1.118
1.119 ac_retval=1
1.120 fi
1.121 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.122 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.123 as_fn_set_status $ac_retval
1.124
1.125 } # ac_fn_objc_try_compile
1.126 @@ -2053,7 +2063,7 @@
1.127
1.128 ac_retval=1
1.129 fi
1.130 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.131 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.132 as_fn_set_status $ac_retval
1.133
1.134 } # ac_fn_c_try_cpp
1.135 @@ -2090,7 +2100,7 @@
1.136
1.137 ac_retval=1
1.138 fi
1.139 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.140 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.141 as_fn_set_status $ac_retval
1.142
1.143 } # ac_fn_cxx_try_cpp
1.144 @@ -2103,10 +2113,10 @@
1.145 ac_fn_cxx_check_header_mongrel ()
1.146 {
1.147 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.148 - if eval "test \"\${$3+set}\"" = set; then :
1.149 + if eval \${$3+:} false; then :
1.150 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.151 $as_echo_n "checking for $2... " >&6; }
1.152 -if eval "test \"\${$3+set}\"" = set; then :
1.153 +if eval \${$3+:} false; then :
1.154 $as_echo_n "(cached) " >&6
1.155 fi
1.156 eval ac_res=\$$3
1.157 @@ -2173,7 +2183,7 @@
1.158 esac
1.159 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.160 $as_echo_n "checking for $2... " >&6; }
1.161 -if eval "test \"\${$3+set}\"" = set; then :
1.162 +if eval \${$3+:} false; then :
1.163 $as_echo_n "(cached) " >&6
1.164 else
1.165 eval "$3=\$ac_header_compiler"
1.166 @@ -2182,7 +2192,7 @@
1.167 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.168 $as_echo "$ac_res" >&6; }
1.169 fi
1.170 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.171 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.172
1.173 } # ac_fn_cxx_check_header_mongrel
1.174
1.175 @@ -2223,7 +2233,7 @@
1.176 ac_retval=$ac_status
1.177 fi
1.178 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1.179 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.180 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.181 as_fn_set_status $ac_retval
1.182
1.183 } # ac_fn_cxx_try_run
1.184 @@ -2237,7 +2247,7 @@
1.185 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.186 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.187 $as_echo_n "checking for $2... " >&6; }
1.188 -if eval "test \"\${$3+set}\"" = set; then :
1.189 +if eval \${$3+:} false; then :
1.190 $as_echo_n "(cached) " >&6
1.191 else
1.192 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.193 @@ -2255,7 +2265,7 @@
1.194 eval ac_res=\$$3
1.195 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.196 $as_echo "$ac_res" >&6; }
1.197 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.198 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.199
1.200 } # ac_fn_cxx_check_header_compile
1.201
1.202 @@ -2432,7 +2442,7 @@
1.203 rm -f conftest.val
1.204
1.205 fi
1.206 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.207 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.208 as_fn_set_status $ac_retval
1.209
1.210 } # ac_fn_cxx_compute_int
1.211 @@ -2478,7 +2488,7 @@
1.212 # interfere with the next link command; also delete a directory that is
1.213 # left behind by Apple's compiler. We do this before executing the actions.
1.214 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1.215 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.216 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.217 as_fn_set_status $ac_retval
1.218
1.219 } # ac_fn_cxx_try_link
1.220 @@ -2491,7 +2501,7 @@
1.221 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.222 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.223 $as_echo_n "checking for $2... " >&6; }
1.224 -if eval "test \"\${$3+set}\"" = set; then :
1.225 +if eval \${$3+:} false; then :
1.226 $as_echo_n "(cached) " >&6
1.227 else
1.228 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.229 @@ -2546,7 +2556,7 @@
1.230 eval ac_res=\$$3
1.231 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.232 $as_echo "$ac_res" >&6; }
1.233 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.234 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.235
1.236 } # ac_fn_cxx_check_func
1.237
1.238 @@ -2559,7 +2569,7 @@
1.239 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.240 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.241 $as_echo_n "checking for $2... " >&6; }
1.242 -if eval "test \"\${$3+set}\"" = set; then :
1.243 +if eval \${$3+:} false; then :
1.244 $as_echo_n "(cached) " >&6
1.245 else
1.246 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.247 @@ -2577,7 +2587,7 @@
1.248 eval ac_res=\$$3
1.249 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.250 $as_echo "$ac_res" >&6; }
1.251 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.252 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.253
1.254 } # ac_fn_c_check_header_compile
1.255 cat >config.log <<_ACEOF
1.256 @@ -2585,7 +2595,7 @@
1.257 running configure, to aid debugging if configure makes a mistake.
1.258
1.259 It was created by OpenJDK $as_me jdk8, which was
1.260 -generated by GNU Autoconf 2.67. Invocation command line was
1.261 +generated by GNU Autoconf 2.68. Invocation command line was
1.262
1.263 $ $0 $@
1.264
1.265 @@ -3780,7 +3790,7 @@
1.266 #CUSTOM_AUTOCONF_INCLUDE
1.267
1.268 # Do not change or remove the following line, it is needed for consistency checks:
1.269 -DATE_WHEN_GENERATED=1369723814
1.270 +DATE_WHEN_GENERATED=1370470729
1.271
1.272 ###############################################################################
1.273 #
1.274 @@ -3818,7 +3828,7 @@
1.275 set dummy $ac_prog; ac_word=$2
1.276 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.277 $as_echo_n "checking for $ac_word... " >&6; }
1.278 -if test "${ac_cv_path_BASENAME+set}" = set; then :
1.279 +if ${ac_cv_path_BASENAME+:} false; then :
1.280 $as_echo_n "(cached) " >&6
1.281 else
1.282 case $BASENAME in
1.283 @@ -3877,7 +3887,7 @@
1.284 set dummy $ac_prog; ac_word=$2
1.285 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.286 $as_echo_n "checking for $ac_word... " >&6; }
1.287 -if test "${ac_cv_path_BASH+set}" = set; then :
1.288 +if ${ac_cv_path_BASH+:} false; then :
1.289 $as_echo_n "(cached) " >&6
1.290 else
1.291 case $BASH in
1.292 @@ -3936,7 +3946,7 @@
1.293 set dummy $ac_prog; ac_word=$2
1.294 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.295 $as_echo_n "checking for $ac_word... " >&6; }
1.296 -if test "${ac_cv_path_CAT+set}" = set; then :
1.297 +if ${ac_cv_path_CAT+:} false; then :
1.298 $as_echo_n "(cached) " >&6
1.299 else
1.300 case $CAT in
1.301 @@ -3995,7 +4005,7 @@
1.302 set dummy $ac_prog; ac_word=$2
1.303 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.304 $as_echo_n "checking for $ac_word... " >&6; }
1.305 -if test "${ac_cv_path_CHMOD+set}" = set; then :
1.306 +if ${ac_cv_path_CHMOD+:} false; then :
1.307 $as_echo_n "(cached) " >&6
1.308 else
1.309 case $CHMOD in
1.310 @@ -4054,7 +4064,7 @@
1.311 set dummy $ac_prog; ac_word=$2
1.312 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.313 $as_echo_n "checking for $ac_word... " >&6; }
1.314 -if test "${ac_cv_path_CMP+set}" = set; then :
1.315 +if ${ac_cv_path_CMP+:} false; then :
1.316 $as_echo_n "(cached) " >&6
1.317 else
1.318 case $CMP in
1.319 @@ -4113,7 +4123,7 @@
1.320 set dummy $ac_prog; ac_word=$2
1.321 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.322 $as_echo_n "checking for $ac_word... " >&6; }
1.323 -if test "${ac_cv_path_COMM+set}" = set; then :
1.324 +if ${ac_cv_path_COMM+:} false; then :
1.325 $as_echo_n "(cached) " >&6
1.326 else
1.327 case $COMM in
1.328 @@ -4172,7 +4182,7 @@
1.329 set dummy $ac_prog; ac_word=$2
1.330 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.331 $as_echo_n "checking for $ac_word... " >&6; }
1.332 -if test "${ac_cv_path_CP+set}" = set; then :
1.333 +if ${ac_cv_path_CP+:} false; then :
1.334 $as_echo_n "(cached) " >&6
1.335 else
1.336 case $CP in
1.337 @@ -4231,7 +4241,7 @@
1.338 set dummy $ac_prog; ac_word=$2
1.339 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.340 $as_echo_n "checking for $ac_word... " >&6; }
1.341 -if test "${ac_cv_path_CPIO+set}" = set; then :
1.342 +if ${ac_cv_path_CPIO+:} false; then :
1.343 $as_echo_n "(cached) " >&6
1.344 else
1.345 case $CPIO in
1.346 @@ -4290,7 +4300,7 @@
1.347 set dummy $ac_prog; ac_word=$2
1.348 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.349 $as_echo_n "checking for $ac_word... " >&6; }
1.350 -if test "${ac_cv_path_CUT+set}" = set; then :
1.351 +if ${ac_cv_path_CUT+:} false; then :
1.352 $as_echo_n "(cached) " >&6
1.353 else
1.354 case $CUT in
1.355 @@ -4349,7 +4359,7 @@
1.356 set dummy $ac_prog; ac_word=$2
1.357 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.358 $as_echo_n "checking for $ac_word... " >&6; }
1.359 -if test "${ac_cv_path_DATE+set}" = set; then :
1.360 +if ${ac_cv_path_DATE+:} false; then :
1.361 $as_echo_n "(cached) " >&6
1.362 else
1.363 case $DATE in
1.364 @@ -4408,7 +4418,7 @@
1.365 set dummy $ac_prog; ac_word=$2
1.366 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.367 $as_echo_n "checking for $ac_word... " >&6; }
1.368 -if test "${ac_cv_path_DIFF+set}" = set; then :
1.369 +if ${ac_cv_path_DIFF+:} false; then :
1.370 $as_echo_n "(cached) " >&6
1.371 else
1.372 case $DIFF in
1.373 @@ -4467,7 +4477,7 @@
1.374 set dummy $ac_prog; ac_word=$2
1.375 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.376 $as_echo_n "checking for $ac_word... " >&6; }
1.377 -if test "${ac_cv_path_DIRNAME+set}" = set; then :
1.378 +if ${ac_cv_path_DIRNAME+:} false; then :
1.379 $as_echo_n "(cached) " >&6
1.380 else
1.381 case $DIRNAME in
1.382 @@ -4526,7 +4536,7 @@
1.383 set dummy $ac_prog; ac_word=$2
1.384 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.385 $as_echo_n "checking for $ac_word... " >&6; }
1.386 -if test "${ac_cv_path_ECHO+set}" = set; then :
1.387 +if ${ac_cv_path_ECHO+:} false; then :
1.388 $as_echo_n "(cached) " >&6
1.389 else
1.390 case $ECHO in
1.391 @@ -4585,7 +4595,7 @@
1.392 set dummy $ac_prog; ac_word=$2
1.393 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.394 $as_echo_n "checking for $ac_word... " >&6; }
1.395 -if test "${ac_cv_path_EXPR+set}" = set; then :
1.396 +if ${ac_cv_path_EXPR+:} false; then :
1.397 $as_echo_n "(cached) " >&6
1.398 else
1.399 case $EXPR in
1.400 @@ -4644,7 +4654,7 @@
1.401 set dummy $ac_prog; ac_word=$2
1.402 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.403 $as_echo_n "checking for $ac_word... " >&6; }
1.404 -if test "${ac_cv_path_FILE+set}" = set; then :
1.405 +if ${ac_cv_path_FILE+:} false; then :
1.406 $as_echo_n "(cached) " >&6
1.407 else
1.408 case $FILE in
1.409 @@ -4703,7 +4713,7 @@
1.410 set dummy $ac_prog; ac_word=$2
1.411 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.412 $as_echo_n "checking for $ac_word... " >&6; }
1.413 -if test "${ac_cv_path_FIND+set}" = set; then :
1.414 +if ${ac_cv_path_FIND+:} false; then :
1.415 $as_echo_n "(cached) " >&6
1.416 else
1.417 case $FIND in
1.418 @@ -4762,7 +4772,7 @@
1.419 set dummy $ac_prog; ac_word=$2
1.420 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.421 $as_echo_n "checking for $ac_word... " >&6; }
1.422 -if test "${ac_cv_path_HEAD+set}" = set; then :
1.423 +if ${ac_cv_path_HEAD+:} false; then :
1.424 $as_echo_n "(cached) " >&6
1.425 else
1.426 case $HEAD in
1.427 @@ -4821,7 +4831,7 @@
1.428 set dummy $ac_prog; ac_word=$2
1.429 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.430 $as_echo_n "checking for $ac_word... " >&6; }
1.431 -if test "${ac_cv_path_LN+set}" = set; then :
1.432 +if ${ac_cv_path_LN+:} false; then :
1.433 $as_echo_n "(cached) " >&6
1.434 else
1.435 case $LN in
1.436 @@ -4880,7 +4890,7 @@
1.437 set dummy $ac_prog; ac_word=$2
1.438 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.439 $as_echo_n "checking for $ac_word... " >&6; }
1.440 -if test "${ac_cv_path_LS+set}" = set; then :
1.441 +if ${ac_cv_path_LS+:} false; then :
1.442 $as_echo_n "(cached) " >&6
1.443 else
1.444 case $LS in
1.445 @@ -4939,7 +4949,7 @@
1.446 set dummy $ac_prog; ac_word=$2
1.447 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.448 $as_echo_n "checking for $ac_word... " >&6; }
1.449 -if test "${ac_cv_path_MKDIR+set}" = set; then :
1.450 +if ${ac_cv_path_MKDIR+:} false; then :
1.451 $as_echo_n "(cached) " >&6
1.452 else
1.453 case $MKDIR in
1.454 @@ -4998,7 +5008,7 @@
1.455 set dummy $ac_prog; ac_word=$2
1.456 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.457 $as_echo_n "checking for $ac_word... " >&6; }
1.458 -if test "${ac_cv_path_MKTEMP+set}" = set; then :
1.459 +if ${ac_cv_path_MKTEMP+:} false; then :
1.460 $as_echo_n "(cached) " >&6
1.461 else
1.462 case $MKTEMP in
1.463 @@ -5057,7 +5067,7 @@
1.464 set dummy $ac_prog; ac_word=$2
1.465 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.466 $as_echo_n "checking for $ac_word... " >&6; }
1.467 -if test "${ac_cv_path_MV+set}" = set; then :
1.468 +if ${ac_cv_path_MV+:} false; then :
1.469 $as_echo_n "(cached) " >&6
1.470 else
1.471 case $MV in
1.472 @@ -5116,7 +5126,7 @@
1.473 set dummy $ac_prog; ac_word=$2
1.474 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.475 $as_echo_n "checking for $ac_word... " >&6; }
1.476 -if test "${ac_cv_path_PRINTF+set}" = set; then :
1.477 +if ${ac_cv_path_PRINTF+:} false; then :
1.478 $as_echo_n "(cached) " >&6
1.479 else
1.480 case $PRINTF in
1.481 @@ -5169,72 +5179,13 @@
1.482
1.483
1.484
1.485 - for ac_prog in pwd
1.486 -do
1.487 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.488 -set dummy $ac_prog; ac_word=$2
1.489 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.490 -$as_echo_n "checking for $ac_word... " >&6; }
1.491 -if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
1.492 - $as_echo_n "(cached) " >&6
1.493 -else
1.494 - case $THEPWDCMD in
1.495 - [\\/]* | ?:[\\/]*)
1.496 - ac_cv_path_THEPWDCMD="$THEPWDCMD" # Let the user override the test with a path.
1.497 - ;;
1.498 - *)
1.499 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.500 -for as_dir in $PATH
1.501 -do
1.502 - IFS=$as_save_IFS
1.503 - test -z "$as_dir" && as_dir=.
1.504 - for ac_exec_ext in '' $ac_executable_extensions; do
1.505 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.506 - ac_cv_path_THEPWDCMD="$as_dir/$ac_word$ac_exec_ext"
1.507 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.508 - break 2
1.509 - fi
1.510 -done
1.511 - done
1.512 -IFS=$as_save_IFS
1.513 -
1.514 - ;;
1.515 -esac
1.516 -fi
1.517 -THEPWDCMD=$ac_cv_path_THEPWDCMD
1.518 -if test -n "$THEPWDCMD"; then
1.519 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THEPWDCMD" >&5
1.520 -$as_echo "$THEPWDCMD" >&6; }
1.521 -else
1.522 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.523 -$as_echo "no" >&6; }
1.524 -fi
1.525 -
1.526 -
1.527 - test -n "$THEPWDCMD" && break
1.528 -done
1.529 -
1.530 -
1.531 - if test "x$THEPWDCMD" = x; then
1.532 - if test "xpwd" = x; then
1.533 - PROG_NAME=thepwdcmd
1.534 - else
1.535 - PROG_NAME=pwd
1.536 - fi
1.537 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.538 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.539 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.540 - fi
1.541 -
1.542 -
1.543 -
1.544 for ac_prog in rm
1.545 do
1.546 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.547 set dummy $ac_prog; ac_word=$2
1.548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.549 $as_echo_n "checking for $ac_word... " >&6; }
1.550 -if test "${ac_cv_path_RM+set}" = set; then :
1.551 +if ${ac_cv_path_RM+:} false; then :
1.552 $as_echo_n "(cached) " >&6
1.553 else
1.554 case $RM in
1.555 @@ -5293,7 +5244,7 @@
1.556 set dummy $ac_prog; ac_word=$2
1.557 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.558 $as_echo_n "checking for $ac_word... " >&6; }
1.559 -if test "${ac_cv_path_SH+set}" = set; then :
1.560 +if ${ac_cv_path_SH+:} false; then :
1.561 $as_echo_n "(cached) " >&6
1.562 else
1.563 case $SH in
1.564 @@ -5352,7 +5303,7 @@
1.565 set dummy $ac_prog; ac_word=$2
1.566 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.567 $as_echo_n "checking for $ac_word... " >&6; }
1.568 -if test "${ac_cv_path_SORT+set}" = set; then :
1.569 +if ${ac_cv_path_SORT+:} false; then :
1.570 $as_echo_n "(cached) " >&6
1.571 else
1.572 case $SORT in
1.573 @@ -5411,7 +5362,7 @@
1.574 set dummy $ac_prog; ac_word=$2
1.575 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.576 $as_echo_n "checking for $ac_word... " >&6; }
1.577 -if test "${ac_cv_path_TAIL+set}" = set; then :
1.578 +if ${ac_cv_path_TAIL+:} false; then :
1.579 $as_echo_n "(cached) " >&6
1.580 else
1.581 case $TAIL in
1.582 @@ -5470,7 +5421,7 @@
1.583 set dummy $ac_prog; ac_word=$2
1.584 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.585 $as_echo_n "checking for $ac_word... " >&6; }
1.586 -if test "${ac_cv_path_TAR+set}" = set; then :
1.587 +if ${ac_cv_path_TAR+:} false; then :
1.588 $as_echo_n "(cached) " >&6
1.589 else
1.590 case $TAR in
1.591 @@ -5529,7 +5480,7 @@
1.592 set dummy $ac_prog; ac_word=$2
1.593 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.594 $as_echo_n "checking for $ac_word... " >&6; }
1.595 -if test "${ac_cv_path_TEE+set}" = set; then :
1.596 +if ${ac_cv_path_TEE+:} false; then :
1.597 $as_echo_n "(cached) " >&6
1.598 else
1.599 case $TEE in
1.600 @@ -5588,7 +5539,7 @@
1.601 set dummy $ac_prog; ac_word=$2
1.602 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.603 $as_echo_n "checking for $ac_word... " >&6; }
1.604 -if test "${ac_cv_path_TOUCH+set}" = set; then :
1.605 +if ${ac_cv_path_TOUCH+:} false; then :
1.606 $as_echo_n "(cached) " >&6
1.607 else
1.608 case $TOUCH in
1.609 @@ -5647,7 +5598,7 @@
1.610 set dummy $ac_prog; ac_word=$2
1.611 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.612 $as_echo_n "checking for $ac_word... " >&6; }
1.613 -if test "${ac_cv_path_TR+set}" = set; then :
1.614 +if ${ac_cv_path_TR+:} false; then :
1.615 $as_echo_n "(cached) " >&6
1.616 else
1.617 case $TR in
1.618 @@ -5706,7 +5657,7 @@
1.619 set dummy $ac_prog; ac_word=$2
1.620 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.621 $as_echo_n "checking for $ac_word... " >&6; }
1.622 -if test "${ac_cv_path_UNAME+set}" = set; then :
1.623 +if ${ac_cv_path_UNAME+:} false; then :
1.624 $as_echo_n "(cached) " >&6
1.625 else
1.626 case $UNAME in
1.627 @@ -5765,7 +5716,7 @@
1.628 set dummy $ac_prog; ac_word=$2
1.629 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.630 $as_echo_n "checking for $ac_word... " >&6; }
1.631 -if test "${ac_cv_path_UNIQ+set}" = set; then :
1.632 +if ${ac_cv_path_UNIQ+:} false; then :
1.633 $as_echo_n "(cached) " >&6
1.634 else
1.635 case $UNIQ in
1.636 @@ -5824,7 +5775,7 @@
1.637 set dummy $ac_prog; ac_word=$2
1.638 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.639 $as_echo_n "checking for $ac_word... " >&6; }
1.640 -if test "${ac_cv_path_WC+set}" = set; then :
1.641 +if ${ac_cv_path_WC+:} false; then :
1.642 $as_echo_n "(cached) " >&6
1.643 else
1.644 case $WC in
1.645 @@ -5883,7 +5834,7 @@
1.646 set dummy $ac_prog; ac_word=$2
1.647 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.648 $as_echo_n "checking for $ac_word... " >&6; }
1.649 -if test "${ac_cv_path_WHICH+set}" = set; then :
1.650 +if ${ac_cv_path_WHICH+:} false; then :
1.651 $as_echo_n "(cached) " >&6
1.652 else
1.653 case $WHICH in
1.654 @@ -5942,7 +5893,7 @@
1.655 set dummy $ac_prog; ac_word=$2
1.656 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.657 $as_echo_n "checking for $ac_word... " >&6; }
1.658 -if test "${ac_cv_path_XARGS+set}" = set; then :
1.659 +if ${ac_cv_path_XARGS+:} false; then :
1.660 $as_echo_n "(cached) " >&6
1.661 else
1.662 case $XARGS in
1.663 @@ -6002,7 +5953,7 @@
1.664 set dummy $ac_prog; ac_word=$2
1.665 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.666 $as_echo_n "checking for $ac_word... " >&6; }
1.667 -if test "${ac_cv_prog_AWK+set}" = set; then :
1.668 +if ${ac_cv_prog_AWK+:} false; then :
1.669 $as_echo_n "(cached) " >&6
1.670 else
1.671 if test -n "$AWK"; then
1.672 @@ -6052,7 +6003,7 @@
1.673
1.674 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
1.675 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
1.676 -if test "${ac_cv_path_GREP+set}" = set; then :
1.677 +if ${ac_cv_path_GREP+:} false; then :
1.678 $as_echo_n "(cached) " >&6
1.679 else
1.680 if test -z "$GREP"; then
1.681 @@ -6127,7 +6078,7 @@
1.682
1.683 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
1.684 $as_echo_n "checking for egrep... " >&6; }
1.685 -if test "${ac_cv_path_EGREP+set}" = set; then :
1.686 +if ${ac_cv_path_EGREP+:} false; then :
1.687 $as_echo_n "(cached) " >&6
1.688 else
1.689 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
1.690 @@ -6206,7 +6157,7 @@
1.691
1.692 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
1.693 $as_echo_n "checking for fgrep... " >&6; }
1.694 -if test "${ac_cv_path_FGREP+set}" = set; then :
1.695 +if ${ac_cv_path_FGREP+:} false; then :
1.696 $as_echo_n "(cached) " >&6
1.697 else
1.698 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
1.699 @@ -6285,7 +6236,7 @@
1.700
1.701 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
1.702 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
1.703 -if test "${ac_cv_path_SED+set}" = set; then :
1.704 +if ${ac_cv_path_SED+:} false; then :
1.705 $as_echo_n "(cached) " >&6
1.706 else
1.707 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
1.708 @@ -6371,7 +6322,7 @@
1.709 set dummy $ac_prog; ac_word=$2
1.710 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.711 $as_echo_n "checking for $ac_word... " >&6; }
1.712 -if test "${ac_cv_path_NAWK+set}" = set; then :
1.713 +if ${ac_cv_path_NAWK+:} false; then :
1.714 $as_echo_n "(cached) " >&6
1.715 else
1.716 case $NAWK in
1.717 @@ -6426,12 +6377,16 @@
1.718 # Always force rm.
1.719 RM="$RM -f"
1.720
1.721 +# pwd behaves differently on various platforms and some don't support the -L flag.
1.722 +# Always use the bash builtin pwd to get uniform behavior.
1.723 +THEPWDCMD=pwd
1.724 +
1.725 # These are not required on all platforms
1.726 # Extract the first word of "cygpath", so it can be a program name with args.
1.727 set dummy cygpath; ac_word=$2
1.728 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.729 $as_echo_n "checking for $ac_word... " >&6; }
1.730 -if test "${ac_cv_path_CYGPATH+set}" = set; then :
1.731 +if ${ac_cv_path_CYGPATH+:} false; then :
1.732 $as_echo_n "(cached) " >&6
1.733 else
1.734 case $CYGPATH in
1.735 @@ -6471,7 +6426,7 @@
1.736 set dummy readlink; ac_word=$2
1.737 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.738 $as_echo_n "checking for $ac_word... " >&6; }
1.739 -if test "${ac_cv_path_READLINK+set}" = set; then :
1.740 +if ${ac_cv_path_READLINK+:} false; then :
1.741 $as_echo_n "(cached) " >&6
1.742 else
1.743 case $READLINK in
1.744 @@ -6511,7 +6466,7 @@
1.745 set dummy df; ac_word=$2
1.746 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.747 $as_echo_n "checking for $ac_word... " >&6; }
1.748 -if test "${ac_cv_path_DF+set}" = set; then :
1.749 +if ${ac_cv_path_DF+:} false; then :
1.750 $as_echo_n "(cached) " >&6
1.751 else
1.752 case $DF in
1.753 @@ -6551,7 +6506,7 @@
1.754 set dummy SetFile; ac_word=$2
1.755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.756 $as_echo_n "checking for $ac_word... " >&6; }
1.757 -if test "${ac_cv_path_SETFILE+set}" = set; then :
1.758 +if ${ac_cv_path_SETFILE+:} false; then :
1.759 $as_echo_n "(cached) " >&6
1.760 else
1.761 case $SETFILE in
1.762 @@ -6597,7 +6552,7 @@
1.763
1.764 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
1.765 $as_echo_n "checking build system type... " >&6; }
1.766 -if test "${ac_cv_build+set}" = set; then :
1.767 +if ${ac_cv_build+:} false; then :
1.768 $as_echo_n "(cached) " >&6
1.769 else
1.770 ac_build_alias=$build_alias
1.771 @@ -6631,7 +6586,7 @@
1.772
1.773 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
1.774 $as_echo_n "checking host system type... " >&6; }
1.775 -if test "${ac_cv_host+set}" = set; then :
1.776 +if ${ac_cv_host+:} false; then :
1.777 $as_echo_n "(cached) " >&6
1.778 else
1.779 if test "x$host_alias" = x; then
1.780 @@ -6664,7 +6619,7 @@
1.781
1.782 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
1.783 $as_echo_n "checking target system type... " >&6; }
1.784 -if test "${ac_cv_target+set}" = set; then :
1.785 +if ${ac_cv_target+:} false; then :
1.786 $as_echo_n "(cached) " >&6
1.787 else
1.788 if test "x$target_alias" = x; then
1.789 @@ -7133,65 +7088,17 @@
1.790
1.791 # Locate the directory of this script.
1.792 SCRIPT="$0"
1.793 -
1.794 - if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.795 - # Follow a chain of symbolic links. Use readlink
1.796 - # where it exists, else fall back to horribly
1.797 - # complicated shell code.
1.798 - if test "x$READLINK_TESTED" != yes; then
1.799 - # On MacOSX there is a readlink tool with a different
1.800 - # purpose than the GNU readlink tool. Check the found readlink.
1.801 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.802 - if test "x$ISGNU" = x; then
1.803 - # A readlink that we do not know how to use.
1.804 - # Are there other non-GNU readlinks out there?
1.805 - READLINK_TESTED=yes
1.806 - READLINK=
1.807 - fi
1.808 - fi
1.809 -
1.810 - if test "x$READLINK" != x; then
1.811 - SCRIPT=`$READLINK -f $SCRIPT`
1.812 - else
1.813 - # Save the current directory for restoring afterwards
1.814 - STARTDIR=$PWD
1.815 - COUNTER=0
1.816 - sym_link_dir=`$DIRNAME $SCRIPT`
1.817 - sym_link_file=`$BASENAME $SCRIPT`
1.818 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.819 - cd $sym_link_dir
1.820 - cd `$THEPWDCMD`
1.821 - sym_link_dir=`$THEPWDCMD`
1.822 - # Resolve file symlinks
1.823 - while test $COUNTER -lt 20; do
1.824 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.825 - if test "x$ISLINK" == x; then
1.826 - # This is not a symbolic link! We are done!
1.827 - break
1.828 - fi
1.829 - # Again resolve directory symlinks since the target of the just found
1.830 - # link could be in a different directory
1.831 - cd `$DIRNAME $ISLINK`
1.832 - sym_link_dir=`$THEPWDCMD`
1.833 - sym_link_file=`$BASENAME $ISLINK`
1.834 - let COUNTER=COUNTER+1
1.835 - done
1.836 - cd $STARTDIR
1.837 - SCRIPT=$sym_link_dir/$sym_link_file
1.838 - fi
1.839 - fi
1.840 -
1.841 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
1.842 +AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
1.843
1.844 # Where is the source? It is located two levels above the configure script.
1.845 CURDIR="$PWD"
1.846 cd "$AUTOCONF_DIR/../.."
1.847 -SRC_ROOT="`$THEPWDCMD`"
1.848 +SRC_ROOT="`$THEPWDCMD -L`"
1.849
1.850 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.851 PATH_SEP=";"
1.852
1.853 - SRC_ROOT_LENGTH=`$THEPWDCMD|$WC -m`
1.854 + SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
1.855 if test $SRC_ROOT_LENGTH -gt 100; then
1.856 as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
1.857 fi
1.858 @@ -7407,7 +7314,7 @@
1.859 as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
1.860 fi
1.861
1.862 - SRC_ROOT="`cd "$path"; $THEPWDCMD`"
1.863 + SRC_ROOT="`cd "$path"; $THEPWDCMD -L`"
1.864 fi
1.865
1.866
1.867 @@ -7529,7 +7436,7 @@
1.868 as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5
1.869 fi
1.870
1.871 - CURDIR="`cd "$path"; $THEPWDCMD`"
1.872 + CURDIR="`cd "$path"; $THEPWDCMD -L`"
1.873 fi
1.874
1.875
1.876 @@ -7900,60 +7807,9 @@
1.877
1.878
1.879 # Test from where we are running configure, in or outside of src root.
1.880 -# To enable comparison of directories, CURDIR needs to be symlink free
1.881 -# just like SRC_ROOT already is
1.882 -NOSYM_CURDIR="$CURDIR"
1.883 -
1.884 - if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.885 - # Follow a chain of symbolic links. Use readlink
1.886 - # where it exists, else fall back to horribly
1.887 - # complicated shell code.
1.888 - if test "x$READLINK_TESTED" != yes; then
1.889 - # On MacOSX there is a readlink tool with a different
1.890 - # purpose than the GNU readlink tool. Check the found readlink.
1.891 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.892 - if test "x$ISGNU" = x; then
1.893 - # A readlink that we do not know how to use.
1.894 - # Are there other non-GNU readlinks out there?
1.895 - READLINK_TESTED=yes
1.896 - READLINK=
1.897 - fi
1.898 - fi
1.899 -
1.900 - if test "x$READLINK" != x; then
1.901 - NOSYM_CURDIR=`$READLINK -f $NOSYM_CURDIR`
1.902 - else
1.903 - # Save the current directory for restoring afterwards
1.904 - STARTDIR=$PWD
1.905 - COUNTER=0
1.906 - sym_link_dir=`$DIRNAME $NOSYM_CURDIR`
1.907 - sym_link_file=`$BASENAME $NOSYM_CURDIR`
1.908 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.909 - cd $sym_link_dir
1.910 - cd `$THEPWDCMD`
1.911 - sym_link_dir=`$THEPWDCMD`
1.912 - # Resolve file symlinks
1.913 - while test $COUNTER -lt 20; do
1.914 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.915 - if test "x$ISLINK" == x; then
1.916 - # This is not a symbolic link! We are done!
1.917 - break
1.918 - fi
1.919 - # Again resolve directory symlinks since the target of the just found
1.920 - # link could be in a different directory
1.921 - cd `$DIRNAME $ISLINK`
1.922 - sym_link_dir=`$THEPWDCMD`
1.923 - sym_link_file=`$BASENAME $ISLINK`
1.924 - let COUNTER=COUNTER+1
1.925 - done
1.926 - cd $STARTDIR
1.927 - NOSYM_CURDIR=$sym_link_dir/$sym_link_file
1.928 - fi
1.929 - fi
1.930 -
1.931 -if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \
1.932 - || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \
1.933 - || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
1.934 +if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
1.935 + || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
1.936 + || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
1.937 # We are running configure from the src root.
1.938 # Create a default ./build/target-variant-debuglevel output root.
1.939 if test "x${CONF_NAME}" = x; then
1.940 @@ -8128,7 +7984,7 @@
1.941 as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
1.942 fi
1.943
1.944 - OUTPUT_ROOT="`cd "$path"; $THEPWDCMD`"
1.945 + OUTPUT_ROOT="`cd "$path"; $THEPWDCMD -L`"
1.946 fi
1.947
1.948
1.949 @@ -8175,7 +8031,7 @@
1.950 set dummy $ac_prog; ac_word=$2
1.951 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.952 $as_echo_n "checking for $ac_word... " >&6; }
1.953 -if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
1.954 +if ${ac_cv_prog_PKGHANDLER+:} false; then :
1.955 $as_echo_n "(cached) " >&6
1.956 else
1.957 if test -n "$PKGHANDLER"; then
1.958 @@ -8540,7 +8396,7 @@
1.959 set dummy $ac_prog; ac_word=$2
1.960 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.961 $as_echo_n "checking for $ac_word... " >&6; }
1.962 -if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
1.963 +if ${ac_cv_path_CHECK_GMAKE+:} false; then :
1.964 $as_echo_n "(cached) " >&6
1.965 else
1.966 case $CHECK_GMAKE in
1.967 @@ -8894,7 +8750,7 @@
1.968 set dummy $ac_prog; ac_word=$2
1.969 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.970 $as_echo_n "checking for $ac_word... " >&6; }
1.971 -if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
1.972 +if ${ac_cv_path_CHECK_MAKE+:} false; then :
1.973 $as_echo_n "(cached) " >&6
1.974 else
1.975 case $CHECK_MAKE in
1.976 @@ -9253,7 +9109,7 @@
1.977 set dummy $ac_prog; ac_word=$2
1.978 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.979 $as_echo_n "checking for $ac_word... " >&6; }
1.980 -if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
1.981 +if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
1.982 $as_echo_n "(cached) " >&6
1.983 else
1.984 case $CHECK_TOOLSDIR_GMAKE in
1.985 @@ -9606,7 +9462,7 @@
1.986 set dummy $ac_prog; ac_word=$2
1.987 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.988 $as_echo_n "checking for $ac_word... " >&6; }
1.989 -if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
1.990 +if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
1.991 $as_echo_n "(cached) " >&6
1.992 else
1.993 case $CHECK_TOOLSDIR_MAKE in
1.994 @@ -10002,7 +9858,7 @@
1.995 set dummy $ac_prog; ac_word=$2
1.996 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.997 $as_echo_n "checking for $ac_word... " >&6; }
1.998 -if test "${ac_cv_path_UNZIP+set}" = set; then :
1.999 +if ${ac_cv_path_UNZIP+:} false; then :
1.1000 $as_echo_n "(cached) " >&6
1.1001 else
1.1002 case $UNZIP in
1.1003 @@ -10061,7 +9917,7 @@
1.1004 set dummy $ac_prog; ac_word=$2
1.1005 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1006 $as_echo_n "checking for $ac_word... " >&6; }
1.1007 -if test "${ac_cv_path_ZIP+set}" = set; then :
1.1008 +if ${ac_cv_path_ZIP+:} false; then :
1.1009 $as_echo_n "(cached) " >&6
1.1010 else
1.1011 case $ZIP in
1.1012 @@ -10120,7 +9976,7 @@
1.1013 set dummy ldd; ac_word=$2
1.1014 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1015 $as_echo_n "checking for $ac_word... " >&6; }
1.1016 -if test "${ac_cv_path_LDD+set}" = set; then :
1.1017 +if ${ac_cv_path_LDD+:} false; then :
1.1018 $as_echo_n "(cached) " >&6
1.1019 else
1.1020 case $LDD in
1.1021 @@ -10166,7 +10022,7 @@
1.1022 set dummy otool; ac_word=$2
1.1023 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1024 $as_echo_n "checking for $ac_word... " >&6; }
1.1025 -if test "${ac_cv_path_OTOOL+set}" = set; then :
1.1026 +if ${ac_cv_path_OTOOL+:} false; then :
1.1027 $as_echo_n "(cached) " >&6
1.1028 else
1.1029 case $OTOOL in
1.1030 @@ -10211,7 +10067,7 @@
1.1031 set dummy $ac_prog; ac_word=$2
1.1032 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1033 $as_echo_n "checking for $ac_word... " >&6; }
1.1034 -if test "${ac_cv_path_READELF+set}" = set; then :
1.1035 +if ${ac_cv_path_READELF+:} false; then :
1.1036 $as_echo_n "(cached) " >&6
1.1037 else
1.1038 case $READELF in
1.1039 @@ -10254,7 +10110,7 @@
1.1040 set dummy hg; ac_word=$2
1.1041 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1042 $as_echo_n "checking for $ac_word... " >&6; }
1.1043 -if test "${ac_cv_path_HG+set}" = set; then :
1.1044 +if ${ac_cv_path_HG+:} false; then :
1.1045 $as_echo_n "(cached) " >&6
1.1046 else
1.1047 case $HG in
1.1048 @@ -10294,7 +10150,7 @@
1.1049 set dummy stat; ac_word=$2
1.1050 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1051 $as_echo_n "checking for $ac_word... " >&6; }
1.1052 -if test "${ac_cv_path_STAT+set}" = set; then :
1.1053 +if ${ac_cv_path_STAT+:} false; then :
1.1054 $as_echo_n "(cached) " >&6
1.1055 else
1.1056 case $STAT in
1.1057 @@ -10334,7 +10190,7 @@
1.1058 set dummy time; ac_word=$2
1.1059 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1060 $as_echo_n "checking for $ac_word... " >&6; }
1.1061 -if test "${ac_cv_path_TIME+set}" = set; then :
1.1062 +if ${ac_cv_path_TIME+:} false; then :
1.1063 $as_echo_n "(cached) " >&6
1.1064 else
1.1065 case $TIME in
1.1066 @@ -10379,7 +10235,7 @@
1.1067 set dummy $ac_prog; ac_word=$2
1.1068 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1069 $as_echo_n "checking for $ac_word... " >&6; }
1.1070 -if test "${ac_cv_path_COMM+set}" = set; then :
1.1071 +if ${ac_cv_path_COMM+:} false; then :
1.1072 $as_echo_n "(cached) " >&6
1.1073 else
1.1074 case $COMM in
1.1075 @@ -10441,7 +10297,7 @@
1.1076 set dummy $ac_prog; ac_word=$2
1.1077 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1078 $as_echo_n "checking for $ac_word... " >&6; }
1.1079 -if test "${ac_cv_path_XATTR+set}" = set; then :
1.1080 +if ${ac_cv_path_XATTR+:} false; then :
1.1081 $as_echo_n "(cached) " >&6
1.1082 else
1.1083 case $XATTR in
1.1084 @@ -10493,6 +10349,62 @@
1.1085 fi
1.1086
1.1087
1.1088 + # Extract the first word of "codesign", so it can be a program name with args.
1.1089 +set dummy codesign; ac_word=$2
1.1090 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1091 +$as_echo_n "checking for $ac_word... " >&6; }
1.1092 +if ${ac_cv_path_CODESIGN+:} false; then :
1.1093 + $as_echo_n "(cached) " >&6
1.1094 +else
1.1095 + case $CODESIGN in
1.1096 + [\\/]* | ?:[\\/]*)
1.1097 + ac_cv_path_CODESIGN="$CODESIGN" # Let the user override the test with a path.
1.1098 + ;;
1.1099 + *)
1.1100 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.1101 +for as_dir in $PATH
1.1102 +do
1.1103 + IFS=$as_save_IFS
1.1104 + test -z "$as_dir" && as_dir=.
1.1105 + for ac_exec_ext in '' $ac_executable_extensions; do
1.1106 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1107 + ac_cv_path_CODESIGN="$as_dir/$ac_word$ac_exec_ext"
1.1108 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1109 + break 2
1.1110 + fi
1.1111 +done
1.1112 + done
1.1113 +IFS=$as_save_IFS
1.1114 +
1.1115 + ;;
1.1116 +esac
1.1117 +fi
1.1118 +CODESIGN=$ac_cv_path_CODESIGN
1.1119 +if test -n "$CODESIGN"; then
1.1120 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CODESIGN" >&5
1.1121 +$as_echo "$CODESIGN" >&6; }
1.1122 +else
1.1123 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1124 +$as_echo "no" >&6; }
1.1125 +fi
1.1126 +
1.1127 +
1.1128 + if test "x$CODESIGN" != "x"; then
1.1129 + # Verify that the openjdk_codesign certificate is present
1.1130 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if openjdk_codesign certificate is present" >&5
1.1131 +$as_echo_n "checking if openjdk_codesign certificate is present... " >&6; }
1.1132 + rm -f codesign-testfile
1.1133 + touch codesign-testfile
1.1134 + codesign -s openjdk_codesign codesign-testfile 2>&5 >&5 || CODESIGN=
1.1135 + rm -f codesign-testfile
1.1136 + if test "x$CODESIGN" = x; then
1.1137 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1138 +$as_echo "no" >&6; }
1.1139 + else
1.1140 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.1141 +$as_echo "yes" >&6; }
1.1142 + fi
1.1143 + fi
1.1144 fi
1.1145
1.1146
1.1147 @@ -10505,7 +10417,7 @@
1.1148 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
1.1149 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1150 $as_echo_n "checking for $ac_word... " >&6; }
1.1151 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
1.1152 +if ${ac_cv_path_PKG_CONFIG+:} false; then :
1.1153 $as_echo_n "(cached) " >&6
1.1154 else
1.1155 case $PKG_CONFIG in
1.1156 @@ -10548,7 +10460,7 @@
1.1157 set dummy pkg-config; ac_word=$2
1.1158 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1159 $as_echo_n "checking for $ac_word... " >&6; }
1.1160 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
1.1161 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
1.1162 $as_echo_n "(cached) " >&6
1.1163 else
1.1164 case $ac_pt_PKG_CONFIG in
1.1165 @@ -10721,7 +10633,7 @@
1.1166 set dummy $ac_prog; ac_word=$2
1.1167 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1168 $as_echo_n "checking for $ac_word... " >&6; }
1.1169 -if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
1.1170 +if ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
1.1171 $as_echo_n "(cached) " >&6
1.1172 else
1.1173 if test -n "$BDEPS_UNZIP"; then
1.1174 @@ -10767,7 +10679,7 @@
1.1175 set dummy $ac_prog; ac_word=$2
1.1176 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1177 $as_echo_n "checking for $ac_word... " >&6; }
1.1178 -if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
1.1179 +if ${ac_cv_prog_BDEPS_FTP+:} false; then :
1.1180 $as_echo_n "(cached) " >&6
1.1181 else
1.1182 if test -n "$BDEPS_FTP"; then
1.1183 @@ -10939,6 +10851,18 @@
1.1184 fi
1.1185
1.1186
1.1187 +# Check whether --with-update-version was given.
1.1188 +if test "${with_update_version+set}" = set; then :
1.1189 + withval=$with_update_version;
1.1190 +fi
1.1191 +
1.1192 +if test "x$with_update_version" = xyes; then
1.1193 + as_fn_error $? "Update version must have a value" "$LINENO" 5
1.1194 +elif test "x$with_update_version" != x; then
1.1195 + JDK_UPDATE_VERSION="$with_update_version"
1.1196 +fi
1.1197 +
1.1198 +
1.1199 # Check whether --with-build-number was given.
1.1200 if test "${with_build_number+set}" = set; then :
1.1201 withval=$with_build_number;
1.1202 @@ -11188,7 +11112,7 @@
1.1203 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1204 fi
1.1205
1.1206 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1207 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1208 fi
1.1209
1.1210 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1211 @@ -11520,7 +11444,7 @@
1.1212 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1213 fi
1.1214
1.1215 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1216 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1217 fi
1.1218
1.1219 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1220 @@ -11666,7 +11590,7 @@
1.1221 as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5
1.1222 fi
1.1223
1.1224 - JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD`"
1.1225 + JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`"
1.1226 fi
1.1227
1.1228 if test ! -d "$JAVA_HOME_PROCESSED"; then
1.1229 @@ -11838,7 +11762,7 @@
1.1230 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1231 fi
1.1232
1.1233 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1234 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1235 fi
1.1236
1.1237 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1238 @@ -12026,7 +11950,7 @@
1.1239 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1240 fi
1.1241
1.1242 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1243 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1244 fi
1.1245
1.1246 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1247 @@ -12055,7 +11979,7 @@
1.1248 set dummy javac; ac_word=$2
1.1249 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1250 $as_echo_n "checking for $ac_word... " >&6; }
1.1251 -if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then :
1.1252 +if ${ac_cv_path_JAVAC_CHECK+:} false; then :
1.1253 $as_echo_n "(cached) " >&6
1.1254 else
1.1255 case $JAVAC_CHECK in
1.1256 @@ -12095,7 +12019,7 @@
1.1257 set dummy java; ac_word=$2
1.1258 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1259 $as_echo_n "checking for $ac_word... " >&6; }
1.1260 -if test "${ac_cv_path_JAVA_CHECK+set}" = set; then :
1.1261 +if ${ac_cv_path_JAVA_CHECK+:} false; then :
1.1262 $as_echo_n "(cached) " >&6
1.1263 else
1.1264 case $JAVA_CHECK in
1.1265 @@ -12165,10 +12089,10 @@
1.1266 COUNTER=0
1.1267 sym_link_dir=`$DIRNAME $BINARY`
1.1268 sym_link_file=`$BASENAME $BINARY`
1.1269 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.1270 cd $sym_link_dir
1.1271 - cd `$THEPWDCMD`
1.1272 - sym_link_dir=`$THEPWDCMD`
1.1273 + # Use -P flag to resolve symlinks in directories.
1.1274 + cd `$THEPWDCMD -P`
1.1275 + sym_link_dir=`$THEPWDCMD -P`
1.1276 # Resolve file symlinks
1.1277 while test $COUNTER -lt 20; do
1.1278 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.1279 @@ -12179,7 +12103,7 @@
1.1280 # Again resolve directory symlinks since the target of the just found
1.1281 # link could be in a different directory
1.1282 cd `$DIRNAME $ISLINK`
1.1283 - sym_link_dir=`$THEPWDCMD`
1.1284 + sym_link_dir=`$THEPWDCMD -P`
1.1285 sym_link_file=`$BASENAME $ISLINK`
1.1286 let COUNTER=COUNTER+1
1.1287 done
1.1288 @@ -12354,7 +12278,7 @@
1.1289 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1290 fi
1.1291
1.1292 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1293 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1294 fi
1.1295
1.1296 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1297 @@ -12569,7 +12493,7 @@
1.1298 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1299 fi
1.1300
1.1301 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1302 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1303 fi
1.1304
1.1305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1306 @@ -12749,7 +12673,7 @@
1.1307 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1308 fi
1.1309
1.1310 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1311 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1312 fi
1.1313
1.1314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1315 @@ -12957,7 +12881,7 @@
1.1316 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1317 fi
1.1318
1.1319 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1320 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1321 fi
1.1322
1.1323 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1324 @@ -13137,7 +13061,7 @@
1.1325 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1326 fi
1.1327
1.1328 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1329 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1330 fi
1.1331
1.1332 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1333 @@ -13345,7 +13269,7 @@
1.1334 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1335 fi
1.1336
1.1337 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1338 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1339 fi
1.1340
1.1341 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1342 @@ -13525,7 +13449,7 @@
1.1343 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1344 fi
1.1345
1.1346 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1347 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1348 fi
1.1349
1.1350 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1351 @@ -13733,7 +13657,7 @@
1.1352 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1353 fi
1.1354
1.1355 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1356 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1357 fi
1.1358
1.1359 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1360 @@ -13913,7 +13837,7 @@
1.1361 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1362 fi
1.1363
1.1364 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1365 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1366 fi
1.1367
1.1368 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1369 @@ -14108,7 +14032,7 @@
1.1370 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1371 fi
1.1372
1.1373 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1374 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1375 fi
1.1376
1.1377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1378 @@ -14286,7 +14210,7 @@
1.1379 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1380 fi
1.1381
1.1382 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1383 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1384 fi
1.1385
1.1386 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1387 @@ -14482,7 +14406,7 @@
1.1388 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1389 fi
1.1390
1.1391 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1392 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1393 fi
1.1394
1.1395 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1396 @@ -14660,7 +14584,7 @@
1.1397 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1398 fi
1.1399
1.1400 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1401 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1402 fi
1.1403
1.1404 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1405 @@ -14855,7 +14779,7 @@
1.1406 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1407 fi
1.1408
1.1409 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1410 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1411 fi
1.1412
1.1413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1414 @@ -15033,7 +14957,7 @@
1.1415 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1416 fi
1.1417
1.1418 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1419 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1420 fi
1.1421
1.1422 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1423 @@ -15229,7 +15153,7 @@
1.1424 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1425 fi
1.1426
1.1427 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1428 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1429 fi
1.1430
1.1431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1432 @@ -15407,7 +15331,7 @@
1.1433 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1434 fi
1.1435
1.1436 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1437 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1438 fi
1.1439
1.1440 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1441 @@ -15584,7 +15508,7 @@
1.1442 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.1443 fi
1.1444
1.1445 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.1446 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.1447 fi
1.1448
1.1449 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.1450 @@ -16261,14 +16185,28 @@
1.1451 # Check whether --with-jtreg was given.
1.1452 if test "${with_jtreg+set}" = set; then :
1.1453 withval=$with_jtreg;
1.1454 -fi
1.1455 -
1.1456 -
1.1457 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JTReg Regression Test Harness" >&5
1.1458 -$as_echo_n "checking for JTReg Regression Test Harness... " >&6; }
1.1459 -
1.1460 - if test "x$with_jtreg" != x; then
1.1461 - JT_HOME="$with_jtreg"
1.1462 +else
1.1463 + with_jtreg=no
1.1464 +fi
1.1465 +
1.1466 +
1.1467 + if test "x$with_jtreg" = xno; then
1.1468 + # jtreg disabled
1.1469 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
1.1470 +$as_echo_n "checking for jtreg... " >&6; }
1.1471 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1472 +$as_echo "no" >&6; }
1.1473 + else
1.1474 + if test "x$with_jtreg" != xyes; then
1.1475 + # with path specified.
1.1476 + JT_HOME="$with_jtreg"
1.1477 + fi
1.1478 +
1.1479 + if test "x$JT_HOME" != x; then
1.1480 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jtreg" >&5
1.1481 +$as_echo_n "checking for jtreg... " >&6; }
1.1482 +
1.1483 + # use JT_HOME enviroment var.
1.1484
1.1485 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
1.1486
1.1487 @@ -16388,20 +16326,82 @@
1.1488 as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5
1.1489 fi
1.1490
1.1491 - JT_HOME="`cd "$path"; $THEPWDCMD`"
1.1492 - fi
1.1493 -
1.1494 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JT_HOME" >&5
1.1495 -$as_echo "$JT_HOME" >&6; }
1.1496 -
1.1497 - # jtreg win32 script works for everybody
1.1498 - JTREGEXE="$JT_HOME/win32/bin/jtreg"
1.1499 - if test ! -f "$JTREGEXE"; then
1.1500 - as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
1.1501 - fi
1.1502 - else
1.1503 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1504 -$as_echo "no" >&6; }
1.1505 + JT_HOME="`cd "$path"; $THEPWDCMD -L`"
1.1506 + fi
1.1507 +
1.1508 +
1.1509 + # jtreg win32 script works for everybody
1.1510 + JTREGEXE="$JT_HOME/win32/bin/jtreg"
1.1511 +
1.1512 + if test ! -f "$JTREGEXE"; then
1.1513 + as_fn_error $? "JTReg executable does not exist: $JTREGEXE" "$LINENO" 5
1.1514 + fi
1.1515 +
1.1516 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.1517 +$as_echo "$JTREGEXE" >&6; }
1.1518 + else
1.1519 + # try to find jtreg on path
1.1520 +
1.1521 + for ac_prog in jtreg
1.1522 +do
1.1523 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.1524 +set dummy $ac_prog; ac_word=$2
1.1525 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1526 +$as_echo_n "checking for $ac_word... " >&6; }
1.1527 +if ${ac_cv_path_JTREGEXE+:} false; then :
1.1528 + $as_echo_n "(cached) " >&6
1.1529 +else
1.1530 + case $JTREGEXE in
1.1531 + [\\/]* | ?:[\\/]*)
1.1532 + ac_cv_path_JTREGEXE="$JTREGEXE" # Let the user override the test with a path.
1.1533 + ;;
1.1534 + *)
1.1535 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.1536 +for as_dir in $PATH
1.1537 +do
1.1538 + IFS=$as_save_IFS
1.1539 + test -z "$as_dir" && as_dir=.
1.1540 + for ac_exec_ext in '' $ac_executable_extensions; do
1.1541 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.1542 + ac_cv_path_JTREGEXE="$as_dir/$ac_word$ac_exec_ext"
1.1543 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.1544 + break 2
1.1545 + fi
1.1546 +done
1.1547 + done
1.1548 +IFS=$as_save_IFS
1.1549 +
1.1550 + ;;
1.1551 +esac
1.1552 +fi
1.1553 +JTREGEXE=$ac_cv_path_JTREGEXE
1.1554 +if test -n "$JTREGEXE"; then
1.1555 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JTREGEXE" >&5
1.1556 +$as_echo "$JTREGEXE" >&6; }
1.1557 +else
1.1558 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.1559 +$as_echo "no" >&6; }
1.1560 +fi
1.1561 +
1.1562 +
1.1563 + test -n "$JTREGEXE" && break
1.1564 +done
1.1565 +
1.1566 +
1.1567 + if test "x$JTREGEXE" = x; then
1.1568 + if test "xjtreg" = x; then
1.1569 + PROG_NAME=jtregexe
1.1570 + else
1.1571 + PROG_NAME=jtreg
1.1572 + fi
1.1573 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.1574 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.1575 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.1576 + fi
1.1577 +
1.1578 +
1.1579 + JT_HOME="`$DIRNAME $JTREGEXE`"
1.1580 + fi
1.1581 fi
1.1582
1.1583
1.1584 @@ -16416,7 +16416,7 @@
1.1585 set dummy link; ac_word=$2
1.1586 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1587 $as_echo_n "checking for $ac_word... " >&6; }
1.1588 -if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then :
1.1589 +if ${ac_cv_path_CYGWIN_LINK+:} false; then :
1.1590 $as_echo_n "(cached) " >&6
1.1591 else
1.1592 case $CYGWIN_LINK in
1.1593 @@ -17377,7 +17377,7 @@
1.1594 as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.1595 fi
1.1596
1.1597 - MSVCR_DLL="`cd "$path"; $THEPWDCMD`"
1.1598 + MSVCR_DLL="`cd "$path"; $THEPWDCMD -L`"
1.1599 fi
1.1600
1.1601
1.1602 @@ -17534,7 +17534,7 @@
1.1603 as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5
1.1604 fi
1.1605
1.1606 - dxsdk_path="`cd "$path"; $THEPWDCMD`"
1.1607 + dxsdk_path="`cd "$path"; $THEPWDCMD -L`"
1.1608 fi
1.1609
1.1610
1.1611 @@ -17672,7 +17672,7 @@
1.1612 as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
1.1613 fi
1.1614
1.1615 - DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD`"
1.1616 + DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
1.1617 fi
1.1618
1.1619
1.1620 @@ -17808,7 +17808,7 @@
1.1621 as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
1.1622 fi
1.1623
1.1624 - DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD`"
1.1625 + DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
1.1626 fi
1.1627
1.1628
1.1629 @@ -17843,7 +17843,7 @@
1.1630 set dummy $ac_prog; ac_word=$2
1.1631 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1632 $as_echo_n "checking for $ac_word... " >&6; }
1.1633 -if test "${ac_cv_path_BUILD_CC+set}" = set; then :
1.1634 +if ${ac_cv_path_BUILD_CC+:} false; then :
1.1635 $as_echo_n "(cached) " >&6
1.1636 else
1.1637 case $BUILD_CC in
1.1638 @@ -18154,7 +18154,7 @@
1.1639 set dummy $ac_prog; ac_word=$2
1.1640 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1641 $as_echo_n "checking for $ac_word... " >&6; }
1.1642 -if test "${ac_cv_path_BUILD_CXX+set}" = set; then :
1.1643 +if ${ac_cv_path_BUILD_CXX+:} false; then :
1.1644 $as_echo_n "(cached) " >&6
1.1645 else
1.1646 case $BUILD_CXX in
1.1647 @@ -18463,7 +18463,7 @@
1.1648 set dummy ld; ac_word=$2
1.1649 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1650 $as_echo_n "checking for $ac_word... " >&6; }
1.1651 -if test "${ac_cv_path_BUILD_LD+set}" = set; then :
1.1652 +if ${ac_cv_path_BUILD_LD+:} false; then :
1.1653 $as_echo_n "(cached) " >&6
1.1654 else
1.1655 case $BUILD_LD in
1.1656 @@ -18979,7 +18979,7 @@
1.1657 set dummy $ac_prog; ac_word=$2
1.1658 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1659 $as_echo_n "checking for $ac_word... " >&6; }
1.1660 -if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then :
1.1661 +if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
1.1662 $as_echo_n "(cached) " >&6
1.1663 else
1.1664 case $TOOLS_DIR_CC in
1.1665 @@ -19031,7 +19031,7 @@
1.1666 set dummy $ac_prog; ac_word=$2
1.1667 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1668 $as_echo_n "checking for $ac_word... " >&6; }
1.1669 -if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
1.1670 +if ${ac_cv_path_POTENTIAL_CC+:} false; then :
1.1671 $as_echo_n "(cached) " >&6
1.1672 else
1.1673 case $POTENTIAL_CC in
1.1674 @@ -19395,10 +19395,10 @@
1.1675 COUNTER=0
1.1676 sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.1677 sym_link_file=`$BASENAME $TEST_COMPILER`
1.1678 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.1679 cd $sym_link_dir
1.1680 - cd `$THEPWDCMD`
1.1681 - sym_link_dir=`$THEPWDCMD`
1.1682 + # Use -P flag to resolve symlinks in directories.
1.1683 + cd `$THEPWDCMD -P`
1.1684 + sym_link_dir=`$THEPWDCMD -P`
1.1685 # Resolve file symlinks
1.1686 while test $COUNTER -lt 20; do
1.1687 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.1688 @@ -19409,7 +19409,7 @@
1.1689 # Again resolve directory symlinks since the target of the just found
1.1690 # link could be in a different directory
1.1691 cd `$DIRNAME $ISLINK`
1.1692 - sym_link_dir=`$THEPWDCMD`
1.1693 + sym_link_dir=`$THEPWDCMD -P`
1.1694 sym_link_file=`$BASENAME $ISLINK`
1.1695 let COUNTER=COUNTER+1
1.1696 done
1.1697 @@ -19444,7 +19444,7 @@
1.1698 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.1699 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1700 $as_echo_n "checking for $ac_word... " >&6; }
1.1701 -if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
1.1702 +if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
1.1703 $as_echo_n "(cached) " >&6
1.1704 else
1.1705 if test -n "$PROPER_COMPILER_CC"; then
1.1706 @@ -19488,7 +19488,7 @@
1.1707 set dummy $ac_prog; ac_word=$2
1.1708 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1709 $as_echo_n "checking for $ac_word... " >&6; }
1.1710 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
1.1711 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
1.1712 $as_echo_n "(cached) " >&6
1.1713 else
1.1714 if test -n "$ac_ct_PROPER_COMPILER_CC"; then
1.1715 @@ -19832,10 +19832,10 @@
1.1716 COUNTER=0
1.1717 sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
1.1718 sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
1.1719 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.1720 cd $sym_link_dir
1.1721 - cd `$THEPWDCMD`
1.1722 - sym_link_dir=`$THEPWDCMD`
1.1723 + # Use -P flag to resolve symlinks in directories.
1.1724 + cd `$THEPWDCMD -P`
1.1725 + sym_link_dir=`$THEPWDCMD -P`
1.1726 # Resolve file symlinks
1.1727 while test $COUNTER -lt 20; do
1.1728 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.1729 @@ -19846,7 +19846,7 @@
1.1730 # Again resolve directory symlinks since the target of the just found
1.1731 # link could be in a different directory
1.1732 cd `$DIRNAME $ISLINK`
1.1733 - sym_link_dir=`$THEPWDCMD`
1.1734 + sym_link_dir=`$THEPWDCMD -P`
1.1735 sym_link_file=`$BASENAME $ISLINK`
1.1736 let COUNTER=COUNTER+1
1.1737 done
1.1738 @@ -19938,7 +19938,7 @@
1.1739 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.1740 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1741 $as_echo_n "checking for $ac_word... " >&6; }
1.1742 -if test "${ac_cv_prog_CC+set}" = set; then :
1.1743 +if ${ac_cv_prog_CC+:} false; then :
1.1744 $as_echo_n "(cached) " >&6
1.1745 else
1.1746 if test -n "$CC"; then
1.1747 @@ -19982,7 +19982,7 @@
1.1748 set dummy $ac_prog; ac_word=$2
1.1749 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1750 $as_echo_n "checking for $ac_word... " >&6; }
1.1751 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
1.1752 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
1.1753 $as_echo_n "(cached) " >&6
1.1754 else
1.1755 if test -n "$ac_ct_CC"; then
1.1756 @@ -20263,7 +20263,7 @@
1.1757 ac_clean_files=$ac_clean_files_save
1.1758 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
1.1759 $as_echo_n "checking for suffix of object files... " >&6; }
1.1760 -if test "${ac_cv_objext+set}" = set; then :
1.1761 +if ${ac_cv_objext+:} false; then :
1.1762 $as_echo_n "(cached) " >&6
1.1763 else
1.1764 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.1765 @@ -20314,7 +20314,7 @@
1.1766 ac_objext=$OBJEXT
1.1767 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
1.1768 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1.1769 -if test "${ac_cv_c_compiler_gnu+set}" = set; then :
1.1770 +if ${ac_cv_c_compiler_gnu+:} false; then :
1.1771 $as_echo_n "(cached) " >&6
1.1772 else
1.1773 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.1774 @@ -20351,7 +20351,7 @@
1.1775 ac_save_CFLAGS=$CFLAGS
1.1776 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
1.1777 $as_echo_n "checking whether $CC accepts -g... " >&6; }
1.1778 -if test "${ac_cv_prog_cc_g+set}" = set; then :
1.1779 +if ${ac_cv_prog_cc_g+:} false; then :
1.1780 $as_echo_n "(cached) " >&6
1.1781 else
1.1782 ac_save_c_werror_flag=$ac_c_werror_flag
1.1783 @@ -20429,7 +20429,7 @@
1.1784 fi
1.1785 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
1.1786 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
1.1787 -if test "${ac_cv_prog_cc_c89+set}" = set; then :
1.1788 +if ${ac_cv_prog_cc_c89+:} false; then :
1.1789 $as_echo_n "(cached) " >&6
1.1790 else
1.1791 ac_cv_prog_cc_c89=no
1.1792 @@ -20552,7 +20552,7 @@
1.1793 set dummy $ac_prog; ac_word=$2
1.1794 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1795 $as_echo_n "checking for $ac_word... " >&6; }
1.1796 -if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then :
1.1797 +if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
1.1798 $as_echo_n "(cached) " >&6
1.1799 else
1.1800 case $TOOLS_DIR_CXX in
1.1801 @@ -20604,7 +20604,7 @@
1.1802 set dummy $ac_prog; ac_word=$2
1.1803 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1804 $as_echo_n "checking for $ac_word... " >&6; }
1.1805 -if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
1.1806 +if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
1.1807 $as_echo_n "(cached) " >&6
1.1808 else
1.1809 case $POTENTIAL_CXX in
1.1810 @@ -20968,10 +20968,10 @@
1.1811 COUNTER=0
1.1812 sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.1813 sym_link_file=`$BASENAME $TEST_COMPILER`
1.1814 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.1815 cd $sym_link_dir
1.1816 - cd `$THEPWDCMD`
1.1817 - sym_link_dir=`$THEPWDCMD`
1.1818 + # Use -P flag to resolve symlinks in directories.
1.1819 + cd `$THEPWDCMD -P`
1.1820 + sym_link_dir=`$THEPWDCMD -P`
1.1821 # Resolve file symlinks
1.1822 while test $COUNTER -lt 20; do
1.1823 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.1824 @@ -20982,7 +20982,7 @@
1.1825 # Again resolve directory symlinks since the target of the just found
1.1826 # link could be in a different directory
1.1827 cd `$DIRNAME $ISLINK`
1.1828 - sym_link_dir=`$THEPWDCMD`
1.1829 + sym_link_dir=`$THEPWDCMD -P`
1.1830 sym_link_file=`$BASENAME $ISLINK`
1.1831 let COUNTER=COUNTER+1
1.1832 done
1.1833 @@ -21017,7 +21017,7 @@
1.1834 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.1835 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1836 $as_echo_n "checking for $ac_word... " >&6; }
1.1837 -if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
1.1838 +if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
1.1839 $as_echo_n "(cached) " >&6
1.1840 else
1.1841 if test -n "$PROPER_COMPILER_CXX"; then
1.1842 @@ -21061,7 +21061,7 @@
1.1843 set dummy $ac_prog; ac_word=$2
1.1844 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1845 $as_echo_n "checking for $ac_word... " >&6; }
1.1846 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
1.1847 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
1.1848 $as_echo_n "(cached) " >&6
1.1849 else
1.1850 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
1.1851 @@ -21405,10 +21405,10 @@
1.1852 COUNTER=0
1.1853 sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
1.1854 sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
1.1855 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.1856 cd $sym_link_dir
1.1857 - cd `$THEPWDCMD`
1.1858 - sym_link_dir=`$THEPWDCMD`
1.1859 + # Use -P flag to resolve symlinks in directories.
1.1860 + cd `$THEPWDCMD -P`
1.1861 + sym_link_dir=`$THEPWDCMD -P`
1.1862 # Resolve file symlinks
1.1863 while test $COUNTER -lt 20; do
1.1864 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.1865 @@ -21419,7 +21419,7 @@
1.1866 # Again resolve directory symlinks since the target of the just found
1.1867 # link could be in a different directory
1.1868 cd `$DIRNAME $ISLINK`
1.1869 - sym_link_dir=`$THEPWDCMD`
1.1870 + sym_link_dir=`$THEPWDCMD -P`
1.1871 sym_link_file=`$BASENAME $ISLINK`
1.1872 let COUNTER=COUNTER+1
1.1873 done
1.1874 @@ -21515,7 +21515,7 @@
1.1875 set dummy $ac_tool_prefix$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_CXX+set}" = set; then :
1.1879 +if ${ac_cv_prog_CXX+:} false; then :
1.1880 $as_echo_n "(cached) " >&6
1.1881 else
1.1882 if test -n "$CXX"; then
1.1883 @@ -21559,7 +21559,7 @@
1.1884 set dummy $ac_prog; ac_word=$2
1.1885 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1886 $as_echo_n "checking for $ac_word... " >&6; }
1.1887 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
1.1888 +if ${ac_cv_prog_ac_ct_CXX+:} false; then :
1.1889 $as_echo_n "(cached) " >&6
1.1890 else
1.1891 if test -n "$ac_ct_CXX"; then
1.1892 @@ -21637,7 +21637,7 @@
1.1893
1.1894 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
1.1895 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
1.1896 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
1.1897 +if ${ac_cv_cxx_compiler_gnu+:} false; then :
1.1898 $as_echo_n "(cached) " >&6
1.1899 else
1.1900 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.1901 @@ -21674,7 +21674,7 @@
1.1902 ac_save_CXXFLAGS=$CXXFLAGS
1.1903 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
1.1904 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
1.1905 -if test "${ac_cv_prog_cxx_g+set}" = set; then :
1.1906 +if ${ac_cv_prog_cxx_g+:} false; then :
1.1907 $as_echo_n "(cached) " >&6
1.1908 else
1.1909 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
1.1910 @@ -21772,7 +21772,7 @@
1.1911 set dummy $ac_tool_prefix$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_OBJC+set}" = set; then :
1.1915 +if ${ac_cv_prog_OBJC+:} false; then :
1.1916 $as_echo_n "(cached) " >&6
1.1917 else
1.1918 if test -n "$OBJC"; then
1.1919 @@ -21816,7 +21816,7 @@
1.1920 set dummy $ac_prog; ac_word=$2
1.1921 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1922 $as_echo_n "checking for $ac_word... " >&6; }
1.1923 -if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
1.1924 +if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
1.1925 $as_echo_n "(cached) " >&6
1.1926 else
1.1927 if test -n "$ac_ct_OBJC"; then
1.1928 @@ -21892,7 +21892,7 @@
1.1929
1.1930 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
1.1931 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
1.1932 -if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
1.1933 +if ${ac_cv_objc_compiler_gnu+:} false; then :
1.1934 $as_echo_n "(cached) " >&6
1.1935 else
1.1936 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.1937 @@ -21929,7 +21929,7 @@
1.1938 ac_save_OBJCFLAGS=$OBJCFLAGS
1.1939 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
1.1940 $as_echo_n "checking whether $OBJC accepts -g... " >&6; }
1.1941 -if test "${ac_cv_prog_objc_g+set}" = set; then :
1.1942 +if ${ac_cv_prog_objc_g+:} false; then :
1.1943 $as_echo_n "(cached) " >&6
1.1944 else
1.1945 ac_save_objc_werror_flag=$ac_objc_werror_flag
1.1946 @@ -22305,7 +22305,7 @@
1.1947 set dummy ${ac_tool_prefix}ar; ac_word=$2
1.1948 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1949 $as_echo_n "checking for $ac_word... " >&6; }
1.1950 -if test "${ac_cv_prog_AR+set}" = set; then :
1.1951 +if ${ac_cv_prog_AR+:} false; then :
1.1952 $as_echo_n "(cached) " >&6
1.1953 else
1.1954 if test -n "$AR"; then
1.1955 @@ -22345,7 +22345,7 @@
1.1956 set dummy ar; ac_word=$2
1.1957 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1958 $as_echo_n "checking for $ac_word... " >&6; }
1.1959 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
1.1960 +if ${ac_cv_prog_ac_ct_AR+:} false; then :
1.1961 $as_echo_n "(cached) " >&6
1.1962 else
1.1963 if test -n "$ac_ct_AR"; then
1.1964 @@ -22687,7 +22687,7 @@
1.1965 set dummy link; ac_word=$2
1.1966 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1967 $as_echo_n "checking for $ac_word... " >&6; }
1.1968 -if test "${ac_cv_prog_WINLD+set}" = set; then :
1.1969 +if ${ac_cv_prog_WINLD+:} false; then :
1.1970 $as_echo_n "(cached) " >&6
1.1971 else
1.1972 if test -n "$WINLD"; then
1.1973 @@ -23026,7 +23026,7 @@
1.1974 set dummy mt; ac_word=$2
1.1975 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1976 $as_echo_n "checking for $ac_word... " >&6; }
1.1977 -if test "${ac_cv_prog_MT+set}" = set; then :
1.1978 +if ${ac_cv_prog_MT+:} false; then :
1.1979 $as_echo_n "(cached) " >&6
1.1980 else
1.1981 if test -n "$MT"; then
1.1982 @@ -23347,7 +23347,7 @@
1.1983 set dummy rc; ac_word=$2
1.1984 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1985 $as_echo_n "checking for $ac_word... " >&6; }
1.1986 -if test "${ac_cv_prog_RC+set}" = set; then :
1.1987 +if ${ac_cv_prog_RC+:} false; then :
1.1988 $as_echo_n "(cached) " >&6
1.1989 else
1.1990 if test -n "$RC"; then
1.1991 @@ -23738,7 +23738,7 @@
1.1992 set dummy lib; ac_word=$2
1.1993 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1994 $as_echo_n "checking for $ac_word... " >&6; }
1.1995 -if test "${ac_cv_prog_WINAR+set}" = set; then :
1.1996 +if ${ac_cv_prog_WINAR+:} false; then :
1.1997 $as_echo_n "(cached) " >&6
1.1998 else
1.1999 if test -n "$WINAR"; then
1.2000 @@ -24044,7 +24044,7 @@
1.2001 set dummy dumpbin; ac_word=$2
1.2002 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2003 $as_echo_n "checking for $ac_word... " >&6; }
1.2004 -if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
1.2005 +if ${ac_cv_prog_DUMPBIN+:} false; then :
1.2006 $as_echo_n "(cached) " >&6
1.2007 else
1.2008 if test -n "$DUMPBIN"; then
1.2009 @@ -24363,7 +24363,7 @@
1.2010 CPP=
1.2011 fi
1.2012 if test -z "$CPP"; then
1.2013 - if test "${ac_cv_prog_CPP+set}" = set; then :
1.2014 + if ${ac_cv_prog_CPP+:} false; then :
1.2015 $as_echo_n "(cached) " >&6
1.2016 else
1.2017 # Double quotes because CPP needs to be expanded
1.2018 @@ -24763,7 +24763,7 @@
1.2019 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
1.2020 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
1.2021 if test -z "$CXXCPP"; then
1.2022 - if test "${ac_cv_prog_CXXCPP+set}" = set; then :
1.2023 + if ${ac_cv_prog_CXXCPP+:} false; then :
1.2024 $as_echo_n "(cached) " >&6
1.2025 else
1.2026 # Double quotes because CXXCPP needs to be expanded
1.2027 @@ -25181,7 +25181,7 @@
1.2028 set dummy as; ac_word=$2
1.2029 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2030 $as_echo_n "checking for $ac_word... " >&6; }
1.2031 -if test "${ac_cv_path_AS+set}" = set; then :
1.2032 +if ${ac_cv_path_AS+:} false; then :
1.2033 $as_echo_n "(cached) " >&6
1.2034 else
1.2035 case $AS in
1.2036 @@ -25493,7 +25493,7 @@
1.2037 set dummy nm; ac_word=$2
1.2038 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2039 $as_echo_n "checking for $ac_word... " >&6; }
1.2040 -if test "${ac_cv_path_NM+set}" = set; then :
1.2041 +if ${ac_cv_path_NM+:} false; then :
1.2042 $as_echo_n "(cached) " >&6
1.2043 else
1.2044 case $NM in
1.2045 @@ -25799,7 +25799,7 @@
1.2046 set dummy gnm; ac_word=$2
1.2047 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2048 $as_echo_n "checking for $ac_word... " >&6; }
1.2049 -if test "${ac_cv_path_GNM+set}" = set; then :
1.2050 +if ${ac_cv_path_GNM+:} false; then :
1.2051 $as_echo_n "(cached) " >&6
1.2052 else
1.2053 case $GNM in
1.2054 @@ -26105,7 +26105,7 @@
1.2055 set dummy strip; ac_word=$2
1.2056 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2057 $as_echo_n "checking for $ac_word... " >&6; }
1.2058 -if test "${ac_cv_path_STRIP+set}" = set; then :
1.2059 +if ${ac_cv_path_STRIP+:} false; then :
1.2060 $as_echo_n "(cached) " >&6
1.2061 else
1.2062 case $STRIP in
1.2063 @@ -26411,7 +26411,7 @@
1.2064 set dummy mcs; ac_word=$2
1.2065 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2066 $as_echo_n "checking for $ac_word... " >&6; }
1.2067 -if test "${ac_cv_path_MCS+set}" = set; then :
1.2068 +if ${ac_cv_path_MCS+:} false; then :
1.2069 $as_echo_n "(cached) " >&6
1.2070 else
1.2071 case $MCS in
1.2072 @@ -26719,7 +26719,7 @@
1.2073 set dummy ${ac_tool_prefix}nm; ac_word=$2
1.2074 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2075 $as_echo_n "checking for $ac_word... " >&6; }
1.2076 -if test "${ac_cv_prog_NM+set}" = set; then :
1.2077 +if ${ac_cv_prog_NM+:} false; then :
1.2078 $as_echo_n "(cached) " >&6
1.2079 else
1.2080 if test -n "$NM"; then
1.2081 @@ -26759,7 +26759,7 @@
1.2082 set dummy nm; ac_word=$2
1.2083 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2084 $as_echo_n "checking for $ac_word... " >&6; }
1.2085 -if test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
1.2086 +if ${ac_cv_prog_ac_ct_NM+:} false; then :
1.2087 $as_echo_n "(cached) " >&6
1.2088 else
1.2089 if test -n "$ac_ct_NM"; then
1.2090 @@ -27079,7 +27079,7 @@
1.2091 set dummy ${ac_tool_prefix}strip; ac_word=$2
1.2092 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2093 $as_echo_n "checking for $ac_word... " >&6; }
1.2094 -if test "${ac_cv_prog_STRIP+set}" = set; then :
1.2095 +if ${ac_cv_prog_STRIP+:} false; then :
1.2096 $as_echo_n "(cached) " >&6
1.2097 else
1.2098 if test -n "$STRIP"; then
1.2099 @@ -27119,7 +27119,7 @@
1.2100 set dummy strip; ac_word=$2
1.2101 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2102 $as_echo_n "checking for $ac_word... " >&6; }
1.2103 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
1.2104 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
1.2105 $as_echo_n "(cached) " >&6
1.2106 else
1.2107 if test -n "$ac_ct_STRIP"; then
1.2108 @@ -27444,7 +27444,7 @@
1.2109 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.2110 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2111 $as_echo_n "checking for $ac_word... " >&6; }
1.2112 -if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
1.2113 +if ${ac_cv_prog_OBJCOPY+:} false; then :
1.2114 $as_echo_n "(cached) " >&6
1.2115 else
1.2116 if test -n "$OBJCOPY"; then
1.2117 @@ -27488,7 +27488,7 @@
1.2118 set dummy $ac_prog; ac_word=$2
1.2119 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2120 $as_echo_n "checking for $ac_word... " >&6; }
1.2121 -if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
1.2122 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
1.2123 $as_echo_n "(cached) " >&6
1.2124 else
1.2125 if test -n "$ac_ct_OBJCOPY"; then
1.2126 @@ -27815,7 +27815,7 @@
1.2127 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.2128 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2129 $as_echo_n "checking for $ac_word... " >&6; }
1.2130 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
1.2131 +if ${ac_cv_prog_OBJDUMP+:} false; then :
1.2132 $as_echo_n "(cached) " >&6
1.2133 else
1.2134 if test -n "$OBJDUMP"; then
1.2135 @@ -27859,7 +27859,7 @@
1.2136 set dummy $ac_prog; ac_word=$2
1.2137 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2138 $as_echo_n "checking for $ac_word... " >&6; }
1.2139 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
1.2140 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
1.2141 $as_echo_n "(cached) " >&6
1.2142 else
1.2143 if test -n "$ac_ct_OBJDUMP"; then
1.2144 @@ -28183,7 +28183,7 @@
1.2145 set dummy lipo; ac_word=$2
1.2146 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2147 $as_echo_n "checking for $ac_word... " >&6; }
1.2148 -if test "${ac_cv_path_LIPO+set}" = set; then :
1.2149 +if ${ac_cv_path_LIPO+:} false; then :
1.2150 $as_echo_n "(cached) " >&6
1.2151 else
1.2152 case $LIPO in
1.2153 @@ -28500,7 +28500,7 @@
1.2154
1.2155 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
1.2156 $as_echo_n "checking for ANSI C header files... " >&6; }
1.2157 -if test "${ac_cv_header_stdc+set}" = set; then :
1.2158 +if ${ac_cv_header_stdc+:} false; then :
1.2159 $as_echo_n "(cached) " >&6
1.2160 else
1.2161 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.2162 @@ -28677,7 +28677,7 @@
1.2163 for ac_header in stdio.h
1.2164 do :
1.2165 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
1.2166 -if test "x$ac_cv_header_stdio_h" = x""yes; then :
1.2167 +if test "x$ac_cv_header_stdio_h" = xyes; then :
1.2168 cat >>confdefs.h <<_ACEOF
1.2169 #define HAVE_STDIO_H 1
1.2170 _ACEOF
1.2171 @@ -28706,7 +28706,7 @@
1.2172 # This bug is HP SR number 8606223364.
1.2173 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
1.2174 $as_echo_n "checking size of int *... " >&6; }
1.2175 -if test "${ac_cv_sizeof_int_p+set}" = set; then :
1.2176 +if ${ac_cv_sizeof_int_p+:} false; then :
1.2177 $as_echo_n "(cached) " >&6
1.2178 else
1.2179 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then :
1.2180 @@ -28763,7 +28763,7 @@
1.2181 #
1.2182 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
1.2183 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
1.2184 -if test "${ac_cv_c_bigendian+set}" = set; then :
1.2185 +if ${ac_cv_c_bigendian+:} false; then :
1.2186 $as_echo_n "(cached) " >&6
1.2187 else
1.2188 ac_cv_c_bigendian=unknown
1.2189 @@ -29931,7 +29931,7 @@
1.2190 else
1.2191 case $x_includes,$x_libraries in #(
1.2192 *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
1.2193 - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
1.2194 + *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
1.2195 $as_echo_n "(cached) " >&6
1.2196 else
1.2197 # One or both of the vars are not set, and there is no cached value.
1.2198 @@ -30208,7 +30208,7 @@
1.2199 else
1.2200 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
1.2201 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
1.2202 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
1.2203 +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
1.2204 $as_echo_n "(cached) " >&6
1.2205 else
1.2206 ac_check_lib_save_LIBS=$LIBS
1.2207 @@ -30242,14 +30242,14 @@
1.2208 fi
1.2209 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
1.2210 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
1.2211 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
1.2212 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
1.2213 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
1.2214 fi
1.2215
1.2216 if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1.2217 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
1.2218 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
1.2219 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
1.2220 +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
1.2221 $as_echo_n "(cached) " >&6
1.2222 else
1.2223 ac_check_lib_save_LIBS=$LIBS
1.2224 @@ -30283,7 +30283,7 @@
1.2225 fi
1.2226 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
1.2227 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
1.2228 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
1.2229 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
1.2230 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
1.2231 fi
1.2232
1.2233 @@ -30302,14 +30302,14 @@
1.2234 # The functions gethostbyname, getservbyname, and inet_addr are
1.2235 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
1.2236 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
1.2237 -if test "x$ac_cv_func_gethostbyname" = x""yes; then :
1.2238 +if test "x$ac_cv_func_gethostbyname" = xyes; then :
1.2239
1.2240 fi
1.2241
1.2242 if test $ac_cv_func_gethostbyname = no; then
1.2243 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
1.2244 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
1.2245 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
1.2246 +if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
1.2247 $as_echo_n "(cached) " >&6
1.2248 else
1.2249 ac_check_lib_save_LIBS=$LIBS
1.2250 @@ -30343,14 +30343,14 @@
1.2251 fi
1.2252 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
1.2253 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
1.2254 -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
1.2255 +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
1.2256 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
1.2257 fi
1.2258
1.2259 if test $ac_cv_lib_nsl_gethostbyname = no; then
1.2260 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
1.2261 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
1.2262 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
1.2263 +if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
1.2264 $as_echo_n "(cached) " >&6
1.2265 else
1.2266 ac_check_lib_save_LIBS=$LIBS
1.2267 @@ -30384,7 +30384,7 @@
1.2268 fi
1.2269 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
1.2270 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
1.2271 -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
1.2272 +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
1.2273 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
1.2274 fi
1.2275
1.2276 @@ -30399,14 +30399,14 @@
1.2277 # must be given before -lnsl if both are needed. We assume that
1.2278 # if connect needs -lnsl, so does gethostbyname.
1.2279 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
1.2280 -if test "x$ac_cv_func_connect" = x""yes; then :
1.2281 +if test "x$ac_cv_func_connect" = xyes; then :
1.2282
1.2283 fi
1.2284
1.2285 if test $ac_cv_func_connect = no; then
1.2286 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
1.2287 $as_echo_n "checking for connect in -lsocket... " >&6; }
1.2288 -if test "${ac_cv_lib_socket_connect+set}" = set; then :
1.2289 +if ${ac_cv_lib_socket_connect+:} false; then :
1.2290 $as_echo_n "(cached) " >&6
1.2291 else
1.2292 ac_check_lib_save_LIBS=$LIBS
1.2293 @@ -30440,7 +30440,7 @@
1.2294 fi
1.2295 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
1.2296 $as_echo "$ac_cv_lib_socket_connect" >&6; }
1.2297 -if test "x$ac_cv_lib_socket_connect" = x""yes; then :
1.2298 +if test "x$ac_cv_lib_socket_connect" = xyes; then :
1.2299 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
1.2300 fi
1.2301
1.2302 @@ -30448,14 +30448,14 @@
1.2303
1.2304 # Guillermo Gomez says -lposix is necessary on A/UX.
1.2305 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove"
1.2306 -if test "x$ac_cv_func_remove" = x""yes; then :
1.2307 +if test "x$ac_cv_func_remove" = xyes; then :
1.2308
1.2309 fi
1.2310
1.2311 if test $ac_cv_func_remove = no; then
1.2312 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
1.2313 $as_echo_n "checking for remove in -lposix... " >&6; }
1.2314 -if test "${ac_cv_lib_posix_remove+set}" = set; then :
1.2315 +if ${ac_cv_lib_posix_remove+:} false; then :
1.2316 $as_echo_n "(cached) " >&6
1.2317 else
1.2318 ac_check_lib_save_LIBS=$LIBS
1.2319 @@ -30489,7 +30489,7 @@
1.2320 fi
1.2321 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
1.2322 $as_echo "$ac_cv_lib_posix_remove" >&6; }
1.2323 -if test "x$ac_cv_lib_posix_remove" = x""yes; then :
1.2324 +if test "x$ac_cv_lib_posix_remove" = xyes; then :
1.2325 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
1.2326 fi
1.2327
1.2328 @@ -30497,14 +30497,14 @@
1.2329
1.2330 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1.2331 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
1.2332 -if test "x$ac_cv_func_shmat" = x""yes; then :
1.2333 +if test "x$ac_cv_func_shmat" = xyes; then :
1.2334
1.2335 fi
1.2336
1.2337 if test $ac_cv_func_shmat = no; then
1.2338 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
1.2339 $as_echo_n "checking for shmat in -lipc... " >&6; }
1.2340 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
1.2341 +if ${ac_cv_lib_ipc_shmat+:} false; then :
1.2342 $as_echo_n "(cached) " >&6
1.2343 else
1.2344 ac_check_lib_save_LIBS=$LIBS
1.2345 @@ -30538,7 +30538,7 @@
1.2346 fi
1.2347 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
1.2348 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
1.2349 -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
1.2350 +if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
1.2351 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
1.2352 fi
1.2353
1.2354 @@ -30556,7 +30556,7 @@
1.2355 # John Interrante, Karl Berry
1.2356 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
1.2357 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
1.2358 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
1.2359 +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
1.2360 $as_echo_n "(cached) " >&6
1.2361 else
1.2362 ac_check_lib_save_LIBS=$LIBS
1.2363 @@ -30590,7 +30590,7 @@
1.2364 fi
1.2365 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
1.2366 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
1.2367 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
1.2368 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
1.2369 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
1.2370 fi
1.2371
1.2372 @@ -31131,7 +31131,7 @@
1.2373 as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5
1.2374 fi
1.2375
1.2376 - with_freetype="`cd "$path"; $THEPWDCMD`"
1.2377 + with_freetype="`cd "$path"; $THEPWDCMD -L`"
1.2378 fi
1.2379
1.2380 FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
1.2381 @@ -31433,7 +31433,7 @@
1.2382 as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5
1.2383 fi
1.2384
1.2385 - FREETYPELOCATION="`cd "$path"; $THEPWDCMD`"
1.2386 + FREETYPELOCATION="`cd "$path"; $THEPWDCMD -L`"
1.2387 fi
1.2388
1.2389 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5
1.2390 @@ -31609,7 +31609,7 @@
1.2391 LDFLAGS="$FREETYPE2_LIBS"
1.2392 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
1.2393 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
1.2394 -if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
1.2395 +if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
1.2396 $as_echo_n "(cached) " >&6
1.2397 else
1.2398 ac_check_lib_save_LIBS=$LIBS
1.2399 @@ -31643,7 +31643,7 @@
1.2400 fi
1.2401 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
1.2402 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
1.2403 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then :
1.2404 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
1.2405 FREETYPE2_FOUND=true
1.2406 else
1.2407 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
1.2408 @@ -31931,7 +31931,7 @@
1.2409 for ac_header in alsa/asoundlib.h
1.2410 do :
1.2411 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
1.2412 -if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then :
1.2413 +if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
1.2414 cat >>confdefs.h <<_ACEOF
1.2415 #define HAVE_ALSA_ASOUNDLIB_H 1
1.2416 _ACEOF
1.2417 @@ -31990,7 +31990,7 @@
1.2418 USE_EXTERNAL_LIBJPEG=true
1.2419 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
1.2420 $as_echo_n "checking for main in -ljpeg... " >&6; }
1.2421 -if test "${ac_cv_lib_jpeg_main+set}" = set; then :
1.2422 +if ${ac_cv_lib_jpeg_main+:} false; then :
1.2423 $as_echo_n "(cached) " >&6
1.2424 else
1.2425 ac_check_lib_save_LIBS=$LIBS
1.2426 @@ -32018,7 +32018,7 @@
1.2427 fi
1.2428 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
1.2429 $as_echo "$ac_cv_lib_jpeg_main" >&6; }
1.2430 -if test "x$ac_cv_lib_jpeg_main" = x""yes; then :
1.2431 +if test "x$ac_cv_lib_jpeg_main" = xyes; then :
1.2432 cat >>confdefs.h <<_ACEOF
1.2433 #define HAVE_LIBJPEG 1
1.2434 _ACEOF
1.2435 @@ -32067,7 +32067,7 @@
1.2436 USE_EXTERNAL_LIBGIF=false
1.2437 elif test "x${with_giflib}" = "xsystem"; then
1.2438 ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
1.2439 -if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
1.2440 +if test "x$ac_cv_header_gif_lib_h" = xyes; then :
1.2441
1.2442 else
1.2443 as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5
1.2444 @@ -32076,7 +32076,7 @@
1.2445
1.2446 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5
1.2447 $as_echo_n "checking for DGifGetCode in -lgif... " >&6; }
1.2448 -if test "${ac_cv_lib_gif_DGifGetCode+set}" = set; then :
1.2449 +if ${ac_cv_lib_gif_DGifGetCode+:} false; then :
1.2450 $as_echo_n "(cached) " >&6
1.2451 else
1.2452 ac_check_lib_save_LIBS=$LIBS
1.2453 @@ -32110,7 +32110,7 @@
1.2454 fi
1.2455 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5
1.2456 $as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; }
1.2457 -if test "x$ac_cv_lib_gif_DGifGetCode" = x""yes; then :
1.2458 +if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then :
1.2459 cat >>confdefs.h <<_ACEOF
1.2460 #define HAVE_LIBGIF 1
1.2461 _ACEOF
1.2462 @@ -32142,7 +32142,7 @@
1.2463
1.2464 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
1.2465 $as_echo_n "checking for compress in -lz... " >&6; }
1.2466 -if test "${ac_cv_lib_z_compress+set}" = set; then :
1.2467 +if ${ac_cv_lib_z_compress+:} false; then :
1.2468 $as_echo_n "(cached) " >&6
1.2469 else
1.2470 ac_check_lib_save_LIBS=$LIBS
1.2471 @@ -32176,7 +32176,7 @@
1.2472 fi
1.2473 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
1.2474 $as_echo "$ac_cv_lib_z_compress" >&6; }
1.2475 -if test "x$ac_cv_lib_z_compress" = x""yes; then :
1.2476 +if test "x$ac_cv_lib_z_compress" = xyes; then :
1.2477 ZLIB_FOUND=yes
1.2478 else
1.2479 ZLIB_FOUND=no
1.2480 @@ -32269,7 +32269,7 @@
1.2481
1.2482 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
1.2483 $as_echo_n "checking for cos in -lm... " >&6; }
1.2484 -if test "${ac_cv_lib_m_cos+set}" = set; then :
1.2485 +if ${ac_cv_lib_m_cos+:} false; then :
1.2486 $as_echo_n "(cached) " >&6
1.2487 else
1.2488 ac_check_lib_save_LIBS=$LIBS
1.2489 @@ -32303,7 +32303,7 @@
1.2490 fi
1.2491 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
1.2492 $as_echo "$ac_cv_lib_m_cos" >&6; }
1.2493 -if test "x$ac_cv_lib_m_cos" = x""yes; then :
1.2494 +if test "x$ac_cv_lib_m_cos" = xyes; then :
1.2495 cat >>confdefs.h <<_ACEOF
1.2496 #define HAVE_LIBM 1
1.2497 _ACEOF
1.2498 @@ -32327,7 +32327,7 @@
1.2499 LIBS=""
1.2500 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
1.2501 $as_echo_n "checking for dlopen in -ldl... " >&6; }
1.2502 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
1.2503 +if ${ac_cv_lib_dl_dlopen+:} false; then :
1.2504 $as_echo_n "(cached) " >&6
1.2505 else
1.2506 ac_check_lib_save_LIBS=$LIBS
1.2507 @@ -32361,7 +32361,7 @@
1.2508 fi
1.2509 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
1.2510 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
1.2511 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
1.2512 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
1.2513 cat >>confdefs.h <<_ACEOF
1.2514 #define HAVE_LIBDL 1
1.2515 _ACEOF
1.2516 @@ -32607,7 +32607,7 @@
1.2517 set dummy llvm-config; ac_word=$2
1.2518 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2519 $as_echo_n "checking for $ac_word... " >&6; }
1.2520 -if test "${ac_cv_prog_LLVM_CONFIG+set}" = set; then :
1.2521 +if ${ac_cv_prog_LLVM_CONFIG+:} false; then :
1.2522 $as_echo_n "(cached) " >&6
1.2523 else
1.2524 if test -n "$LLVM_CONFIG"; then
1.2525 @@ -32933,6 +32933,9 @@
1.2526 if test "$JOBS" -gt "16"; then
1.2527 JOBS=16
1.2528 fi
1.2529 + if test "$JOBS" -eq "0"; then
1.2530 + JOBS=1
1.2531 + fi
1.2532 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JOBS" >&5
1.2533 $as_echo "$JOBS" >&6; }
1.2534 else
1.2535 @@ -33216,7 +33219,7 @@
1.2536 set dummy ccache; ac_word=$2
1.2537 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2538 $as_echo_n "checking for $ac_word... " >&6; }
1.2539 -if test "${ac_cv_path_CCACHE+set}" = set; then :
1.2540 +if ${ac_cv_path_CCACHE+:} false; then :
1.2541 $as_echo_n "(cached) " >&6
1.2542 else
1.2543 case $CCACHE in
1.2544 @@ -33477,10 +33480,21 @@
1.2545 :end' >>confcache
1.2546 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
1.2547 if test -w "$cache_file"; then
1.2548 - test "x$cache_file" != "x/dev/null" &&
1.2549 + if test "x$cache_file" != "x/dev/null"; then
1.2550 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
1.2551 $as_echo "$as_me: updating cache $cache_file" >&6;}
1.2552 - cat confcache >$cache_file
1.2553 + if test ! -f "$cache_file" || test -h "$cache_file"; then
1.2554 + cat confcache >"$cache_file"
1.2555 + else
1.2556 + case $cache_file in #(
1.2557 + */* | ?:*)
1.2558 + mv -f confcache "$cache_file"$$ &&
1.2559 + mv -f "$cache_file"$$ "$cache_file" ;; #(
1.2560 + *)
1.2561 + mv -f confcache "$cache_file" ;;
1.2562 + esac
1.2563 + fi
1.2564 + fi
1.2565 else
1.2566 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
1.2567 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
1.2568 @@ -33512,7 +33526,7 @@
1.2569
1.2570
1.2571
1.2572 -: ${CONFIG_STATUS=./config.status}
1.2573 +: "${CONFIG_STATUS=./config.status}"
1.2574 ac_write_fail=0
1.2575 ac_clean_files_save=$ac_clean_files
1.2576 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
1.2577 @@ -33613,6 +33627,7 @@
1.2578 IFS=" "" $as_nl"
1.2579
1.2580 # Find who we are. Look in the path if we contain no directory separator.
1.2581 +as_myself=
1.2582 case $0 in #((
1.2583 *[\\/]* ) as_myself=$0 ;;
1.2584 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.2585 @@ -33920,7 +33935,7 @@
1.2586 # values after options handling.
1.2587 ac_log="
1.2588 This file was extended by OpenJDK $as_me jdk8, which was
1.2589 -generated by GNU Autoconf 2.67. Invocation command line was
1.2590 +generated by GNU Autoconf 2.68. Invocation command line was
1.2591
1.2592 CONFIG_FILES = $CONFIG_FILES
1.2593 CONFIG_HEADERS = $CONFIG_HEADERS
1.2594 @@ -33983,7 +33998,7 @@
1.2595 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1.2596 ac_cs_version="\\
1.2597 OpenJDK config.status jdk8
1.2598 -configured by $0, generated by GNU Autoconf 2.67,
1.2599 +configured by $0, generated by GNU Autoconf 2.68,
1.2600 with options \\"\$ac_cs_config\\"
1.2601
1.2602 Copyright (C) 2010 Free Software Foundation, Inc.
1.2603 @@ -34134,9 +34149,10 @@
1.2604 # after its creation but before its name has been assigned to `$tmp'.
1.2605 $debug ||
1.2606 {
1.2607 - tmp=
1.2608 + tmp= ac_tmp=
1.2609 trap 'exit_status=$?
1.2610 - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
1.2611 + : "${ac_tmp:=$tmp}"
1.2612 + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
1.2613 ' 0
1.2614 trap 'as_fn_exit 1' 1 2 13 15
1.2615 }
1.2616 @@ -34144,12 +34160,13 @@
1.2617
1.2618 {
1.2619 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
1.2620 - test -n "$tmp" && test -d "$tmp"
1.2621 + test -d "$tmp"
1.2622 } ||
1.2623 {
1.2624 tmp=./conf$$-$RANDOM
1.2625 (umask 077 && mkdir "$tmp")
1.2626 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
1.2627 +ac_tmp=$tmp
1.2628
1.2629 # Set up the scripts for CONFIG_FILES section.
1.2630 # No need to generate them if there are no CONFIG_FILES.
1.2631 @@ -34171,7 +34188,7 @@
1.2632 ac_cs_awk_cr=$ac_cr
1.2633 fi
1.2634
1.2635 -echo 'BEGIN {' >"$tmp/subs1.awk" &&
1.2636 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
1.2637 _ACEOF
1.2638
1.2639
1.2640 @@ -34199,7 +34216,7 @@
1.2641 rm -f conf$$subs.sh
1.2642
1.2643 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.2644 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
1.2645 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
1.2646 _ACEOF
1.2647 sed -n '
1.2648 h
1.2649 @@ -34247,7 +34264,7 @@
1.2650 rm -f conf$$subs.awk
1.2651 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.2652 _ACAWK
1.2653 -cat >>"\$tmp/subs1.awk" <<_ACAWK &&
1.2654 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
1.2655 for (key in S) S_is_set[key] = 1
1.2656 FS = ""
1.2657
1.2658 @@ -34279,7 +34296,7 @@
1.2659 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
1.2660 else
1.2661 cat
1.2662 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
1.2663 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
1.2664 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
1.2665 _ACEOF
1.2666
1.2667 @@ -34313,7 +34330,7 @@
1.2668 # No need to generate them if there are no CONFIG_HEADERS.
1.2669 # This happens for instance with `./config.status Makefile'.
1.2670 if test -n "$CONFIG_HEADERS"; then
1.2671 -cat >"$tmp/defines.awk" <<\_ACAWK ||
1.2672 +cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
1.2673 BEGIN {
1.2674 _ACEOF
1.2675
1.2676 @@ -34325,8 +34342,8 @@
1.2677 # handling of long lines.
1.2678 ac_delim='%!_!# '
1.2679 for ac_last_try in false false :; do
1.2680 - ac_t=`sed -n "/$ac_delim/p" confdefs.h`
1.2681 - if test -z "$ac_t"; then
1.2682 + ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
1.2683 + if test -z "$ac_tt"; then
1.2684 break
1.2685 elif $ac_last_try; then
1.2686 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
1.2687 @@ -34446,7 +34463,7 @@
1.2688 for ac_f
1.2689 do
1.2690 case $ac_f in
1.2691 - -) ac_f="$tmp/stdin";;
1.2692 + -) ac_f="$ac_tmp/stdin";;
1.2693 *) # Look for the file first in the build tree, then in the source tree
1.2694 # (if the path is not absolute). The absolute path cannot be DOS-style,
1.2695 # because $ac_f cannot contain `:'.
1.2696 @@ -34481,7 +34498,7 @@
1.2697 esac
1.2698
1.2699 case $ac_tag in
1.2700 - *:-:* | *:-) cat >"$tmp/stdin" \
1.2701 + *:-:* | *:-) cat >"$ac_tmp/stdin" \
1.2702 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
1.2703 esac
1.2704 ;;
1.2705 @@ -34607,21 +34624,22 @@
1.2706 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
1.2707 $ac_datarootdir_hack
1.2708 "
1.2709 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
1.2710 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.2711 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
1.2712 + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.2713
1.2714 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
1.2715 - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
1.2716 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
1.2717 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
1.2718 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
1.2719 + "$ac_tmp/out"`; test -z "$ac_out"; } &&
1.2720 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1.2721 which seems to be undefined. Please make sure it is defined" >&5
1.2722 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1.2723 which seems to be undefined. Please make sure it is defined" >&2;}
1.2724
1.2725 - rm -f "$tmp/stdin"
1.2726 + rm -f "$ac_tmp/stdin"
1.2727 case $ac_file in
1.2728 - -) cat "$tmp/out" && rm -f "$tmp/out";;
1.2729 - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
1.2730 + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
1.2731 + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
1.2732 esac \
1.2733 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.2734 ;;
1.2735 @@ -34632,20 +34650,20 @@
1.2736 if test x"$ac_file" != x-; then
1.2737 {
1.2738 $as_echo "/* $configure_input */" \
1.2739 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
1.2740 - } >"$tmp/config.h" \
1.2741 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
1.2742 + } >"$ac_tmp/config.h" \
1.2743 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.2744 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
1.2745 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
1.2746 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
1.2747 $as_echo "$as_me: $ac_file is unchanged" >&6;}
1.2748 else
1.2749 rm -f "$ac_file"
1.2750 - mv "$tmp/config.h" "$ac_file" \
1.2751 + mv "$ac_tmp/config.h" "$ac_file" \
1.2752 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.2753 fi
1.2754 else
1.2755 $as_echo "/* $configure_input */" \
1.2756 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
1.2757 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
1.2758 || as_fn_error $? "could not create -" "$LINENO" 5
1.2759 fi
1.2760 ;;
