Mercurial > jdk8-mips64-public / changeset
changeset
8008707: build-infra: Closed (deploy) can't be built using environment from SDK SetEnv.cmd
Tue, 11 Jun 2013 13:08:02 +0200
- author
- erikj
- date
- Tue, 11 Jun 2013 13:08:02 +0200
- changeset 733
- 198d25db45da
- parent 731
- 27c51c6e31c1
- child 734
- 3cbcc2b6ba41
8008707: build-infra: Closed (deploy) can't be built using environment from SDK SetEnv.cmd
Reviewed-by: tbell
| common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
| common/autoconf/toolchain_windows.m4 | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/generated-configure.sh Wed Jun 05 15:20:35 2013 -0700 1.2 +++ b/common/autoconf/generated-configure.sh Tue Jun 11 13:08:02 2013 +0200 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.68 for OpenJDK jdk8. 1.7 +# Generated by GNU Autoconf 2.67 for OpenJDK jdk8. 1.8 # 1.9 # Report bugs to <build-dev@openjdk.java.net>. 1.10 # 1.11 @@ -91,7 +91,6 @@ 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 @@ -217,18 +216,11 @@ 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 - case $- in # (((( 1.29 - *v*x* | *x*v* ) as_opts=-vx ;; 1.30 - *v* ) as_opts=-v ;; 1.31 - *x* ) as_opts=-x ;; 1.32 - * ) as_opts= ;; 1.33 - esac 1.34 - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 1.35 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 1.36 fi 1.37 1.38 if test x$as_have_required = xno; then : 1.39 @@ -1468,7 +1460,7 @@ 1.40 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 1.41 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 1.42 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 1.43 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 1.44 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 1.45 ;; 1.46 1.47 esac 1.48 @@ -1904,7 +1896,7 @@ 1.49 if $ac_init_version; then 1.50 cat <<\_ACEOF 1.51 OpenJDK configure jdk8 1.52 -generated by GNU Autoconf 2.68 1.53 +generated by GNU Autoconf 2.67 1.54 1.55 Copyright (C) 2010 Free Software Foundation, Inc. 1.56 This configure script is free software; the Free Software Foundation 1.57 @@ -1950,7 +1942,7 @@ 1.58 1.59 ac_retval=1 1.60 fi 1.61 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.62 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.63 as_fn_set_status $ac_retval 1.64 1.65 } # ac_fn_c_try_compile 1.66 @@ -1988,7 +1980,7 @@ 1.67 1.68 ac_retval=1 1.69 fi 1.70 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.71 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.72 as_fn_set_status $ac_retval 1.73 1.74 } # ac_fn_cxx_try_compile 1.75 @@ -2026,7 +2018,7 @@ 1.76 1.77 ac_retval=1 1.78 fi 1.79 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.80 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.81 as_fn_set_status $ac_retval 1.82 1.83 } # ac_fn_objc_try_compile 1.84 @@ -2063,7 +2055,7 @@ 1.85 1.86 ac_retval=1 1.87 fi 1.88 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.89 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.90 as_fn_set_status $ac_retval 1.91 1.92 } # ac_fn_c_try_cpp 1.93 @@ -2100,7 +2092,7 @@ 1.94 1.95 ac_retval=1 1.96 fi 1.97 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.98 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.99 as_fn_set_status $ac_retval 1.100 1.101 } # ac_fn_cxx_try_cpp 1.102 @@ -2113,10 +2105,10 @@ 1.103 ac_fn_cxx_check_header_mongrel () 1.104 { 1.105 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.106 - if eval \${$3+:} false; then : 1.107 + if eval "test \"\${$3+set}\"" = set; then : 1.108 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.109 $as_echo_n "checking for $2... " >&6; } 1.110 -if eval \${$3+:} false; then : 1.111 +if eval "test \"\${$3+set}\"" = set; then : 1.112 $as_echo_n "(cached) " >&6 1.113 fi 1.114 eval ac_res=\$$3 1.115 @@ -2183,7 +2175,7 @@ 1.116 esac 1.117 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.118 $as_echo_n "checking for $2... " >&6; } 1.119 -if eval \${$3+:} false; then : 1.120 +if eval "test \"\${$3+set}\"" = set; then : 1.121 $as_echo_n "(cached) " >&6 1.122 else 1.123 eval "$3=\$ac_header_compiler" 1.124 @@ -2192,7 +2184,7 @@ 1.125 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.126 $as_echo "$ac_res" >&6; } 1.127 fi 1.128 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.129 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.130 1.131 } # ac_fn_cxx_check_header_mongrel 1.132 1.133 @@ -2233,7 +2225,7 @@ 1.134 ac_retval=$ac_status 1.135 fi 1.136 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1.137 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.138 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.139 as_fn_set_status $ac_retval 1.140 1.141 } # ac_fn_cxx_try_run 1.142 @@ -2247,7 +2239,7 @@ 1.143 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.144 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.145 $as_echo_n "checking for $2... " >&6; } 1.146 -if eval \${$3+:} false; then : 1.147 +if eval "test \"\${$3+set}\"" = set; then : 1.148 $as_echo_n "(cached) " >&6 1.149 else 1.150 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.151 @@ -2265,7 +2257,7 @@ 1.152 eval ac_res=\$$3 1.153 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.154 $as_echo "$ac_res" >&6; } 1.155 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.156 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.157 1.158 } # ac_fn_cxx_check_header_compile 1.159 1.160 @@ -2442,7 +2434,7 @@ 1.161 rm -f conftest.val 1.162 1.163 fi 1.164 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.165 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.166 as_fn_set_status $ac_retval 1.167 1.168 } # ac_fn_cxx_compute_int 1.169 @@ -2488,7 +2480,7 @@ 1.170 # interfere with the next link command; also delete a directory that is 1.171 # left behind by Apple's compiler. We do this before executing the actions. 1.172 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1.173 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.174 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.175 as_fn_set_status $ac_retval 1.176 1.177 } # ac_fn_cxx_try_link 1.178 @@ -2501,7 +2493,7 @@ 1.179 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.180 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.181 $as_echo_n "checking for $2... " >&6; } 1.182 -if eval \${$3+:} false; then : 1.183 +if eval "test \"\${$3+set}\"" = set; then : 1.184 $as_echo_n "(cached) " >&6 1.185 else 1.186 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.187 @@ -2556,7 +2548,7 @@ 1.188 eval ac_res=\$$3 1.189 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.190 $as_echo "$ac_res" >&6; } 1.191 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.192 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.193 1.194 } # ac_fn_cxx_check_func 1.195 1.196 @@ -2569,7 +2561,7 @@ 1.197 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.198 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.199 $as_echo_n "checking for $2... " >&6; } 1.200 -if eval \${$3+:} false; then : 1.201 +if eval "test \"\${$3+set}\"" = set; then : 1.202 $as_echo_n "(cached) " >&6 1.203 else 1.204 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.205 @@ -2587,7 +2579,7 @@ 1.206 eval ac_res=\$$3 1.207 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.208 $as_echo "$ac_res" >&6; } 1.209 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.210 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.211 1.212 } # ac_fn_c_check_header_compile 1.213 cat >config.log <<_ACEOF 1.214 @@ -2595,7 +2587,7 @@ 1.215 running configure, to aid debugging if configure makes a mistake. 1.216 1.217 It was created by OpenJDK $as_me jdk8, which was 1.218 -generated by GNU Autoconf 2.68. Invocation command line was 1.219 +generated by GNU Autoconf 2.67. Invocation command line was 1.220 1.221 $ $0 $@ 1.222 1.223 @@ -2853,7 +2845,7 @@ 1.224 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.225 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.226 as_fn_error $? "failed to load site script $ac_site_file 1.227 -See \`config.log' for more details" "$LINENO" 5; } 1.228 +See \`config.log' for more details" "$LINENO" 5 ; } 1.229 fi 1.230 done 1.231 1.232 @@ -3790,7 +3782,7 @@ 1.233 #CUSTOM_AUTOCONF_INCLUDE 1.234 1.235 # Do not change or remove the following line, it is needed for consistency checks: 1.236 -DATE_WHEN_GENERATED=1370470729 1.237 +DATE_WHEN_GENERATED=1370948811 1.238 1.239 ############################################################################### 1.240 # 1.241 @@ -3828,7 +3820,7 @@ 1.242 set dummy $ac_prog; ac_word=$2 1.243 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.244 $as_echo_n "checking for $ac_word... " >&6; } 1.245 -if ${ac_cv_path_BASENAME+:} false; then : 1.246 +if test "${ac_cv_path_BASENAME+set}" = set; then : 1.247 $as_echo_n "(cached) " >&6 1.248 else 1.249 case $BASENAME in 1.250 @@ -3887,7 +3879,7 @@ 1.251 set dummy $ac_prog; ac_word=$2 1.252 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.253 $as_echo_n "checking for $ac_word... " >&6; } 1.254 -if ${ac_cv_path_BASH+:} false; then : 1.255 +if test "${ac_cv_path_BASH+set}" = set; then : 1.256 $as_echo_n "(cached) " >&6 1.257 else 1.258 case $BASH in 1.259 @@ -3946,7 +3938,7 @@ 1.260 set dummy $ac_prog; ac_word=$2 1.261 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.262 $as_echo_n "checking for $ac_word... " >&6; } 1.263 -if ${ac_cv_path_CAT+:} false; then : 1.264 +if test "${ac_cv_path_CAT+set}" = set; then : 1.265 $as_echo_n "(cached) " >&6 1.266 else 1.267 case $CAT in 1.268 @@ -4005,7 +3997,7 @@ 1.269 set dummy $ac_prog; ac_word=$2 1.270 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.271 $as_echo_n "checking for $ac_word... " >&6; } 1.272 -if ${ac_cv_path_CHMOD+:} false; then : 1.273 +if test "${ac_cv_path_CHMOD+set}" = set; then : 1.274 $as_echo_n "(cached) " >&6 1.275 else 1.276 case $CHMOD in 1.277 @@ -4064,7 +4056,7 @@ 1.278 set dummy $ac_prog; ac_word=$2 1.279 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.280 $as_echo_n "checking for $ac_word... " >&6; } 1.281 -if ${ac_cv_path_CMP+:} false; then : 1.282 +if test "${ac_cv_path_CMP+set}" = set; then : 1.283 $as_echo_n "(cached) " >&6 1.284 else 1.285 case $CMP in 1.286 @@ -4123,7 +4115,7 @@ 1.287 set dummy $ac_prog; ac_word=$2 1.288 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.289 $as_echo_n "checking for $ac_word... " >&6; } 1.290 -if ${ac_cv_path_COMM+:} false; then : 1.291 +if test "${ac_cv_path_COMM+set}" = set; then : 1.292 $as_echo_n "(cached) " >&6 1.293 else 1.294 case $COMM in 1.295 @@ -4182,7 +4174,7 @@ 1.296 set dummy $ac_prog; ac_word=$2 1.297 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.298 $as_echo_n "checking for $ac_word... " >&6; } 1.299 -if ${ac_cv_path_CP+:} false; then : 1.300 +if test "${ac_cv_path_CP+set}" = set; then : 1.301 $as_echo_n "(cached) " >&6 1.302 else 1.303 case $CP in 1.304 @@ -4241,7 +4233,7 @@ 1.305 set dummy $ac_prog; ac_word=$2 1.306 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.307 $as_echo_n "checking for $ac_word... " >&6; } 1.308 -if ${ac_cv_path_CPIO+:} false; then : 1.309 +if test "${ac_cv_path_CPIO+set}" = set; then : 1.310 $as_echo_n "(cached) " >&6 1.311 else 1.312 case $CPIO in 1.313 @@ -4300,7 +4292,7 @@ 1.314 set dummy $ac_prog; ac_word=$2 1.315 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.316 $as_echo_n "checking for $ac_word... " >&6; } 1.317 -if ${ac_cv_path_CUT+:} false; then : 1.318 +if test "${ac_cv_path_CUT+set}" = set; then : 1.319 $as_echo_n "(cached) " >&6 1.320 else 1.321 case $CUT in 1.322 @@ -4359,7 +4351,7 @@ 1.323 set dummy $ac_prog; ac_word=$2 1.324 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.325 $as_echo_n "checking for $ac_word... " >&6; } 1.326 -if ${ac_cv_path_DATE+:} false; then : 1.327 +if test "${ac_cv_path_DATE+set}" = set; then : 1.328 $as_echo_n "(cached) " >&6 1.329 else 1.330 case $DATE in 1.331 @@ -4418,7 +4410,7 @@ 1.332 set dummy $ac_prog; ac_word=$2 1.333 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.334 $as_echo_n "checking for $ac_word... " >&6; } 1.335 -if ${ac_cv_path_DIFF+:} false; then : 1.336 +if test "${ac_cv_path_DIFF+set}" = set; then : 1.337 $as_echo_n "(cached) " >&6 1.338 else 1.339 case $DIFF in 1.340 @@ -4477,7 +4469,7 @@ 1.341 set dummy $ac_prog; ac_word=$2 1.342 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.343 $as_echo_n "checking for $ac_word... " >&6; } 1.344 -if ${ac_cv_path_DIRNAME+:} false; then : 1.345 +if test "${ac_cv_path_DIRNAME+set}" = set; then : 1.346 $as_echo_n "(cached) " >&6 1.347 else 1.348 case $DIRNAME in 1.349 @@ -4536,7 +4528,7 @@ 1.350 set dummy $ac_prog; ac_word=$2 1.351 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.352 $as_echo_n "checking for $ac_word... " >&6; } 1.353 -if ${ac_cv_path_ECHO+:} false; then : 1.354 +if test "${ac_cv_path_ECHO+set}" = set; then : 1.355 $as_echo_n "(cached) " >&6 1.356 else 1.357 case $ECHO in 1.358 @@ -4595,7 +4587,7 @@ 1.359 set dummy $ac_prog; ac_word=$2 1.360 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.361 $as_echo_n "checking for $ac_word... " >&6; } 1.362 -if ${ac_cv_path_EXPR+:} false; then : 1.363 +if test "${ac_cv_path_EXPR+set}" = set; then : 1.364 $as_echo_n "(cached) " >&6 1.365 else 1.366 case $EXPR in 1.367 @@ -4654,7 +4646,7 @@ 1.368 set dummy $ac_prog; ac_word=$2 1.369 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.370 $as_echo_n "checking for $ac_word... " >&6; } 1.371 -if ${ac_cv_path_FILE+:} false; then : 1.372 +if test "${ac_cv_path_FILE+set}" = set; then : 1.373 $as_echo_n "(cached) " >&6 1.374 else 1.375 case $FILE in 1.376 @@ -4713,7 +4705,7 @@ 1.377 set dummy $ac_prog; ac_word=$2 1.378 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.379 $as_echo_n "checking for $ac_word... " >&6; } 1.380 -if ${ac_cv_path_FIND+:} false; then : 1.381 +if test "${ac_cv_path_FIND+set}" = set; then : 1.382 $as_echo_n "(cached) " >&6 1.383 else 1.384 case $FIND in 1.385 @@ -4772,7 +4764,7 @@ 1.386 set dummy $ac_prog; ac_word=$2 1.387 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.388 $as_echo_n "checking for $ac_word... " >&6; } 1.389 -if ${ac_cv_path_HEAD+:} false; then : 1.390 +if test "${ac_cv_path_HEAD+set}" = set; then : 1.391 $as_echo_n "(cached) " >&6 1.392 else 1.393 case $HEAD in 1.394 @@ -4831,7 +4823,7 @@ 1.395 set dummy $ac_prog; ac_word=$2 1.396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.397 $as_echo_n "checking for $ac_word... " >&6; } 1.398 -if ${ac_cv_path_LN+:} false; then : 1.399 +if test "${ac_cv_path_LN+set}" = set; then : 1.400 $as_echo_n "(cached) " >&6 1.401 else 1.402 case $LN in 1.403 @@ -4890,7 +4882,7 @@ 1.404 set dummy $ac_prog; ac_word=$2 1.405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.406 $as_echo_n "checking for $ac_word... " >&6; } 1.407 -if ${ac_cv_path_LS+:} false; then : 1.408 +if test "${ac_cv_path_LS+set}" = set; then : 1.409 $as_echo_n "(cached) " >&6 1.410 else 1.411 case $LS in 1.412 @@ -4949,7 +4941,7 @@ 1.413 set dummy $ac_prog; ac_word=$2 1.414 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.415 $as_echo_n "checking for $ac_word... " >&6; } 1.416 -if ${ac_cv_path_MKDIR+:} false; then : 1.417 +if test "${ac_cv_path_MKDIR+set}" = set; then : 1.418 $as_echo_n "(cached) " >&6 1.419 else 1.420 case $MKDIR in 1.421 @@ -5008,7 +5000,7 @@ 1.422 set dummy $ac_prog; ac_word=$2 1.423 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.424 $as_echo_n "checking for $ac_word... " >&6; } 1.425 -if ${ac_cv_path_MKTEMP+:} false; then : 1.426 +if test "${ac_cv_path_MKTEMP+set}" = set; then : 1.427 $as_echo_n "(cached) " >&6 1.428 else 1.429 case $MKTEMP in 1.430 @@ -5067,7 +5059,7 @@ 1.431 set dummy $ac_prog; ac_word=$2 1.432 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.433 $as_echo_n "checking for $ac_word... " >&6; } 1.434 -if ${ac_cv_path_MV+:} false; then : 1.435 +if test "${ac_cv_path_MV+set}" = set; then : 1.436 $as_echo_n "(cached) " >&6 1.437 else 1.438 case $MV in 1.439 @@ -5126,7 +5118,7 @@ 1.440 set dummy $ac_prog; ac_word=$2 1.441 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.442 $as_echo_n "checking for $ac_word... " >&6; } 1.443 -if ${ac_cv_path_PRINTF+:} false; then : 1.444 +if test "${ac_cv_path_PRINTF+set}" = set; then : 1.445 $as_echo_n "(cached) " >&6 1.446 else 1.447 case $PRINTF in 1.448 @@ -5185,7 +5177,7 @@ 1.449 set dummy $ac_prog; ac_word=$2 1.450 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.451 $as_echo_n "checking for $ac_word... " >&6; } 1.452 -if ${ac_cv_path_RM+:} false; then : 1.453 +if test "${ac_cv_path_RM+set}" = set; then : 1.454 $as_echo_n "(cached) " >&6 1.455 else 1.456 case $RM in 1.457 @@ -5244,7 +5236,7 @@ 1.458 set dummy $ac_prog; ac_word=$2 1.459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.460 $as_echo_n "checking for $ac_word... " >&6; } 1.461 -if ${ac_cv_path_SH+:} false; then : 1.462 +if test "${ac_cv_path_SH+set}" = set; then : 1.463 $as_echo_n "(cached) " >&6 1.464 else 1.465 case $SH in 1.466 @@ -5303,7 +5295,7 @@ 1.467 set dummy $ac_prog; ac_word=$2 1.468 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.469 $as_echo_n "checking for $ac_word... " >&6; } 1.470 -if ${ac_cv_path_SORT+:} false; then : 1.471 +if test "${ac_cv_path_SORT+set}" = set; then : 1.472 $as_echo_n "(cached) " >&6 1.473 else 1.474 case $SORT in 1.475 @@ -5362,7 +5354,7 @@ 1.476 set dummy $ac_prog; ac_word=$2 1.477 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.478 $as_echo_n "checking for $ac_word... " >&6; } 1.479 -if ${ac_cv_path_TAIL+:} false; then : 1.480 +if test "${ac_cv_path_TAIL+set}" = set; then : 1.481 $as_echo_n "(cached) " >&6 1.482 else 1.483 case $TAIL in 1.484 @@ -5421,7 +5413,7 @@ 1.485 set dummy $ac_prog; ac_word=$2 1.486 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.487 $as_echo_n "checking for $ac_word... " >&6; } 1.488 -if ${ac_cv_path_TAR+:} false; then : 1.489 +if test "${ac_cv_path_TAR+set}" = set; then : 1.490 $as_echo_n "(cached) " >&6 1.491 else 1.492 case $TAR in 1.493 @@ -5480,7 +5472,7 @@ 1.494 set dummy $ac_prog; ac_word=$2 1.495 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.496 $as_echo_n "checking for $ac_word... " >&6; } 1.497 -if ${ac_cv_path_TEE+:} false; then : 1.498 +if test "${ac_cv_path_TEE+set}" = set; then : 1.499 $as_echo_n "(cached) " >&6 1.500 else 1.501 case $TEE in 1.502 @@ -5539,7 +5531,7 @@ 1.503 set dummy $ac_prog; ac_word=$2 1.504 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.505 $as_echo_n "checking for $ac_word... " >&6; } 1.506 -if ${ac_cv_path_TOUCH+:} false; then : 1.507 +if test "${ac_cv_path_TOUCH+set}" = set; then : 1.508 $as_echo_n "(cached) " >&6 1.509 else 1.510 case $TOUCH in 1.511 @@ -5598,7 +5590,7 @@ 1.512 set dummy $ac_prog; ac_word=$2 1.513 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.514 $as_echo_n "checking for $ac_word... " >&6; } 1.515 -if ${ac_cv_path_TR+:} false; then : 1.516 +if test "${ac_cv_path_TR+set}" = set; then : 1.517 $as_echo_n "(cached) " >&6 1.518 else 1.519 case $TR in 1.520 @@ -5657,7 +5649,7 @@ 1.521 set dummy $ac_prog; ac_word=$2 1.522 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.523 $as_echo_n "checking for $ac_word... " >&6; } 1.524 -if ${ac_cv_path_UNAME+:} false; then : 1.525 +if test "${ac_cv_path_UNAME+set}" = set; then : 1.526 $as_echo_n "(cached) " >&6 1.527 else 1.528 case $UNAME in 1.529 @@ -5716,7 +5708,7 @@ 1.530 set dummy $ac_prog; ac_word=$2 1.531 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.532 $as_echo_n "checking for $ac_word... " >&6; } 1.533 -if ${ac_cv_path_UNIQ+:} false; then : 1.534 +if test "${ac_cv_path_UNIQ+set}" = set; then : 1.535 $as_echo_n "(cached) " >&6 1.536 else 1.537 case $UNIQ in 1.538 @@ -5775,7 +5767,7 @@ 1.539 set dummy $ac_prog; ac_word=$2 1.540 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.541 $as_echo_n "checking for $ac_word... " >&6; } 1.542 -if ${ac_cv_path_WC+:} false; then : 1.543 +if test "${ac_cv_path_WC+set}" = set; then : 1.544 $as_echo_n "(cached) " >&6 1.545 else 1.546 case $WC in 1.547 @@ -5834,7 +5826,7 @@ 1.548 set dummy $ac_prog; ac_word=$2 1.549 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.550 $as_echo_n "checking for $ac_word... " >&6; } 1.551 -if ${ac_cv_path_WHICH+:} false; then : 1.552 +if test "${ac_cv_path_WHICH+set}" = set; then : 1.553 $as_echo_n "(cached) " >&6 1.554 else 1.555 case $WHICH in 1.556 @@ -5893,7 +5885,7 @@ 1.557 set dummy $ac_prog; ac_word=$2 1.558 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.559 $as_echo_n "checking for $ac_word... " >&6; } 1.560 -if ${ac_cv_path_XARGS+:} false; then : 1.561 +if test "${ac_cv_path_XARGS+set}" = set; then : 1.562 $as_echo_n "(cached) " >&6 1.563 else 1.564 case $XARGS in 1.565 @@ -5953,7 +5945,7 @@ 1.566 set dummy $ac_prog; ac_word=$2 1.567 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.568 $as_echo_n "checking for $ac_word... " >&6; } 1.569 -if ${ac_cv_prog_AWK+:} false; then : 1.570 +if test "${ac_cv_prog_AWK+set}" = set; then : 1.571 $as_echo_n "(cached) " >&6 1.572 else 1.573 if test -n "$AWK"; then 1.574 @@ -6003,7 +5995,7 @@ 1.575 1.576 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 1.577 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 1.578 -if ${ac_cv_path_GREP+:} false; then : 1.579 +if test "${ac_cv_path_GREP+set}" = set; then : 1.580 $as_echo_n "(cached) " >&6 1.581 else 1.582 if test -z "$GREP"; then 1.583 @@ -6078,7 +6070,7 @@ 1.584 1.585 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 1.586 $as_echo_n "checking for egrep... " >&6; } 1.587 -if ${ac_cv_path_EGREP+:} false; then : 1.588 +if test "${ac_cv_path_EGREP+set}" = set; then : 1.589 $as_echo_n "(cached) " >&6 1.590 else 1.591 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 1.592 @@ -6157,7 +6149,7 @@ 1.593 1.594 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 1.595 $as_echo_n "checking for fgrep... " >&6; } 1.596 -if ${ac_cv_path_FGREP+:} false; then : 1.597 +if test "${ac_cv_path_FGREP+set}" = set; then : 1.598 $as_echo_n "(cached) " >&6 1.599 else 1.600 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 1.601 @@ -6236,7 +6228,7 @@ 1.602 1.603 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 1.604 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 1.605 -if ${ac_cv_path_SED+:} false; then : 1.606 +if test "${ac_cv_path_SED+set}" = set; then : 1.607 $as_echo_n "(cached) " >&6 1.608 else 1.609 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ 1.610 @@ -6322,7 +6314,7 @@ 1.611 set dummy $ac_prog; ac_word=$2 1.612 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.613 $as_echo_n "checking for $ac_word... " >&6; } 1.614 -if ${ac_cv_path_NAWK+:} false; then : 1.615 +if test "${ac_cv_path_NAWK+set}" = set; then : 1.616 $as_echo_n "(cached) " >&6 1.617 else 1.618 case $NAWK in 1.619 @@ -6386,7 +6378,7 @@ 1.620 set dummy cygpath; ac_word=$2 1.621 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.622 $as_echo_n "checking for $ac_word... " >&6; } 1.623 -if ${ac_cv_path_CYGPATH+:} false; then : 1.624 +if test "${ac_cv_path_CYGPATH+set}" = set; then : 1.625 $as_echo_n "(cached) " >&6 1.626 else 1.627 case $CYGPATH in 1.628 @@ -6426,7 +6418,7 @@ 1.629 set dummy readlink; ac_word=$2 1.630 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.631 $as_echo_n "checking for $ac_word... " >&6; } 1.632 -if ${ac_cv_path_READLINK+:} false; then : 1.633 +if test "${ac_cv_path_READLINK+set}" = set; then : 1.634 $as_echo_n "(cached) " >&6 1.635 else 1.636 case $READLINK in 1.637 @@ -6466,7 +6458,7 @@ 1.638 set dummy df; ac_word=$2 1.639 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.640 $as_echo_n "checking for $ac_word... " >&6; } 1.641 -if ${ac_cv_path_DF+:} false; then : 1.642 +if test "${ac_cv_path_DF+set}" = set; then : 1.643 $as_echo_n "(cached) " >&6 1.644 else 1.645 case $DF in 1.646 @@ -6506,7 +6498,7 @@ 1.647 set dummy SetFile; ac_word=$2 1.648 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.649 $as_echo_n "checking for $ac_word... " >&6; } 1.650 -if ${ac_cv_path_SETFILE+:} false; then : 1.651 +if test "${ac_cv_path_SETFILE+set}" = set; then : 1.652 $as_echo_n "(cached) " >&6 1.653 else 1.654 case $SETFILE in 1.655 @@ -6552,7 +6544,7 @@ 1.656 1.657 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 1.658 $as_echo_n "checking build system type... " >&6; } 1.659 -if ${ac_cv_build+:} false; then : 1.660 +if test "${ac_cv_build+set}" = set; then : 1.661 $as_echo_n "(cached) " >&6 1.662 else 1.663 ac_build_alias=$build_alias 1.664 @@ -6568,7 +6560,7 @@ 1.665 $as_echo "$ac_cv_build" >&6; } 1.666 case $ac_cv_build in 1.667 *-*-*) ;; 1.668 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 1.669 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 1.670 esac 1.671 build=$ac_cv_build 1.672 ac_save_IFS=$IFS; IFS='-' 1.673 @@ -6586,7 +6578,7 @@ 1.674 1.675 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 1.676 $as_echo_n "checking host system type... " >&6; } 1.677 -if ${ac_cv_host+:} false; then : 1.678 +if test "${ac_cv_host+set}" = set; then : 1.679 $as_echo_n "(cached) " >&6 1.680 else 1.681 if test "x$host_alias" = x; then 1.682 @@ -6601,7 +6593,7 @@ 1.683 $as_echo "$ac_cv_host" >&6; } 1.684 case $ac_cv_host in 1.685 *-*-*) ;; 1.686 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 1.687 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 1.688 esac 1.689 host=$ac_cv_host 1.690 ac_save_IFS=$IFS; IFS='-' 1.691 @@ -6619,7 +6611,7 @@ 1.692 1.693 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 1.694 $as_echo_n "checking target system type... " >&6; } 1.695 -if ${ac_cv_target+:} false; then : 1.696 +if test "${ac_cv_target+set}" = set; then : 1.697 $as_echo_n "(cached) " >&6 1.698 else 1.699 if test "x$target_alias" = x; then 1.700 @@ -6634,7 +6626,7 @@ 1.701 $as_echo "$ac_cv_target" >&6; } 1.702 case $ac_cv_target in 1.703 *-*-*) ;; 1.704 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 1.705 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 1.706 esac 1.707 target=$ac_cv_target 1.708 ac_save_IFS=$IFS; IFS='-' 1.709 @@ -8031,7 +8023,7 @@ 1.710 set dummy $ac_prog; ac_word=$2 1.711 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.712 $as_echo_n "checking for $ac_word... " >&6; } 1.713 -if ${ac_cv_prog_PKGHANDLER+:} false; then : 1.714 +if test "${ac_cv_prog_PKGHANDLER+set}" = set; then : 1.715 $as_echo_n "(cached) " >&6 1.716 else 1.717 if test -n "$PKGHANDLER"; then 1.718 @@ -8396,7 +8388,7 @@ 1.719 set dummy $ac_prog; ac_word=$2 1.720 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.721 $as_echo_n "checking for $ac_word... " >&6; } 1.722 -if ${ac_cv_path_CHECK_GMAKE+:} false; then : 1.723 +if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then : 1.724 $as_echo_n "(cached) " >&6 1.725 else 1.726 case $CHECK_GMAKE in 1.727 @@ -8750,7 +8742,7 @@ 1.728 set dummy $ac_prog; ac_word=$2 1.729 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.730 $as_echo_n "checking for $ac_word... " >&6; } 1.731 -if ${ac_cv_path_CHECK_MAKE+:} false; then : 1.732 +if test "${ac_cv_path_CHECK_MAKE+set}" = set; then : 1.733 $as_echo_n "(cached) " >&6 1.734 else 1.735 case $CHECK_MAKE in 1.736 @@ -9109,7 +9101,7 @@ 1.737 set dummy $ac_prog; ac_word=$2 1.738 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.739 $as_echo_n "checking for $ac_word... " >&6; } 1.740 -if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then : 1.741 +if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then : 1.742 $as_echo_n "(cached) " >&6 1.743 else 1.744 case $CHECK_TOOLSDIR_GMAKE in 1.745 @@ -9462,7 +9454,7 @@ 1.746 set dummy $ac_prog; ac_word=$2 1.747 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.748 $as_echo_n "checking for $ac_word... " >&6; } 1.749 -if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then : 1.750 +if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then : 1.751 $as_echo_n "(cached) " >&6 1.752 else 1.753 case $CHECK_TOOLSDIR_MAKE in 1.754 @@ -9858,7 +9850,7 @@ 1.755 set dummy $ac_prog; ac_word=$2 1.756 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.757 $as_echo_n "checking for $ac_word... " >&6; } 1.758 -if ${ac_cv_path_UNZIP+:} false; then : 1.759 +if test "${ac_cv_path_UNZIP+set}" = set; then : 1.760 $as_echo_n "(cached) " >&6 1.761 else 1.762 case $UNZIP in 1.763 @@ -9917,7 +9909,7 @@ 1.764 set dummy $ac_prog; ac_word=$2 1.765 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.766 $as_echo_n "checking for $ac_word... " >&6; } 1.767 -if ${ac_cv_path_ZIP+:} false; then : 1.768 +if test "${ac_cv_path_ZIP+set}" = set; then : 1.769 $as_echo_n "(cached) " >&6 1.770 else 1.771 case $ZIP in 1.772 @@ -9976,7 +9968,7 @@ 1.773 set dummy ldd; ac_word=$2 1.774 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.775 $as_echo_n "checking for $ac_word... " >&6; } 1.776 -if ${ac_cv_path_LDD+:} false; then : 1.777 +if test "${ac_cv_path_LDD+set}" = set; then : 1.778 $as_echo_n "(cached) " >&6 1.779 else 1.780 case $LDD in 1.781 @@ -10022,7 +10014,7 @@ 1.782 set dummy otool; ac_word=$2 1.783 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.784 $as_echo_n "checking for $ac_word... " >&6; } 1.785 -if ${ac_cv_path_OTOOL+:} false; then : 1.786 +if test "${ac_cv_path_OTOOL+set}" = set; then : 1.787 $as_echo_n "(cached) " >&6 1.788 else 1.789 case $OTOOL in 1.790 @@ -10067,7 +10059,7 @@ 1.791 set dummy $ac_prog; ac_word=$2 1.792 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.793 $as_echo_n "checking for $ac_word... " >&6; } 1.794 -if ${ac_cv_path_READELF+:} false; then : 1.795 +if test "${ac_cv_path_READELF+set}" = set; then : 1.796 $as_echo_n "(cached) " >&6 1.797 else 1.798 case $READELF in 1.799 @@ -10110,7 +10102,7 @@ 1.800 set dummy hg; ac_word=$2 1.801 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.802 $as_echo_n "checking for $ac_word... " >&6; } 1.803 -if ${ac_cv_path_HG+:} false; then : 1.804 +if test "${ac_cv_path_HG+set}" = set; then : 1.805 $as_echo_n "(cached) " >&6 1.806 else 1.807 case $HG in 1.808 @@ -10150,7 +10142,7 @@ 1.809 set dummy stat; ac_word=$2 1.810 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.811 $as_echo_n "checking for $ac_word... " >&6; } 1.812 -if ${ac_cv_path_STAT+:} false; then : 1.813 +if test "${ac_cv_path_STAT+set}" = set; then : 1.814 $as_echo_n "(cached) " >&6 1.815 else 1.816 case $STAT in 1.817 @@ -10190,7 +10182,7 @@ 1.818 set dummy time; ac_word=$2 1.819 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.820 $as_echo_n "checking for $ac_word... " >&6; } 1.821 -if ${ac_cv_path_TIME+:} false; then : 1.822 +if test "${ac_cv_path_TIME+set}" = set; then : 1.823 $as_echo_n "(cached) " >&6 1.824 else 1.825 case $TIME in 1.826 @@ -10235,7 +10227,7 @@ 1.827 set dummy $ac_prog; ac_word=$2 1.828 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.829 $as_echo_n "checking for $ac_word... " >&6; } 1.830 -if ${ac_cv_path_COMM+:} false; then : 1.831 +if test "${ac_cv_path_COMM+set}" = set; then : 1.832 $as_echo_n "(cached) " >&6 1.833 else 1.834 case $COMM in 1.835 @@ -10297,7 +10289,7 @@ 1.836 set dummy $ac_prog; ac_word=$2 1.837 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.838 $as_echo_n "checking for $ac_word... " >&6; } 1.839 -if ${ac_cv_path_XATTR+:} false; then : 1.840 +if test "${ac_cv_path_XATTR+set}" = set; then : 1.841 $as_echo_n "(cached) " >&6 1.842 else 1.843 case $XATTR in 1.844 @@ -10353,7 +10345,7 @@ 1.845 set dummy codesign; ac_word=$2 1.846 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.847 $as_echo_n "checking for $ac_word... " >&6; } 1.848 -if ${ac_cv_path_CODESIGN+:} false; then : 1.849 +if test "${ac_cv_path_CODESIGN+set}" = set; then : 1.850 $as_echo_n "(cached) " >&6 1.851 else 1.852 case $CODESIGN in 1.853 @@ -10417,7 +10409,7 @@ 1.854 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 1.855 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.856 $as_echo_n "checking for $ac_word... " >&6; } 1.857 -if ${ac_cv_path_PKG_CONFIG+:} false; then : 1.858 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 1.859 $as_echo_n "(cached) " >&6 1.860 else 1.861 case $PKG_CONFIG in 1.862 @@ -10460,7 +10452,7 @@ 1.863 set dummy pkg-config; ac_word=$2 1.864 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.865 $as_echo_n "checking for $ac_word... " >&6; } 1.866 -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : 1.867 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : 1.868 $as_echo_n "(cached) " >&6 1.869 else 1.870 case $ac_pt_PKG_CONFIG in 1.871 @@ -10633,7 +10625,7 @@ 1.872 set dummy $ac_prog; ac_word=$2 1.873 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.874 $as_echo_n "checking for $ac_word... " >&6; } 1.875 -if ${ac_cv_prog_BDEPS_UNZIP+:} false; then : 1.876 +if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then : 1.877 $as_echo_n "(cached) " >&6 1.878 else 1.879 if test -n "$BDEPS_UNZIP"; then 1.880 @@ -10679,7 +10671,7 @@ 1.881 set dummy $ac_prog; ac_word=$2 1.882 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.883 $as_echo_n "checking for $ac_word... " >&6; } 1.884 -if ${ac_cv_prog_BDEPS_FTP+:} false; then : 1.885 +if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then : 1.886 $as_echo_n "(cached) " >&6 1.887 else 1.888 if test -n "$BDEPS_FTP"; then 1.889 @@ -11979,7 +11971,7 @@ 1.890 set dummy javac; ac_word=$2 1.891 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.892 $as_echo_n "checking for $ac_word... " >&6; } 1.893 -if ${ac_cv_path_JAVAC_CHECK+:} false; then : 1.894 +if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then : 1.895 $as_echo_n "(cached) " >&6 1.896 else 1.897 case $JAVAC_CHECK in 1.898 @@ -12019,7 +12011,7 @@ 1.899 set dummy java; ac_word=$2 1.900 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.901 $as_echo_n "checking for $ac_word... " >&6; } 1.902 -if ${ac_cv_path_JAVA_CHECK+:} false; then : 1.903 +if test "${ac_cv_path_JAVA_CHECK+set}" = set; then : 1.904 $as_echo_n "(cached) " >&6 1.905 else 1.906 case $JAVA_CHECK in 1.907 @@ -16348,7 +16340,7 @@ 1.908 set dummy $ac_prog; ac_word=$2 1.909 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.910 $as_echo_n "checking for $ac_word... " >&6; } 1.911 -if ${ac_cv_path_JTREGEXE+:} false; then : 1.912 +if test "${ac_cv_path_JTREGEXE+set}" = set; then : 1.913 $as_echo_n "(cached) " >&6 1.914 else 1.915 case $JTREGEXE in 1.916 @@ -16416,7 +16408,7 @@ 1.917 set dummy link; ac_word=$2 1.918 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.919 $as_echo_n "checking for $ac_word... " >&6; } 1.920 -if ${ac_cv_path_CYGWIN_LINK+:} false; then : 1.921 +if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then : 1.922 $as_echo_n "(cached) " >&6 1.923 else 1.924 case $CYGWIN_LINK in 1.925 @@ -16518,6 +16510,123 @@ 1.926 as_fn_error $? "Cannot locate a valid Visual Studio installation" "$LINENO" 5 1.927 fi 1.928 1.929 + if test "x$VS100COMNTOOLS" != x; then 1.930 + 1.931 + if test "x$VS_ENV_CMD" = x; then 1.932 + VS100BASE="$VS100COMNTOOLS/../.." 1.933 + METHOD="VS100COMNTOOLS variable" 1.934 + 1.935 + windows_path="$VS100BASE" 1.936 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.937 + unix_path=`$CYGPATH -u "$windows_path"` 1.938 + VS100BASE="$unix_path" 1.939 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.940 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 1.941 + VS100BASE="$unix_path" 1.942 + fi 1.943 + 1.944 + if test -d "$VS100BASE"; then 1.945 + if test -f "$VS100BASE/$VCVARSFILE"; then 1.946 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.947 +$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.948 + VS_ENV_CMD="$VS100BASE/$VCVARSFILE" 1.949 + else 1.950 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.951 +$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.952 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5 1.953 +$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;} 1.954 + fi 1.955 + fi 1.956 + fi 1.957 + 1.958 + fi 1.959 + if test "x$PROGRAMFILES" != x; then 1.960 + 1.961 + if test "x$VS_ENV_CMD" = x; then 1.962 + VS100BASE="$PROGRAMFILES/Microsoft Visual Studio 10.0" 1.963 + METHOD="well-known name" 1.964 + 1.965 + windows_path="$VS100BASE" 1.966 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.967 + unix_path=`$CYGPATH -u "$windows_path"` 1.968 + VS100BASE="$unix_path" 1.969 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.970 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 1.971 + VS100BASE="$unix_path" 1.972 + fi 1.973 + 1.974 + if test -d "$VS100BASE"; then 1.975 + if test -f "$VS100BASE/$VCVARSFILE"; then 1.976 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.977 +$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.978 + VS_ENV_CMD="$VS100BASE/$VCVARSFILE" 1.979 + else 1.980 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.981 +$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.982 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5 1.983 +$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;} 1.984 + fi 1.985 + fi 1.986 + fi 1.987 + 1.988 + fi 1.989 + 1.990 + if test "x$VS_ENV_CMD" = x; then 1.991 + VS100BASE="C:/Program Files/Microsoft Visual Studio 10.0" 1.992 + METHOD="well-known name" 1.993 + 1.994 + windows_path="$VS100BASE" 1.995 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.996 + unix_path=`$CYGPATH -u "$windows_path"` 1.997 + VS100BASE="$unix_path" 1.998 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.999 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 1.1000 + VS100BASE="$unix_path" 1.1001 + fi 1.1002 + 1.1003 + if test -d "$VS100BASE"; then 1.1004 + if test -f "$VS100BASE/$VCVARSFILE"; then 1.1005 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1006 +$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1007 + VS_ENV_CMD="$VS100BASE/$VCVARSFILE" 1.1008 + else 1.1009 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1010 +$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1011 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5 1.1012 +$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;} 1.1013 + fi 1.1014 + fi 1.1015 + fi 1.1016 + 1.1017 + 1.1018 + if test "x$VS_ENV_CMD" = x; then 1.1019 + VS100BASE="C:/Program Files (x86)/Microsoft Visual Studio 10.0" 1.1020 + METHOD="well-known name" 1.1021 + 1.1022 + windows_path="$VS100BASE" 1.1023 + if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.1024 + unix_path=`$CYGPATH -u "$windows_path"` 1.1025 + VS100BASE="$unix_path" 1.1026 + elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.1027 + unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 1.1028 + VS100BASE="$unix_path" 1.1029 + fi 1.1030 + 1.1031 + if test -d "$VS100BASE"; then 1.1032 + if test -f "$VS100BASE/$VCVARSFILE"; then 1.1033 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1034 +$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1035 + VS_ENV_CMD="$VS100BASE/$VCVARSFILE" 1.1036 + else 1.1037 + { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1038 +$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1039 + { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5 1.1040 +$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;} 1.1041 + fi 1.1042 + fi 1.1043 + fi 1.1044 + 1.1045 + 1.1046 if test "x$ProgramW6432" != x; then 1.1047 1.1048 if test "x$VS_ENV_CMD" = x; then 1.1049 @@ -16725,123 +16834,6 @@ 1.1050 fi 1.1051 1.1052 1.1053 - if test "x$VS100COMNTOOLS" != x; then 1.1054 - 1.1055 - if test "x$VS_ENV_CMD" = x; then 1.1056 - VS100BASE="$VS100COMNTOOLS/../.." 1.1057 - METHOD="VS100COMNTOOLS variable" 1.1058 - 1.1059 - windows_path="$VS100BASE" 1.1060 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.1061 - unix_path=`$CYGPATH -u "$windows_path"` 1.1062 - VS100BASE="$unix_path" 1.1063 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.1064 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 1.1065 - VS100BASE="$unix_path" 1.1066 - fi 1.1067 - 1.1068 - if test -d "$VS100BASE"; then 1.1069 - if test -f "$VS100BASE/$VCVARSFILE"; then 1.1070 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1071 -$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1072 - VS_ENV_CMD="$VS100BASE/$VCVARSFILE" 1.1073 - else 1.1074 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1075 -$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1076 - { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5 1.1077 -$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;} 1.1078 - fi 1.1079 - fi 1.1080 - fi 1.1081 - 1.1082 - fi 1.1083 - if test "x$PROGRAMFILES" != x; then 1.1084 - 1.1085 - if test "x$VS_ENV_CMD" = x; then 1.1086 - VS100BASE="$PROGRAMFILES/Microsoft Visual Studio 10.0" 1.1087 - METHOD="well-known name" 1.1088 - 1.1089 - windows_path="$VS100BASE" 1.1090 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.1091 - unix_path=`$CYGPATH -u "$windows_path"` 1.1092 - VS100BASE="$unix_path" 1.1093 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.1094 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 1.1095 - VS100BASE="$unix_path" 1.1096 - fi 1.1097 - 1.1098 - if test -d "$VS100BASE"; then 1.1099 - if test -f "$VS100BASE/$VCVARSFILE"; then 1.1100 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1101 -$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1102 - VS_ENV_CMD="$VS100BASE/$VCVARSFILE" 1.1103 - else 1.1104 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1105 -$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1106 - { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5 1.1107 -$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;} 1.1108 - fi 1.1109 - fi 1.1110 - fi 1.1111 - 1.1112 - fi 1.1113 - 1.1114 - if test "x$VS_ENV_CMD" = x; then 1.1115 - VS100BASE="C:/Program Files/Microsoft Visual Studio 10.0" 1.1116 - METHOD="well-known name" 1.1117 - 1.1118 - windows_path="$VS100BASE" 1.1119 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.1120 - unix_path=`$CYGPATH -u "$windows_path"` 1.1121 - VS100BASE="$unix_path" 1.1122 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.1123 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 1.1124 - VS100BASE="$unix_path" 1.1125 - fi 1.1126 - 1.1127 - if test -d "$VS100BASE"; then 1.1128 - if test -f "$VS100BASE/$VCVARSFILE"; then 1.1129 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1130 -$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1131 - VS_ENV_CMD="$VS100BASE/$VCVARSFILE" 1.1132 - else 1.1133 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1134 -$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1135 - { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5 1.1136 -$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;} 1.1137 - fi 1.1138 - fi 1.1139 - fi 1.1140 - 1.1141 - 1.1142 - if test "x$VS_ENV_CMD" = x; then 1.1143 - VS100BASE="C:/Program Files (x86)/Microsoft Visual Studio 10.0" 1.1144 - METHOD="well-known name" 1.1145 - 1.1146 - windows_path="$VS100BASE" 1.1147 - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then 1.1148 - unix_path=`$CYGPATH -u "$windows_path"` 1.1149 - VS100BASE="$unix_path" 1.1150 - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then 1.1151 - unix_path=`$ECHO "$windows_path" | $SED -e 's,^\\(.\\):,/\\1,g' -e 's,\\\\,/,g'` 1.1152 - VS100BASE="$unix_path" 1.1153 - fi 1.1154 - 1.1155 - if test -d "$VS100BASE"; then 1.1156 - if test -f "$VS100BASE/$VCVARSFILE"; then 1.1157 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1158 -$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1159 - VS_ENV_CMD="$VS100BASE/$VCVARSFILE" 1.1160 - else 1.1161 - { $as_echo "$as_me:${as_lineno-$LINENO}: Found Visual Studio installation at $VS100BASE using $METHOD" >&5 1.1162 -$as_echo "$as_me: Found Visual Studio installation at $VS100BASE using $METHOD" >&6;} 1.1163 - { $as_echo "$as_me:${as_lineno-$LINENO}: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&5 1.1164 -$as_echo "$as_me: Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring" >&6;} 1.1165 - fi 1.1166 - fi 1.1167 - fi 1.1168 - 1.1169 - 1.1170 if test "x$VS_ENV_CMD" != x; then 1.1171 # We have found a Visual Studio environment on disk, let's extract variables from the vsvars bat file. 1.1172 1.1173 @@ -17243,11 +17235,25 @@ 1.1174 $as_echo "$as_me: Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR" >&6;} 1.1175 fi 1.1176 fi 1.1177 + # Try some fallback alternatives 1.1178 if test "x$MSVCR_DLL" = x; then 1.1179 - if test -f "$SYSTEMROOT/system32/msvcr100.dll"; then 1.1180 - { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in $SYSTEMROOT/system32" >&5 1.1181 + # If visual studio express is installed, there is usually one with the debugger 1.1182 + if test "x$VS100COMNTOOLS" != x; then 1.1183 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 1.1184 + MSVCR_DLL=`find "$VS100COMNTOOLS/.." -name msvcr100.dll | grep -i x64 | head --lines 1` 1.1185 + { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in $VS100COMNTOOLS..: $VS100COMNTOOLS.." >&5 1.1186 +$as_echo "$as_me: msvcr100.dll found in $VS100COMNTOOLS..: $VS100COMNTOOLS.." >&6;} 1.1187 + fi 1.1188 + fi 1.1189 + fi 1.1190 + if test "x$MSVCR_DLL" = x; then 1.1191 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 1.1192 + # Fallback for 32bit builds, look in the windows directory. 1.1193 + if test -f "$SYSTEMROOT/system32/msvcr100.dll"; then 1.1194 + { $as_echo "$as_me:${as_lineno-$LINENO}: msvcr100.dll found in $SYSTEMROOT/system32" >&5 1.1195 $as_echo "$as_me: msvcr100.dll found in $SYSTEMROOT/system32" >&6;} 1.1196 - MSVCR_DLL="$SYSTEMROOT/system32/msvcr100.dll" 1.1197 + MSVCR_DLL="$SYSTEMROOT/system32/msvcr100.dll" 1.1198 + fi 1.1199 fi 1.1200 fi 1.1201 fi 1.1202 @@ -17843,7 +17849,7 @@ 1.1203 set dummy $ac_prog; ac_word=$2 1.1204 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1205 $as_echo_n "checking for $ac_word... " >&6; } 1.1206 -if ${ac_cv_path_BUILD_CC+:} false; then : 1.1207 +if test "${ac_cv_path_BUILD_CC+set}" = set; then : 1.1208 $as_echo_n "(cached) " >&6 1.1209 else 1.1210 case $BUILD_CC in 1.1211 @@ -18154,7 +18160,7 @@ 1.1212 set dummy $ac_prog; ac_word=$2 1.1213 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1214 $as_echo_n "checking for $ac_word... " >&6; } 1.1215 -if ${ac_cv_path_BUILD_CXX+:} false; then : 1.1216 +if test "${ac_cv_path_BUILD_CXX+set}" = set; then : 1.1217 $as_echo_n "(cached) " >&6 1.1218 else 1.1219 case $BUILD_CXX in 1.1220 @@ -18463,7 +18469,7 @@ 1.1221 set dummy ld; ac_word=$2 1.1222 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1223 $as_echo_n "checking for $ac_word... " >&6; } 1.1224 -if ${ac_cv_path_BUILD_LD+:} false; then : 1.1225 +if test "${ac_cv_path_BUILD_LD+set}" = set; then : 1.1226 $as_echo_n "(cached) " >&6 1.1227 else 1.1228 case $BUILD_LD in 1.1229 @@ -18979,7 +18985,7 @@ 1.1230 set dummy $ac_prog; ac_word=$2 1.1231 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1232 $as_echo_n "checking for $ac_word... " >&6; } 1.1233 -if ${ac_cv_path_TOOLS_DIR_CC+:} false; then : 1.1234 +if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then : 1.1235 $as_echo_n "(cached) " >&6 1.1236 else 1.1237 case $TOOLS_DIR_CC in 1.1238 @@ -19031,7 +19037,7 @@ 1.1239 set dummy $ac_prog; ac_word=$2 1.1240 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1241 $as_echo_n "checking for $ac_word... " >&6; } 1.1242 -if ${ac_cv_path_POTENTIAL_CC+:} false; then : 1.1243 +if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then : 1.1244 $as_echo_n "(cached) " >&6 1.1245 else 1.1246 case $POTENTIAL_CC in 1.1247 @@ -19444,7 +19450,7 @@ 1.1248 set dummy $ac_tool_prefix$ac_prog; 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 ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then : 1.1252 +if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then : 1.1253 $as_echo_n "(cached) " >&6 1.1254 else 1.1255 if test -n "$PROPER_COMPILER_CC"; then 1.1256 @@ -19488,7 +19494,7 @@ 1.1257 set dummy $ac_prog; 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 ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then : 1.1261 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then : 1.1262 $as_echo_n "(cached) " >&6 1.1263 else 1.1264 if test -n "$ac_ct_PROPER_COMPILER_CC"; then 1.1265 @@ -19938,7 +19944,7 @@ 1.1266 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1267 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1268 $as_echo_n "checking for $ac_word... " >&6; } 1.1269 -if ${ac_cv_prog_CC+:} false; then : 1.1270 +if test "${ac_cv_prog_CC+set}" = set; then : 1.1271 $as_echo_n "(cached) " >&6 1.1272 else 1.1273 if test -n "$CC"; then 1.1274 @@ -19982,7 +19988,7 @@ 1.1275 set dummy $ac_prog; ac_word=$2 1.1276 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1277 $as_echo_n "checking for $ac_word... " >&6; } 1.1278 -if ${ac_cv_prog_ac_ct_CC+:} false; then : 1.1279 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 1.1280 $as_echo_n "(cached) " >&6 1.1281 else 1.1282 if test -n "$ac_ct_CC"; then 1.1283 @@ -20035,7 +20041,7 @@ 1.1284 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1285 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1286 as_fn_error $? "no acceptable C compiler found in \$PATH 1.1287 -See \`config.log' for more details" "$LINENO" 5; } 1.1288 +See \`config.log' for more details" "$LINENO" 5 ; } 1.1289 1.1290 # Provide some information about the compiler. 1.1291 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 1.1292 @@ -20150,7 +20156,7 @@ 1.1293 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1294 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1295 as_fn_error 77 "C compiler cannot create executables 1.1296 -See \`config.log' for more details" "$LINENO" 5; } 1.1297 +See \`config.log' for more details" "$LINENO" 5 ; } 1.1298 else 1.1299 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 1.1300 $as_echo "yes" >&6; } 1.1301 @@ -20193,7 +20199,7 @@ 1.1302 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1303 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1304 as_fn_error $? "cannot compute suffix of executables: cannot compile and link 1.1305 -See \`config.log' for more details" "$LINENO" 5; } 1.1306 +See \`config.log' for more details" "$LINENO" 5 ; } 1.1307 fi 1.1308 rm -f conftest conftest$ac_cv_exeext 1.1309 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 1.1310 @@ -20252,7 +20258,7 @@ 1.1311 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1312 as_fn_error $? "cannot run C compiled programs. 1.1313 If you meant to cross compile, use \`--host'. 1.1314 -See \`config.log' for more details" "$LINENO" 5; } 1.1315 +See \`config.log' for more details" "$LINENO" 5 ; } 1.1316 fi 1.1317 fi 1.1318 fi 1.1319 @@ -20263,7 +20269,7 @@ 1.1320 ac_clean_files=$ac_clean_files_save 1.1321 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 1.1322 $as_echo_n "checking for suffix of object files... " >&6; } 1.1323 -if ${ac_cv_objext+:} false; then : 1.1324 +if test "${ac_cv_objext+set}" = set; then : 1.1325 $as_echo_n "(cached) " >&6 1.1326 else 1.1327 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1328 @@ -20304,7 +20310,7 @@ 1.1329 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1330 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1331 as_fn_error $? "cannot compute suffix of object files: cannot compile 1.1332 -See \`config.log' for more details" "$LINENO" 5; } 1.1333 +See \`config.log' for more details" "$LINENO" 5 ; } 1.1334 fi 1.1335 rm -f conftest.$ac_cv_objext conftest.$ac_ext 1.1336 fi 1.1337 @@ -20314,7 +20320,7 @@ 1.1338 ac_objext=$OBJEXT 1.1339 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 1.1340 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 1.1341 -if ${ac_cv_c_compiler_gnu+:} false; then : 1.1342 +if test "${ac_cv_c_compiler_gnu+set}" = set; then : 1.1343 $as_echo_n "(cached) " >&6 1.1344 else 1.1345 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1346 @@ -20351,7 +20357,7 @@ 1.1347 ac_save_CFLAGS=$CFLAGS 1.1348 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 1.1349 $as_echo_n "checking whether $CC accepts -g... " >&6; } 1.1350 -if ${ac_cv_prog_cc_g+:} false; then : 1.1351 +if test "${ac_cv_prog_cc_g+set}" = set; then : 1.1352 $as_echo_n "(cached) " >&6 1.1353 else 1.1354 ac_save_c_werror_flag=$ac_c_werror_flag 1.1355 @@ -20429,7 +20435,7 @@ 1.1356 fi 1.1357 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 1.1358 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 1.1359 -if ${ac_cv_prog_cc_c89+:} false; then : 1.1360 +if test "${ac_cv_prog_cc_c89+set}" = set; then : 1.1361 $as_echo_n "(cached) " >&6 1.1362 else 1.1363 ac_cv_prog_cc_c89=no 1.1364 @@ -20552,7 +20558,7 @@ 1.1365 set dummy $ac_prog; ac_word=$2 1.1366 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1367 $as_echo_n "checking for $ac_word... " >&6; } 1.1368 -if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then : 1.1369 +if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then : 1.1370 $as_echo_n "(cached) " >&6 1.1371 else 1.1372 case $TOOLS_DIR_CXX in 1.1373 @@ -20604,7 +20610,7 @@ 1.1374 set dummy $ac_prog; ac_word=$2 1.1375 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1376 $as_echo_n "checking for $ac_word... " >&6; } 1.1377 -if ${ac_cv_path_POTENTIAL_CXX+:} false; then : 1.1378 +if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then : 1.1379 $as_echo_n "(cached) " >&6 1.1380 else 1.1381 case $POTENTIAL_CXX in 1.1382 @@ -21017,7 +21023,7 @@ 1.1383 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1384 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1385 $as_echo_n "checking for $ac_word... " >&6; } 1.1386 -if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then : 1.1387 +if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then : 1.1388 $as_echo_n "(cached) " >&6 1.1389 else 1.1390 if test -n "$PROPER_COMPILER_CXX"; then 1.1391 @@ -21061,7 +21067,7 @@ 1.1392 set dummy $ac_prog; ac_word=$2 1.1393 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1394 $as_echo_n "checking for $ac_word... " >&6; } 1.1395 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then : 1.1396 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then : 1.1397 $as_echo_n "(cached) " >&6 1.1398 else 1.1399 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then 1.1400 @@ -21515,7 +21521,7 @@ 1.1401 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1402 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1403 $as_echo_n "checking for $ac_word... " >&6; } 1.1404 -if ${ac_cv_prog_CXX+:} false; then : 1.1405 +if test "${ac_cv_prog_CXX+set}" = set; then : 1.1406 $as_echo_n "(cached) " >&6 1.1407 else 1.1408 if test -n "$CXX"; then 1.1409 @@ -21559,7 +21565,7 @@ 1.1410 set dummy $ac_prog; ac_word=$2 1.1411 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1412 $as_echo_n "checking for $ac_word... " >&6; } 1.1413 -if ${ac_cv_prog_ac_ct_CXX+:} false; then : 1.1414 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : 1.1415 $as_echo_n "(cached) " >&6 1.1416 else 1.1417 if test -n "$ac_ct_CXX"; then 1.1418 @@ -21637,7 +21643,7 @@ 1.1419 1.1420 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 1.1421 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } 1.1422 -if ${ac_cv_cxx_compiler_gnu+:} false; then : 1.1423 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : 1.1424 $as_echo_n "(cached) " >&6 1.1425 else 1.1426 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1427 @@ -21674,7 +21680,7 @@ 1.1428 ac_save_CXXFLAGS=$CXXFLAGS 1.1429 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 1.1430 $as_echo_n "checking whether $CXX accepts -g... " >&6; } 1.1431 -if ${ac_cv_prog_cxx_g+:} false; then : 1.1432 +if test "${ac_cv_prog_cxx_g+set}" = set; then : 1.1433 $as_echo_n "(cached) " >&6 1.1434 else 1.1435 ac_save_cxx_werror_flag=$ac_cxx_werror_flag 1.1436 @@ -21772,7 +21778,7 @@ 1.1437 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1438 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1439 $as_echo_n "checking for $ac_word... " >&6; } 1.1440 -if ${ac_cv_prog_OBJC+:} false; then : 1.1441 +if test "${ac_cv_prog_OBJC+set}" = set; then : 1.1442 $as_echo_n "(cached) " >&6 1.1443 else 1.1444 if test -n "$OBJC"; then 1.1445 @@ -21816,7 +21822,7 @@ 1.1446 set dummy $ac_prog; ac_word=$2 1.1447 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1448 $as_echo_n "checking for $ac_word... " >&6; } 1.1449 -if ${ac_cv_prog_ac_ct_OBJC+:} false; then : 1.1450 +if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then : 1.1451 $as_echo_n "(cached) " >&6 1.1452 else 1.1453 if test -n "$ac_ct_OBJC"; then 1.1454 @@ -21892,7 +21898,7 @@ 1.1455 1.1456 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 1.1457 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } 1.1458 -if ${ac_cv_objc_compiler_gnu+:} false; then : 1.1459 +if test "${ac_cv_objc_compiler_gnu+set}" = set; then : 1.1460 $as_echo_n "(cached) " >&6 1.1461 else 1.1462 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1463 @@ -21929,7 +21935,7 @@ 1.1464 ac_save_OBJCFLAGS=$OBJCFLAGS 1.1465 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 1.1466 $as_echo_n "checking whether $OBJC accepts -g... " >&6; } 1.1467 -if ${ac_cv_prog_objc_g+:} false; then : 1.1468 +if test "${ac_cv_prog_objc_g+set}" = set; then : 1.1469 $as_echo_n "(cached) " >&6 1.1470 else 1.1471 ac_save_objc_werror_flag=$ac_objc_werror_flag 1.1472 @@ -22305,7 +22311,7 @@ 1.1473 set dummy ${ac_tool_prefix}ar; ac_word=$2 1.1474 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1475 $as_echo_n "checking for $ac_word... " >&6; } 1.1476 -if ${ac_cv_prog_AR+:} false; then : 1.1477 +if test "${ac_cv_prog_AR+set}" = set; then : 1.1478 $as_echo_n "(cached) " >&6 1.1479 else 1.1480 if test -n "$AR"; then 1.1481 @@ -22345,7 +22351,7 @@ 1.1482 set dummy ar; ac_word=$2 1.1483 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1484 $as_echo_n "checking for $ac_word... " >&6; } 1.1485 -if ${ac_cv_prog_ac_ct_AR+:} false; then : 1.1486 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 1.1487 $as_echo_n "(cached) " >&6 1.1488 else 1.1489 if test -n "$ac_ct_AR"; then 1.1490 @@ -22687,7 +22693,7 @@ 1.1491 set dummy link; ac_word=$2 1.1492 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1493 $as_echo_n "checking for $ac_word... " >&6; } 1.1494 -if ${ac_cv_prog_WINLD+:} false; then : 1.1495 +if test "${ac_cv_prog_WINLD+set}" = set; then : 1.1496 $as_echo_n "(cached) " >&6 1.1497 else 1.1498 if test -n "$WINLD"; then 1.1499 @@ -23026,7 +23032,7 @@ 1.1500 set dummy mt; ac_word=$2 1.1501 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1502 $as_echo_n "checking for $ac_word... " >&6; } 1.1503 -if ${ac_cv_prog_MT+:} false; then : 1.1504 +if test "${ac_cv_prog_MT+set}" = set; then : 1.1505 $as_echo_n "(cached) " >&6 1.1506 else 1.1507 if test -n "$MT"; then 1.1508 @@ -23347,7 +23353,7 @@ 1.1509 set dummy rc; ac_word=$2 1.1510 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1511 $as_echo_n "checking for $ac_word... " >&6; } 1.1512 -if ${ac_cv_prog_RC+:} false; then : 1.1513 +if test "${ac_cv_prog_RC+set}" = set; then : 1.1514 $as_echo_n "(cached) " >&6 1.1515 else 1.1516 if test -n "$RC"; then 1.1517 @@ -23738,7 +23744,7 @@ 1.1518 set dummy lib; ac_word=$2 1.1519 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1520 $as_echo_n "checking for $ac_word... " >&6; } 1.1521 -if ${ac_cv_prog_WINAR+:} false; then : 1.1522 +if test "${ac_cv_prog_WINAR+set}" = set; then : 1.1523 $as_echo_n "(cached) " >&6 1.1524 else 1.1525 if test -n "$WINAR"; then 1.1526 @@ -24044,7 +24050,7 @@ 1.1527 set dummy dumpbin; ac_word=$2 1.1528 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1529 $as_echo_n "checking for $ac_word... " >&6; } 1.1530 -if ${ac_cv_prog_DUMPBIN+:} false; then : 1.1531 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : 1.1532 $as_echo_n "(cached) " >&6 1.1533 else 1.1534 if test -n "$DUMPBIN"; then 1.1535 @@ -24363,7 +24369,7 @@ 1.1536 CPP= 1.1537 fi 1.1538 if test -z "$CPP"; then 1.1539 - if ${ac_cv_prog_CPP+:} false; then : 1.1540 + if test "${ac_cv_prog_CPP+set}" = set; then : 1.1541 $as_echo_n "(cached) " >&6 1.1542 else 1.1543 # Double quotes because CPP needs to be expanded 1.1544 @@ -24479,7 +24485,7 @@ 1.1545 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1546 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1547 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 1.1548 -See \`config.log' for more details" "$LINENO" 5; } 1.1549 +See \`config.log' for more details" "$LINENO" 5 ; } 1.1550 fi 1.1551 1.1552 ac_ext=cpp 1.1553 @@ -24763,7 +24769,7 @@ 1.1554 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 1.1555 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } 1.1556 if test -z "$CXXCPP"; then 1.1557 - if ${ac_cv_prog_CXXCPP+:} false; then : 1.1558 + if test "${ac_cv_prog_CXXCPP+set}" = set; then : 1.1559 $as_echo_n "(cached) " >&6 1.1560 else 1.1561 # Double quotes because CXXCPP needs to be expanded 1.1562 @@ -24879,7 +24885,7 @@ 1.1563 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1564 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1565 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check 1.1566 -See \`config.log' for more details" "$LINENO" 5; } 1.1567 +See \`config.log' for more details" "$LINENO" 5 ; } 1.1568 fi 1.1569 1.1570 ac_ext=cpp 1.1571 @@ -25181,7 +25187,7 @@ 1.1572 set dummy as; ac_word=$2 1.1573 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1574 $as_echo_n "checking for $ac_word... " >&6; } 1.1575 -if ${ac_cv_path_AS+:} false; then : 1.1576 +if test "${ac_cv_path_AS+set}" = set; then : 1.1577 $as_echo_n "(cached) " >&6 1.1578 else 1.1579 case $AS in 1.1580 @@ -25493,7 +25499,7 @@ 1.1581 set dummy nm; ac_word=$2 1.1582 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1583 $as_echo_n "checking for $ac_word... " >&6; } 1.1584 -if ${ac_cv_path_NM+:} false; then : 1.1585 +if test "${ac_cv_path_NM+set}" = set; then : 1.1586 $as_echo_n "(cached) " >&6 1.1587 else 1.1588 case $NM in 1.1589 @@ -25799,7 +25805,7 @@ 1.1590 set dummy gnm; ac_word=$2 1.1591 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1592 $as_echo_n "checking for $ac_word... " >&6; } 1.1593 -if ${ac_cv_path_GNM+:} false; then : 1.1594 +if test "${ac_cv_path_GNM+set}" = set; then : 1.1595 $as_echo_n "(cached) " >&6 1.1596 else 1.1597 case $GNM in 1.1598 @@ -26105,7 +26111,7 @@ 1.1599 set dummy strip; ac_word=$2 1.1600 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1601 $as_echo_n "checking for $ac_word... " >&6; } 1.1602 -if ${ac_cv_path_STRIP+:} false; then : 1.1603 +if test "${ac_cv_path_STRIP+set}" = set; then : 1.1604 $as_echo_n "(cached) " >&6 1.1605 else 1.1606 case $STRIP in 1.1607 @@ -26411,7 +26417,7 @@ 1.1608 set dummy mcs; ac_word=$2 1.1609 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1610 $as_echo_n "checking for $ac_word... " >&6; } 1.1611 -if ${ac_cv_path_MCS+:} false; then : 1.1612 +if test "${ac_cv_path_MCS+set}" = set; then : 1.1613 $as_echo_n "(cached) " >&6 1.1614 else 1.1615 case $MCS in 1.1616 @@ -26719,7 +26725,7 @@ 1.1617 set dummy ${ac_tool_prefix}nm; ac_word=$2 1.1618 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1619 $as_echo_n "checking for $ac_word... " >&6; } 1.1620 -if ${ac_cv_prog_NM+:} false; then : 1.1621 +if test "${ac_cv_prog_NM+set}" = set; then : 1.1622 $as_echo_n "(cached) " >&6 1.1623 else 1.1624 if test -n "$NM"; then 1.1625 @@ -26759,7 +26765,7 @@ 1.1626 set dummy nm; ac_word=$2 1.1627 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1628 $as_echo_n "checking for $ac_word... " >&6; } 1.1629 -if ${ac_cv_prog_ac_ct_NM+:} false; then : 1.1630 +if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : 1.1631 $as_echo_n "(cached) " >&6 1.1632 else 1.1633 if test -n "$ac_ct_NM"; then 1.1634 @@ -27079,7 +27085,7 @@ 1.1635 set dummy ${ac_tool_prefix}strip; ac_word=$2 1.1636 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1637 $as_echo_n "checking for $ac_word... " >&6; } 1.1638 -if ${ac_cv_prog_STRIP+:} false; then : 1.1639 +if test "${ac_cv_prog_STRIP+set}" = set; then : 1.1640 $as_echo_n "(cached) " >&6 1.1641 else 1.1642 if test -n "$STRIP"; then 1.1643 @@ -27119,7 +27125,7 @@ 1.1644 set dummy strip; ac_word=$2 1.1645 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1646 $as_echo_n "checking for $ac_word... " >&6; } 1.1647 -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : 1.1648 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : 1.1649 $as_echo_n "(cached) " >&6 1.1650 else 1.1651 if test -n "$ac_ct_STRIP"; then 1.1652 @@ -27444,7 +27450,7 @@ 1.1653 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1654 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1655 $as_echo_n "checking for $ac_word... " >&6; } 1.1656 -if ${ac_cv_prog_OBJCOPY+:} false; then : 1.1657 +if test "${ac_cv_prog_OBJCOPY+set}" = set; then : 1.1658 $as_echo_n "(cached) " >&6 1.1659 else 1.1660 if test -n "$OBJCOPY"; then 1.1661 @@ -27488,7 +27494,7 @@ 1.1662 set dummy $ac_prog; ac_word=$2 1.1663 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1664 $as_echo_n "checking for $ac_word... " >&6; } 1.1665 -if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then : 1.1666 +if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then : 1.1667 $as_echo_n "(cached) " >&6 1.1668 else 1.1669 if test -n "$ac_ct_OBJCOPY"; then 1.1670 @@ -27815,7 +27821,7 @@ 1.1671 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1672 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1673 $as_echo_n "checking for $ac_word... " >&6; } 1.1674 -if ${ac_cv_prog_OBJDUMP+:} false; then : 1.1675 +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : 1.1676 $as_echo_n "(cached) " >&6 1.1677 else 1.1678 if test -n "$OBJDUMP"; then 1.1679 @@ -27859,7 +27865,7 @@ 1.1680 set dummy $ac_prog; ac_word=$2 1.1681 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1682 $as_echo_n "checking for $ac_word... " >&6; } 1.1683 -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : 1.1684 +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : 1.1685 $as_echo_n "(cached) " >&6 1.1686 else 1.1687 if test -n "$ac_ct_OBJDUMP"; then 1.1688 @@ -28183,7 +28189,7 @@ 1.1689 set dummy lipo; ac_word=$2 1.1690 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1691 $as_echo_n "checking for $ac_word... " >&6; } 1.1692 -if ${ac_cv_path_LIPO+:} false; then : 1.1693 +if test "${ac_cv_path_LIPO+set}" = set; then : 1.1694 $as_echo_n "(cached) " >&6 1.1695 else 1.1696 case $LIPO in 1.1697 @@ -28500,7 +28506,7 @@ 1.1698 1.1699 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 1.1700 $as_echo_n "checking for ANSI C header files... " >&6; } 1.1701 -if ${ac_cv_header_stdc+:} false; then : 1.1702 +if test "${ac_cv_header_stdc+set}" = set; then : 1.1703 $as_echo_n "(cached) " >&6 1.1704 else 1.1705 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1706 @@ -28677,7 +28683,7 @@ 1.1707 for ac_header in stdio.h 1.1708 do : 1.1709 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" 1.1710 -if test "x$ac_cv_header_stdio_h" = xyes; then : 1.1711 +if test "x$ac_cv_header_stdio_h" = x""yes; then : 1.1712 cat >>confdefs.h <<_ACEOF 1.1713 #define HAVE_STDIO_H 1 1.1714 _ACEOF 1.1715 @@ -28706,7 +28712,7 @@ 1.1716 # This bug is HP SR number 8606223364. 1.1717 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 1.1718 $as_echo_n "checking size of int *... " >&6; } 1.1719 -if ${ac_cv_sizeof_int_p+:} false; then : 1.1720 +if test "${ac_cv_sizeof_int_p+set}" = set; then : 1.1721 $as_echo_n "(cached) " >&6 1.1722 else 1.1723 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : 1.1724 @@ -28716,7 +28722,7 @@ 1.1725 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1726 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1727 as_fn_error 77 "cannot compute sizeof (int *) 1.1728 -See \`config.log' for more details" "$LINENO" 5; } 1.1729 +See \`config.log' for more details" "$LINENO" 5 ; } 1.1730 else 1.1731 ac_cv_sizeof_int_p=0 1.1732 fi 1.1733 @@ -28763,7 +28769,7 @@ 1.1734 # 1.1735 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 1.1736 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } 1.1737 -if ${ac_cv_c_bigendian+:} false; then : 1.1738 +if test "${ac_cv_c_bigendian+set}" = set; then : 1.1739 $as_echo_n "(cached) " >&6 1.1740 else 1.1741 ac_cv_c_bigendian=unknown 1.1742 @@ -29930,8 +29936,8 @@ 1.1743 have_x=disabled 1.1744 else 1.1745 case $x_includes,$x_libraries in #( 1.1746 - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( 1.1747 - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : 1.1748 + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( 1.1749 + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : 1.1750 $as_echo_n "(cached) " >&6 1.1751 else 1.1752 # One or both of the vars are not set, and there is no cached value. 1.1753 @@ -30208,7 +30214,7 @@ 1.1754 else 1.1755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 1.1756 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } 1.1757 -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : 1.1758 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : 1.1759 $as_echo_n "(cached) " >&6 1.1760 else 1.1761 ac_check_lib_save_LIBS=$LIBS 1.1762 @@ -30242,14 +30248,14 @@ 1.1763 fi 1.1764 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 1.1765 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } 1.1766 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : 1.1767 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : 1.1768 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 1.1769 fi 1.1770 1.1771 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 1.1772 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 1.1773 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } 1.1774 -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : 1.1775 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : 1.1776 $as_echo_n "(cached) " >&6 1.1777 else 1.1778 ac_check_lib_save_LIBS=$LIBS 1.1779 @@ -30283,7 +30289,7 @@ 1.1780 fi 1.1781 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 1.1782 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } 1.1783 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : 1.1784 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : 1.1785 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 1.1786 fi 1.1787 1.1788 @@ -30302,14 +30308,14 @@ 1.1789 # The functions gethostbyname, getservbyname, and inet_addr are 1.1790 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. 1.1791 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" 1.1792 -if test "x$ac_cv_func_gethostbyname" = xyes; then : 1.1793 +if test "x$ac_cv_func_gethostbyname" = x""yes; then : 1.1794 1.1795 fi 1.1796 1.1797 if test $ac_cv_func_gethostbyname = no; then 1.1798 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 1.1799 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } 1.1800 -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : 1.1801 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : 1.1802 $as_echo_n "(cached) " >&6 1.1803 else 1.1804 ac_check_lib_save_LIBS=$LIBS 1.1805 @@ -30343,14 +30349,14 @@ 1.1806 fi 1.1807 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 1.1808 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } 1.1809 -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : 1.1810 +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : 1.1811 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 1.1812 fi 1.1813 1.1814 if test $ac_cv_lib_nsl_gethostbyname = no; then 1.1815 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 1.1816 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } 1.1817 -if ${ac_cv_lib_bsd_gethostbyname+:} false; then : 1.1818 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : 1.1819 $as_echo_n "(cached) " >&6 1.1820 else 1.1821 ac_check_lib_save_LIBS=$LIBS 1.1822 @@ -30384,7 +30390,7 @@ 1.1823 fi 1.1824 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 1.1825 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } 1.1826 -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : 1.1827 +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : 1.1828 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" 1.1829 fi 1.1830 1.1831 @@ -30399,14 +30405,14 @@ 1.1832 # must be given before -lnsl if both are needed. We assume that 1.1833 # if connect needs -lnsl, so does gethostbyname. 1.1834 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect" 1.1835 -if test "x$ac_cv_func_connect" = xyes; then : 1.1836 +if test "x$ac_cv_func_connect" = x""yes; then : 1.1837 1.1838 fi 1.1839 1.1840 if test $ac_cv_func_connect = no; then 1.1841 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 1.1842 $as_echo_n "checking for connect in -lsocket... " >&6; } 1.1843 -if ${ac_cv_lib_socket_connect+:} false; then : 1.1844 +if test "${ac_cv_lib_socket_connect+set}" = set; then : 1.1845 $as_echo_n "(cached) " >&6 1.1846 else 1.1847 ac_check_lib_save_LIBS=$LIBS 1.1848 @@ -30440,7 +30446,7 @@ 1.1849 fi 1.1850 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 1.1851 $as_echo "$ac_cv_lib_socket_connect" >&6; } 1.1852 -if test "x$ac_cv_lib_socket_connect" = xyes; then : 1.1853 +if test "x$ac_cv_lib_socket_connect" = x""yes; then : 1.1854 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 1.1855 fi 1.1856 1.1857 @@ -30448,14 +30454,14 @@ 1.1858 1.1859 # Guillermo Gomez says -lposix is necessary on A/UX. 1.1860 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove" 1.1861 -if test "x$ac_cv_func_remove" = xyes; then : 1.1862 +if test "x$ac_cv_func_remove" = x""yes; then : 1.1863 1.1864 fi 1.1865 1.1866 if test $ac_cv_func_remove = no; then 1.1867 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 1.1868 $as_echo_n "checking for remove in -lposix... " >&6; } 1.1869 -if ${ac_cv_lib_posix_remove+:} false; then : 1.1870 +if test "${ac_cv_lib_posix_remove+set}" = set; then : 1.1871 $as_echo_n "(cached) " >&6 1.1872 else 1.1873 ac_check_lib_save_LIBS=$LIBS 1.1874 @@ -30489,7 +30495,7 @@ 1.1875 fi 1.1876 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 1.1877 $as_echo "$ac_cv_lib_posix_remove" >&6; } 1.1878 -if test "x$ac_cv_lib_posix_remove" = xyes; then : 1.1879 +if test "x$ac_cv_lib_posix_remove" = x""yes; then : 1.1880 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 1.1881 fi 1.1882 1.1883 @@ -30497,14 +30503,14 @@ 1.1884 1.1885 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 1.1886 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat" 1.1887 -if test "x$ac_cv_func_shmat" = xyes; then : 1.1888 +if test "x$ac_cv_func_shmat" = x""yes; then : 1.1889 1.1890 fi 1.1891 1.1892 if test $ac_cv_func_shmat = no; then 1.1893 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 1.1894 $as_echo_n "checking for shmat in -lipc... " >&6; } 1.1895 -if ${ac_cv_lib_ipc_shmat+:} false; then : 1.1896 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then : 1.1897 $as_echo_n "(cached) " >&6 1.1898 else 1.1899 ac_check_lib_save_LIBS=$LIBS 1.1900 @@ -30538,7 +30544,7 @@ 1.1901 fi 1.1902 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 1.1903 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } 1.1904 -if test "x$ac_cv_lib_ipc_shmat" = xyes; then : 1.1905 +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : 1.1906 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 1.1907 fi 1.1908 1.1909 @@ -30556,7 +30562,7 @@ 1.1910 # John Interrante, Karl Berry 1.1911 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 1.1912 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } 1.1913 -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : 1.1914 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : 1.1915 $as_echo_n "(cached) " >&6 1.1916 else 1.1917 ac_check_lib_save_LIBS=$LIBS 1.1918 @@ -30590,7 +30596,7 @@ 1.1919 fi 1.1920 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 1.1921 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } 1.1922 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : 1.1923 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : 1.1924 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 1.1925 fi 1.1926 1.1927 @@ -31609,7 +31615,7 @@ 1.1928 LDFLAGS="$FREETYPE2_LIBS" 1.1929 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 1.1930 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } 1.1931 -if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then : 1.1932 +if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then : 1.1933 $as_echo_n "(cached) " >&6 1.1934 else 1.1935 ac_check_lib_save_LIBS=$LIBS 1.1936 @@ -31643,7 +31649,7 @@ 1.1937 fi 1.1938 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 1.1939 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } 1.1940 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : 1.1941 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then : 1.1942 FREETYPE2_FOUND=true 1.1943 else 1.1944 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 1.1945 @@ -31931,7 +31937,7 @@ 1.1946 for ac_header in alsa/asoundlib.h 1.1947 do : 1.1948 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" 1.1949 -if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then : 1.1950 +if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then : 1.1951 cat >>confdefs.h <<_ACEOF 1.1952 #define HAVE_ALSA_ASOUNDLIB_H 1 1.1953 _ACEOF 1.1954 @@ -31990,7 +31996,7 @@ 1.1955 USE_EXTERNAL_LIBJPEG=true 1.1956 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5 1.1957 $as_echo_n "checking for main in -ljpeg... " >&6; } 1.1958 -if ${ac_cv_lib_jpeg_main+:} false; then : 1.1959 +if test "${ac_cv_lib_jpeg_main+set}" = set; then : 1.1960 $as_echo_n "(cached) " >&6 1.1961 else 1.1962 ac_check_lib_save_LIBS=$LIBS 1.1963 @@ -32018,7 +32024,7 @@ 1.1964 fi 1.1965 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5 1.1966 $as_echo "$ac_cv_lib_jpeg_main" >&6; } 1.1967 -if test "x$ac_cv_lib_jpeg_main" = xyes; then : 1.1968 +if test "x$ac_cv_lib_jpeg_main" = x""yes; then : 1.1969 cat >>confdefs.h <<_ACEOF 1.1970 #define HAVE_LIBJPEG 1 1.1971 _ACEOF 1.1972 @@ -32067,7 +32073,7 @@ 1.1973 USE_EXTERNAL_LIBGIF=false 1.1974 elif test "x${with_giflib}" = "xsystem"; then 1.1975 ac_fn_cxx_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" 1.1976 -if test "x$ac_cv_header_gif_lib_h" = xyes; then : 1.1977 +if test "x$ac_cv_header_gif_lib_h" = x""yes; then : 1.1978 1.1979 else 1.1980 as_fn_error $? "--with-giflib=system specified, but gif_lib.h not found!" "$LINENO" 5 1.1981 @@ -32076,7 +32082,7 @@ 1.1982 1.1983 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DGifGetCode in -lgif" >&5 1.1984 $as_echo_n "checking for DGifGetCode in -lgif... " >&6; } 1.1985 -if ${ac_cv_lib_gif_DGifGetCode+:} false; then : 1.1986 +if test "${ac_cv_lib_gif_DGifGetCode+set}" = set; then : 1.1987 $as_echo_n "(cached) " >&6 1.1988 else 1.1989 ac_check_lib_save_LIBS=$LIBS 1.1990 @@ -32110,7 +32116,7 @@ 1.1991 fi 1.1992 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_DGifGetCode" >&5 1.1993 $as_echo "$ac_cv_lib_gif_DGifGetCode" >&6; } 1.1994 -if test "x$ac_cv_lib_gif_DGifGetCode" = xyes; then : 1.1995 +if test "x$ac_cv_lib_gif_DGifGetCode" = x""yes; then : 1.1996 cat >>confdefs.h <<_ACEOF 1.1997 #define HAVE_LIBGIF 1 1.1998 _ACEOF 1.1999 @@ -32142,7 +32148,7 @@ 1.2000 1.2001 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 1.2002 $as_echo_n "checking for compress in -lz... " >&6; } 1.2003 -if ${ac_cv_lib_z_compress+:} false; then : 1.2004 +if test "${ac_cv_lib_z_compress+set}" = set; then : 1.2005 $as_echo_n "(cached) " >&6 1.2006 else 1.2007 ac_check_lib_save_LIBS=$LIBS 1.2008 @@ -32176,7 +32182,7 @@ 1.2009 fi 1.2010 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 1.2011 $as_echo "$ac_cv_lib_z_compress" >&6; } 1.2012 -if test "x$ac_cv_lib_z_compress" = xyes; then : 1.2013 +if test "x$ac_cv_lib_z_compress" = x""yes; then : 1.2014 ZLIB_FOUND=yes 1.2015 else 1.2016 ZLIB_FOUND=no 1.2017 @@ -32269,7 +32275,7 @@ 1.2018 1.2019 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 1.2020 $as_echo_n "checking for cos in -lm... " >&6; } 1.2021 -if ${ac_cv_lib_m_cos+:} false; then : 1.2022 +if test "${ac_cv_lib_m_cos+set}" = set; then : 1.2023 $as_echo_n "(cached) " >&6 1.2024 else 1.2025 ac_check_lib_save_LIBS=$LIBS 1.2026 @@ -32303,7 +32309,7 @@ 1.2027 fi 1.2028 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 1.2029 $as_echo "$ac_cv_lib_m_cos" >&6; } 1.2030 -if test "x$ac_cv_lib_m_cos" = xyes; then : 1.2031 +if test "x$ac_cv_lib_m_cos" = x""yes; then : 1.2032 cat >>confdefs.h <<_ACEOF 1.2033 #define HAVE_LIBM 1 1.2034 _ACEOF 1.2035 @@ -32327,7 +32333,7 @@ 1.2036 LIBS="" 1.2037 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 1.2038 $as_echo_n "checking for dlopen in -ldl... " >&6; } 1.2039 -if ${ac_cv_lib_dl_dlopen+:} false; then : 1.2040 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : 1.2041 $as_echo_n "(cached) " >&6 1.2042 else 1.2043 ac_check_lib_save_LIBS=$LIBS 1.2044 @@ -32361,7 +32367,7 @@ 1.2045 fi 1.2046 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 1.2047 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } 1.2048 -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : 1.2049 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : 1.2050 cat >>confdefs.h <<_ACEOF 1.2051 #define HAVE_LIBDL 1 1.2052 _ACEOF 1.2053 @@ -32591,7 +32597,7 @@ 1.2054 See the pkg-config man page for more details. 1.2055 1.2056 To get pkg-config, see <http://pkg-config.freedesktop.org/>. 1.2057 -See \`config.log' for more details" "$LINENO" 5; } 1.2058 +See \`config.log' for more details" "$LINENO" 5 ; } 1.2059 else 1.2060 LIBFFI_CFLAGS=$pkg_cv_LIBFFI_CFLAGS 1.2061 LIBFFI_LIBS=$pkg_cv_LIBFFI_LIBS 1.2062 @@ -32607,7 +32613,7 @@ 1.2063 set dummy llvm-config; ac_word=$2 1.2064 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.2065 $as_echo_n "checking for $ac_word... " >&6; } 1.2066 -if ${ac_cv_prog_LLVM_CONFIG+:} false; then : 1.2067 +if test "${ac_cv_prog_LLVM_CONFIG+set}" = set; then : 1.2068 $as_echo_n "(cached) " >&6 1.2069 else 1.2070 if test -n "$LLVM_CONFIG"; then 1.2071 @@ -33219,7 +33225,7 @@ 1.2072 set dummy ccache; ac_word=$2 1.2073 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.2074 $as_echo_n "checking for $ac_word... " >&6; } 1.2075 -if ${ac_cv_path_CCACHE+:} false; then : 1.2076 +if test "${ac_cv_path_CCACHE+set}" = set; then : 1.2077 $as_echo_n "(cached) " >&6 1.2078 else 1.2079 case $CCACHE in 1.2080 @@ -33480,21 +33486,10 @@ 1.2081 :end' >>confcache 1.2082 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 1.2083 if test -w "$cache_file"; then 1.2084 - if test "x$cache_file" != "x/dev/null"; then 1.2085 + test "x$cache_file" != "x/dev/null" && 1.2086 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 1.2087 $as_echo "$as_me: updating cache $cache_file" >&6;} 1.2088 - if test ! -f "$cache_file" || test -h "$cache_file"; then 1.2089 - cat confcache >"$cache_file" 1.2090 - else 1.2091 - case $cache_file in #( 1.2092 - */* | ?:*) 1.2093 - mv -f confcache "$cache_file"$$ && 1.2094 - mv -f "$cache_file"$$ "$cache_file" ;; #( 1.2095 - *) 1.2096 - mv -f confcache "$cache_file" ;; 1.2097 - esac 1.2098 - fi 1.2099 - fi 1.2100 + cat confcache >$cache_file 1.2101 else 1.2102 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 1.2103 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 1.2104 @@ -33526,7 +33521,7 @@ 1.2105 1.2106 1.2107 1.2108 -: "${CONFIG_STATUS=./config.status}" 1.2109 +: ${CONFIG_STATUS=./config.status} 1.2110 ac_write_fail=0 1.2111 ac_clean_files_save=$ac_clean_files 1.2112 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 1.2113 @@ -33627,7 +33622,6 @@ 1.2114 IFS=" "" $as_nl" 1.2115 1.2116 # Find who we are. Look in the path if we contain no directory separator. 1.2117 -as_myself= 1.2118 case $0 in #(( 1.2119 *[\\/]* ) as_myself=$0 ;; 1.2120 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 1.2121 @@ -33935,7 +33929,7 @@ 1.2122 # values after options handling. 1.2123 ac_log=" 1.2124 This file was extended by OpenJDK $as_me jdk8, which was 1.2125 -generated by GNU Autoconf 2.68. Invocation command line was 1.2126 +generated by GNU Autoconf 2.67. Invocation command line was 1.2127 1.2128 CONFIG_FILES = $CONFIG_FILES 1.2129 CONFIG_HEADERS = $CONFIG_HEADERS 1.2130 @@ -33998,7 +33992,7 @@ 1.2131 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 1.2132 ac_cs_version="\\ 1.2133 OpenJDK config.status jdk8 1.2134 -configured by $0, generated by GNU Autoconf 2.68, 1.2135 +configured by $0, generated by GNU Autoconf 2.67, 1.2136 with options \\"\$ac_cs_config\\" 1.2137 1.2138 Copyright (C) 2010 Free Software Foundation, Inc. 1.2139 @@ -34127,7 +34121,7 @@ 1.2140 "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;; 1.2141 "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;; 1.2142 1.2143 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 1.2144 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 1.2145 esac 1.2146 done 1.2147 1.2148 @@ -34149,10 +34143,9 @@ 1.2149 # after its creation but before its name has been assigned to `$tmp'. 1.2150 $debug || 1.2151 { 1.2152 - tmp= ac_tmp= 1.2153 + tmp= 1.2154 trap 'exit_status=$? 1.2155 - : "${ac_tmp:=$tmp}" 1.2156 - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 1.2157 + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 1.2158 ' 0 1.2159 trap 'as_fn_exit 1' 1 2 13 15 1.2160 } 1.2161 @@ -34160,13 +34153,12 @@ 1.2162 1.2163 { 1.2164 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 1.2165 - test -d "$tmp" 1.2166 + test -n "$tmp" && test -d "$tmp" 1.2167 } || 1.2168 { 1.2169 tmp=./conf$$-$RANDOM 1.2170 (umask 077 && mkdir "$tmp") 1.2171 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 1.2172 -ac_tmp=$tmp 1.2173 1.2174 # Set up the scripts for CONFIG_FILES section. 1.2175 # No need to generate them if there are no CONFIG_FILES. 1.2176 @@ -34188,7 +34180,7 @@ 1.2177 ac_cs_awk_cr=$ac_cr 1.2178 fi 1.2179 1.2180 -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 1.2181 +echo 'BEGIN {' >"$tmp/subs1.awk" && 1.2182 _ACEOF 1.2183 1.2184 1.2185 @@ -34216,7 +34208,7 @@ 1.2186 rm -f conf$$subs.sh 1.2187 1.2188 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 1.2189 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 1.2190 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 1.2191 _ACEOF 1.2192 sed -n ' 1.2193 h 1.2194 @@ -34264,7 +34256,7 @@ 1.2195 rm -f conf$$subs.awk 1.2196 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 1.2197 _ACAWK 1.2198 -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 1.2199 +cat >>"\$tmp/subs1.awk" <<_ACAWK && 1.2200 for (key in S) S_is_set[key] = 1 1.2201 FS = "" 1.2202 1.2203 @@ -34296,7 +34288,7 @@ 1.2204 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 1.2205 else 1.2206 cat 1.2207 -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 1.2208 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 1.2209 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 1.2210 _ACEOF 1.2211 1.2212 @@ -34330,7 +34322,7 @@ 1.2213 # No need to generate them if there are no CONFIG_HEADERS. 1.2214 # This happens for instance with `./config.status Makefile'. 1.2215 if test -n "$CONFIG_HEADERS"; then 1.2216 -cat >"$ac_tmp/defines.awk" <<\_ACAWK || 1.2217 +cat >"$tmp/defines.awk" <<\_ACAWK || 1.2218 BEGIN { 1.2219 _ACEOF 1.2220 1.2221 @@ -34342,8 +34334,8 @@ 1.2222 # handling of long lines. 1.2223 ac_delim='%!_!# ' 1.2224 for ac_last_try in false false :; do 1.2225 - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 1.2226 - if test -z "$ac_tt"; then 1.2227 + ac_t=`sed -n "/$ac_delim/p" confdefs.h` 1.2228 + if test -z "$ac_t"; then 1.2229 break 1.2230 elif $ac_last_try; then 1.2231 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 1.2232 @@ -34444,7 +34436,7 @@ 1.2233 esac 1.2234 case $ac_mode$ac_tag in 1.2235 :[FHL]*:*);; 1.2236 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 1.2237 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 1.2238 :[FH]-) ac_tag=-:-;; 1.2239 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 1.2240 esac 1.2241 @@ -34463,7 +34455,7 @@ 1.2242 for ac_f 1.2243 do 1.2244 case $ac_f in 1.2245 - -) ac_f="$ac_tmp/stdin";; 1.2246 + -) ac_f="$tmp/stdin";; 1.2247 *) # Look for the file first in the build tree, then in the source tree 1.2248 # (if the path is not absolute). The absolute path cannot be DOS-style, 1.2249 # because $ac_f cannot contain `:'. 1.2250 @@ -34472,7 +34464,7 @@ 1.2251 [\\/$]*) false;; 1.2252 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 1.2253 esac || 1.2254 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 1.2255 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 1.2256 esac 1.2257 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 1.2258 as_fn_append ac_file_inputs " '$ac_f'" 1.2259 @@ -34498,8 +34490,8 @@ 1.2260 esac 1.2261 1.2262 case $ac_tag in 1.2263 - *:-:* | *:-) cat >"$ac_tmp/stdin" \ 1.2264 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 1.2265 + *:-:* | *:-) cat >"$tmp/stdin" \ 1.2266 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 1.2267 esac 1.2268 ;; 1.2269 esac 1.2270 @@ -34624,22 +34616,21 @@ 1.2271 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t 1.2272 $ac_datarootdir_hack 1.2273 " 1.2274 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ 1.2275 - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2276 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 1.2277 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2278 1.2279 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 1.2280 - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 1.2281 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 1.2282 - "$ac_tmp/out"`; test -z "$ac_out"; } && 1.2283 + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 1.2284 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 1.2285 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 1.2286 which seems to be undefined. Please make sure it is defined" >&5 1.2287 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 1.2288 which seems to be undefined. Please make sure it is defined" >&2;} 1.2289 1.2290 - rm -f "$ac_tmp/stdin" 1.2291 + rm -f "$tmp/stdin" 1.2292 case $ac_file in 1.2293 - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 1.2294 - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 1.2295 + -) cat "$tmp/out" && rm -f "$tmp/out";; 1.2296 + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 1.2297 esac \ 1.2298 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2299 ;; 1.2300 @@ -34650,20 +34641,20 @@ 1.2301 if test x"$ac_file" != x-; then 1.2302 { 1.2303 $as_echo "/* $configure_input */" \ 1.2304 - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 1.2305 - } >"$ac_tmp/config.h" \ 1.2306 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 1.2307 + } >"$tmp/config.h" \ 1.2308 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2309 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 1.2310 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 1.2311 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 1.2312 $as_echo "$as_me: $ac_file is unchanged" >&6;} 1.2313 else 1.2314 rm -f "$ac_file" 1.2315 - mv "$ac_tmp/config.h" "$ac_file" \ 1.2316 + mv "$tmp/config.h" "$ac_file" \ 1.2317 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2318 fi 1.2319 else 1.2320 $as_echo "/* $configure_input */" \ 1.2321 - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 1.2322 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 1.2323 || as_fn_error $? "could not create -" "$LINENO" 5 1.2324 fi 1.2325 ;;
2.1 --- a/common/autoconf/toolchain_windows.m4 Wed Jun 05 15:20:35 2013 -0700 2.2 +++ b/common/autoconf/toolchain_windows.m4 Tue Jun 11 13:08:02 2013 +0200 2.3 @@ -91,6 +91,15 @@ 2.4 AC_MSG_ERROR([Cannot locate a valid Visual Studio installation]) 2.5 fi 2.6 2.7 + if test "x$VS100COMNTOOLS" != x; then 2.8 + TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$VS100COMNTOOLS/../..], [VS100COMNTOOLS variable]) 2.9 + fi 2.10 + if test "x$PROGRAMFILES" != x; then 2.11 + TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$PROGRAMFILES/Microsoft Visual Studio 10.0], [well-known name]) 2.12 + fi 2.13 + TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([C:/Program Files/Microsoft Visual Studio 10.0], [well-known name]) 2.14 + TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([C:/Program Files (x86)/Microsoft Visual Studio 10.0], [well-known name]) 2.15 + 2.16 if test "x$ProgramW6432" != x; then 2.17 TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([$ProgramW6432/Microsoft SDKs/Windows/v7.1/Bin], [well-known name]) 2.18 fi 2.19 @@ -102,15 +111,6 @@ 2.20 fi 2.21 TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([C:/Program Files/Microsoft SDKs/Windows/v7.1/Bin], [well-known name]) 2.22 TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([C:/Program Files (x86)/Microsoft SDKs/Windows/v7.1/Bin], [well-known name]) 2.23 - 2.24 - if test "x$VS100COMNTOOLS" != x; then 2.25 - TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$VS100COMNTOOLS/../..], [VS100COMNTOOLS variable]) 2.26 - fi 2.27 - if test "x$PROGRAMFILES" != x; then 2.28 - TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([$PROGRAMFILES/Microsoft Visual Studio 10.0], [well-known name]) 2.29 - fi 2.30 - TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([C:/Program Files/Microsoft Visual Studio 10.0], [well-known name]) 2.31 - TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([C:/Program Files (x86)/Microsoft Visual Studio 10.0], [well-known name]) 2.32 ]) 2.33 2.34 # Check if the VS env variables were setup prior to running configure. 2.35 @@ -248,10 +248,23 @@ 2.36 AC_MSG_NOTICE([Warning: msvcr100.dll not found in VCINSTALLDIR: $VCINSTALLDIR]) 2.37 fi 2.38 fi 2.39 + # Try some fallback alternatives 2.40 if test "x$MSVCR_DLL" = x; then 2.41 - if test -f "$SYSTEMROOT/system32/msvcr100.dll"; then 2.42 - AC_MSG_NOTICE([msvcr100.dll found in $SYSTEMROOT/system32]) 2.43 - MSVCR_DLL="$SYSTEMROOT/system32/msvcr100.dll" 2.44 + # If visual studio express is installed, there is usually one with the debugger 2.45 + if test "x$VS100COMNTOOLS" != x; then 2.46 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 2.47 + MSVCR_DLL=`find "$VS100COMNTOOLS/.." -name msvcr100.dll | grep -i x64 | head --lines 1` 2.48 + AC_MSG_NOTICE([msvcr100.dll found in $VS100COMNTOOLS..: $VS100COMNTOOLS..]) 2.49 + fi 2.50 + fi 2.51 + fi 2.52 + if test "x$MSVCR_DLL" = x; then 2.53 + if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then 2.54 + # Fallback for 32bit builds, look in the windows directory. 2.55 + if test -f "$SYSTEMROOT/system32/msvcr100.dll"; then 2.56 + AC_MSG_NOTICE([msvcr100.dll found in $SYSTEMROOT/system32]) 2.57 + MSVCR_DLL="$SYSTEMROOT/system32/msvcr100.dll" 2.58 + fi 2.59 fi 2.60 fi 2.61 fi
