Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Tue, 01 Jan 2013 12:47:16 -0800
- author
- lana
- date
- Tue, 01 Jan 2013 12:47:16 -0800
- changeset 553
- b845a2494261
- parent 552
- c37401e77c80
- parent 549
- 51ad2a343420
- child 554
- 93b9664f97ee
- child 592
- 1129fb75f611
Merge
1.1 --- a/.hgtags Fri Dec 28 22:20:53 2012 -0800 1.2 +++ b/.hgtags Tue Jan 01 12:47:16 2013 -0800 1.3 @@ -190,3 +190,5 @@ 1.4 13bb8c326e7b7b0b19d78c8088033e3932e3f7ca jdk8-b66 1.5 9a6ec97ec45c1a62d5233cefa91e8390e380e13a jdk8-b67 1.6 cdb401a60cea6ad5ef3f498725ed1decf8dda1ea jdk8-b68 1.7 +6ee8080a6efe0639fcd00627a5e0f839bf010481 jdk8-b69 1.8 +105a25ffa4a4f0af70188d4371b4a0385009b7ce jdk8-b70
2.1 --- a/common/autoconf/basics.m4 Fri Dec 28 22:20:53 2012 -0800 2.2 +++ b/common/autoconf/basics.m4 Tue Jan 01 12:47:16 2013 -0800 2.3 @@ -90,13 +90,25 @@ 2.4 tmp="$complete EOL" 2.5 arguments="${tmp#* }" 2.6 2.7 - new_path=`$WHICH $path 2> /dev/null` 2.8 + # Cannot rely on the command "which" here since it doesn't always work. 2.9 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 2.10 + if test -z "$is_absolute_path"; then 2.11 + # Path to executable is not absolute. Find it. 2.12 + IFS_save="$IFS" 2.13 + IFS=: 2.14 + for p in $PATH; do 2.15 + if test -f "$p/$path" && test -x "$p/$path"; then 2.16 + new_path="$p/$path" 2.17 + break 2.18 + fi 2.19 + done 2.20 + IFS="$IFS_save" 2.21 + else 2.22 + AC_MSG_NOTICE([Resolving $1 (as $path) failed, using $path directly.]) 2.23 + new_path="$path" 2.24 + fi 2.25 + 2.26 if test "x$new_path" = x; then 2.27 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 2.28 - if test "x$is_absolute_path" != x; then 2.29 - AC_MSG_NOTICE([Resolving $1 (as $path) with 'which' failed, using $path directly.]) 2.30 - new_path="$path" 2.31 - else 2.32 AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.]) 2.33 has_space=`$ECHO "$complete" | $GREP " "` 2.34 if test "x$has_space" != x; then 2.35 @@ -104,20 +116,19 @@ 2.36 fi 2.37 AC_MSG_ERROR([Cannot locate the the path of $1]) 2.38 fi 2.39 - fi 2.40 fi 2.41 2.42 - # Now join together the path and the arguments once again 2.43 - if test "x$arguments" != xEOL; then 2.44 - new_complete="$new_path ${arguments% *}" 2.45 - else 2.46 - new_complete="$new_path" 2.47 - fi 2.48 + # Now join together the path and the arguments once again 2.49 + if test "x$arguments" != xEOL; then 2.50 + new_complete="$new_path ${arguments% *}" 2.51 + else 2.52 + new_complete="$new_path" 2.53 + fi 2.54 2.55 if test "x$complete" != "x$new_complete"; then 2.56 - $1="$new_complete" 2.57 - AC_MSG_NOTICE([Rewriting $1 to "$new_complete"]) 2.58 - fi 2.59 + $1="$new_complete" 2.60 + AC_MSG_NOTICE([Rewriting $1 to "$new_complete"]) 2.61 + fi 2.62 ]) 2.63 2.64 AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
3.1 --- a/common/autoconf/generated-configure.sh Fri Dec 28 22:20:53 2012 -0800 3.2 +++ b/common/autoconf/generated-configure.sh Tue Jan 01 12:47:16 2013 -0800 3.3 @@ -1,6 +1,6 @@ 3.4 #! /bin/sh 3.5 # Guess values for system-dependent variables and create Makefiles. 3.6 -# Generated by GNU Autoconf 2.67 for OpenJDK jdk8. 3.7 +# Generated by GNU Autoconf 2.68 for OpenJDK jdk8. 3.8 # 3.9 # Report bugs to <build-dev@openjdk.java.net>. 3.10 # 3.11 @@ -91,6 +91,7 @@ 3.12 IFS=" "" $as_nl" 3.13 3.14 # Find who we are. Look in the path if we contain no directory separator. 3.15 +as_myself= 3.16 case $0 in #(( 3.17 *[\\/]* ) as_myself=$0 ;; 3.18 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.19 @@ -216,11 +217,18 @@ 3.20 # We cannot yet assume a decent shell, so we have to provide a 3.21 # neutralization value for shells without unset; and this also 3.22 # works around shells that cannot unset nonexistent variables. 3.23 + # Preserve -v and -x to the replacement shell. 3.24 BASH_ENV=/dev/null 3.25 ENV=/dev/null 3.26 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 3.27 export CONFIG_SHELL 3.28 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 3.29 + case $- in # (((( 3.30 + *v*x* | *x*v* ) as_opts=-vx ;; 3.31 + *v* ) as_opts=-v ;; 3.32 + *x* ) as_opts=-x ;; 3.33 + * ) as_opts= ;; 3.34 + esac 3.35 + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 3.36 fi 3.37 3.38 if test x$as_have_required = xno; then : 3.39 @@ -812,6 +820,7 @@ 3.40 JVM_VARIANT_ZEROSHARK 3.41 JVM_VARIANT_ZERO 3.42 JVM_VARIANT_KERNEL 3.43 +JVM_VARIANT_MINIMAL1 3.44 JVM_VARIANT_CLIENT 3.45 JVM_VARIANT_SERVER 3.46 JVM_VARIANTS 3.47 @@ -1430,7 +1439,7 @@ 3.48 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 3.49 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 3.50 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 3.51 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 3.52 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 3.53 ;; 3.54 3.55 esac 3.56 @@ -1684,7 +1693,7 @@ 3.57 sys-root (for cross-compiling) 3.58 --with-jdk-variant JDK variant to build (normal) [normal] 3.59 --with-jvm-variants JVM variants (separated by commas) to build (server, 3.60 - client, kernel, zero, zeroshark) [server] 3.61 + client, minimal1, kernel, zero, zeroshark) [server] 3.62 --with-debug-level set the debug level (release, fastdebug, slowdebug) 3.63 [release] 3.64 --with-conf-name use this as the name of the configuration [generated 3.65 @@ -1850,7 +1859,7 @@ 3.66 if $ac_init_version; then 3.67 cat <<\_ACEOF 3.68 OpenJDK configure jdk8 3.69 -generated by GNU Autoconf 2.67 3.70 +generated by GNU Autoconf 2.68 3.71 3.72 Copyright (C) 2010 Free Software Foundation, Inc. 3.73 This configure script is free software; the Free Software Foundation 3.74 @@ -1896,7 +1905,7 @@ 3.75 3.76 ac_retval=1 3.77 fi 3.78 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.79 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.80 as_fn_set_status $ac_retval 3.81 3.82 } # ac_fn_c_try_compile 3.83 @@ -1934,7 +1943,7 @@ 3.84 3.85 ac_retval=1 3.86 fi 3.87 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.88 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.89 as_fn_set_status $ac_retval 3.90 3.91 } # ac_fn_cxx_try_compile 3.92 @@ -1972,7 +1981,7 @@ 3.93 3.94 ac_retval=1 3.95 fi 3.96 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.97 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.98 as_fn_set_status $ac_retval 3.99 3.100 } # ac_fn_objc_try_compile 3.101 @@ -2009,7 +2018,7 @@ 3.102 3.103 ac_retval=1 3.104 fi 3.105 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.106 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.107 as_fn_set_status $ac_retval 3.108 3.109 } # ac_fn_c_try_cpp 3.110 @@ -2046,7 +2055,7 @@ 3.111 3.112 ac_retval=1 3.113 fi 3.114 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.115 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.116 as_fn_set_status $ac_retval 3.117 3.118 } # ac_fn_cxx_try_cpp 3.119 @@ -2059,10 +2068,10 @@ 3.120 ac_fn_cxx_check_header_mongrel () 3.121 { 3.122 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 3.123 - if eval "test \"\${$3+set}\"" = set; then : 3.124 + if eval \${$3+:} false; then : 3.125 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 3.126 $as_echo_n "checking for $2... " >&6; } 3.127 -if eval "test \"\${$3+set}\"" = set; then : 3.128 +if eval \${$3+:} false; then : 3.129 $as_echo_n "(cached) " >&6 3.130 fi 3.131 eval ac_res=\$$3 3.132 @@ -2129,7 +2138,7 @@ 3.133 esac 3.134 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 3.135 $as_echo_n "checking for $2... " >&6; } 3.136 -if eval "test \"\${$3+set}\"" = set; then : 3.137 +if eval \${$3+:} false; then : 3.138 $as_echo_n "(cached) " >&6 3.139 else 3.140 eval "$3=\$ac_header_compiler" 3.141 @@ -2138,7 +2147,7 @@ 3.142 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 3.143 $as_echo "$ac_res" >&6; } 3.144 fi 3.145 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.146 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.147 3.148 } # ac_fn_cxx_check_header_mongrel 3.149 3.150 @@ -2179,7 +2188,7 @@ 3.151 ac_retval=$ac_status 3.152 fi 3.153 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 3.154 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.155 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.156 as_fn_set_status $ac_retval 3.157 3.158 } # ac_fn_cxx_try_run 3.159 @@ -2193,7 +2202,7 @@ 3.160 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 3.161 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 3.162 $as_echo_n "checking for $2... " >&6; } 3.163 -if eval "test \"\${$3+set}\"" = set; then : 3.164 +if eval \${$3+:} false; then : 3.165 $as_echo_n "(cached) " >&6 3.166 else 3.167 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.168 @@ -2211,7 +2220,7 @@ 3.169 eval ac_res=\$$3 3.170 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 3.171 $as_echo "$ac_res" >&6; } 3.172 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.173 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.174 3.175 } # ac_fn_cxx_check_header_compile 3.176 3.177 @@ -2388,7 +2397,7 @@ 3.178 rm -f conftest.val 3.179 3.180 fi 3.181 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.182 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.183 as_fn_set_status $ac_retval 3.184 3.185 } # ac_fn_cxx_compute_int 3.186 @@ -2434,7 +2443,7 @@ 3.187 # interfere with the next link command; also delete a directory that is 3.188 # left behind by Apple's compiler. We do this before executing the actions. 3.189 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 3.190 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.191 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.192 as_fn_set_status $ac_retval 3.193 3.194 } # ac_fn_cxx_try_link 3.195 @@ -2447,7 +2456,7 @@ 3.196 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 3.197 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 3.198 $as_echo_n "checking for $2... " >&6; } 3.199 -if eval "test \"\${$3+set}\"" = set; then : 3.200 +if eval \${$3+:} false; then : 3.201 $as_echo_n "(cached) " >&6 3.202 else 3.203 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.204 @@ -2502,7 +2511,7 @@ 3.205 eval ac_res=\$$3 3.206 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 3.207 $as_echo "$ac_res" >&6; } 3.208 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.209 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.210 3.211 } # ac_fn_cxx_check_func 3.212 3.213 @@ -2515,7 +2524,7 @@ 3.214 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 3.215 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 3.216 $as_echo_n "checking for $2... " >&6; } 3.217 -if eval "test \"\${$3+set}\"" = set; then : 3.218 +if eval \${$3+:} false; then : 3.219 $as_echo_n "(cached) " >&6 3.220 else 3.221 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.222 @@ -2533,7 +2542,7 @@ 3.223 eval ac_res=\$$3 3.224 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 3.225 $as_echo "$ac_res" >&6; } 3.226 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.227 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.228 3.229 } # ac_fn_c_check_header_compile 3.230 cat >config.log <<_ACEOF 3.231 @@ -2541,7 +2550,7 @@ 3.232 running configure, to aid debugging if configure makes a mistake. 3.233 3.234 It was created by OpenJDK $as_me jdk8, which was 3.235 -generated by GNU Autoconf 2.67. Invocation command line was 3.236 +generated by GNU Autoconf 2.68. Invocation command line was 3.237 3.238 $ $0 $@ 3.239 3.240 @@ -2799,7 +2808,7 @@ 3.241 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.242 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.243 as_fn_error $? "failed to load site script $ac_site_file 3.244 -See \`config.log' for more details" "$LINENO" 5 ; } 3.245 +See \`config.log' for more details" "$LINENO" 5; } 3.246 fi 3.247 done 3.248 3.249 @@ -3674,7 +3683,7 @@ 3.250 #CUSTOM_AUTOCONF_INCLUDE 3.251 3.252 # Do not change or remove the following line, it is needed for consistency checks: 3.253 -DATE_WHEN_GENERATED=1355221914 3.254 +DATE_WHEN_GENERATED=1355963953 3.255 3.256 ############################################################################### 3.257 # 3.258 @@ -3712,7 +3721,7 @@ 3.259 set dummy $ac_prog; ac_word=$2 3.260 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.261 $as_echo_n "checking for $ac_word... " >&6; } 3.262 -if test "${ac_cv_path_BASENAME+set}" = set; then : 3.263 +if ${ac_cv_path_BASENAME+:} false; then : 3.264 $as_echo_n "(cached) " >&6 3.265 else 3.266 case $BASENAME in 3.267 @@ -3771,7 +3780,7 @@ 3.268 set dummy $ac_prog; ac_word=$2 3.269 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.270 $as_echo_n "checking for $ac_word... " >&6; } 3.271 -if test "${ac_cv_path_BASH+set}" = set; then : 3.272 +if ${ac_cv_path_BASH+:} false; then : 3.273 $as_echo_n "(cached) " >&6 3.274 else 3.275 case $BASH in 3.276 @@ -3830,7 +3839,7 @@ 3.277 set dummy $ac_prog; ac_word=$2 3.278 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.279 $as_echo_n "checking for $ac_word... " >&6; } 3.280 -if test "${ac_cv_path_CAT+set}" = set; then : 3.281 +if ${ac_cv_path_CAT+:} false; then : 3.282 $as_echo_n "(cached) " >&6 3.283 else 3.284 case $CAT in 3.285 @@ -3889,7 +3898,7 @@ 3.286 set dummy $ac_prog; ac_word=$2 3.287 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.288 $as_echo_n "checking for $ac_word... " >&6; } 3.289 -if test "${ac_cv_path_CHMOD+set}" = set; then : 3.290 +if ${ac_cv_path_CHMOD+:} false; then : 3.291 $as_echo_n "(cached) " >&6 3.292 else 3.293 case $CHMOD in 3.294 @@ -3948,7 +3957,7 @@ 3.295 set dummy $ac_prog; ac_word=$2 3.296 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.297 $as_echo_n "checking for $ac_word... " >&6; } 3.298 -if test "${ac_cv_path_CMP+set}" = set; then : 3.299 +if ${ac_cv_path_CMP+:} false; then : 3.300 $as_echo_n "(cached) " >&6 3.301 else 3.302 case $CMP in 3.303 @@ -4007,7 +4016,7 @@ 3.304 set dummy $ac_prog; ac_word=$2 3.305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.306 $as_echo_n "checking for $ac_word... " >&6; } 3.307 -if test "${ac_cv_path_CP+set}" = set; then : 3.308 +if ${ac_cv_path_CP+:} false; then : 3.309 $as_echo_n "(cached) " >&6 3.310 else 3.311 case $CP in 3.312 @@ -4066,7 +4075,7 @@ 3.313 set dummy $ac_prog; ac_word=$2 3.314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.315 $as_echo_n "checking for $ac_word... " >&6; } 3.316 -if test "${ac_cv_path_CUT+set}" = set; then : 3.317 +if ${ac_cv_path_CUT+:} false; then : 3.318 $as_echo_n "(cached) " >&6 3.319 else 3.320 case $CUT in 3.321 @@ -4125,7 +4134,7 @@ 3.322 set dummy $ac_prog; ac_word=$2 3.323 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.324 $as_echo_n "checking for $ac_word... " >&6; } 3.325 -if test "${ac_cv_path_DATE+set}" = set; then : 3.326 +if ${ac_cv_path_DATE+:} false; then : 3.327 $as_echo_n "(cached) " >&6 3.328 else 3.329 case $DATE in 3.330 @@ -4184,7 +4193,7 @@ 3.331 set dummy $ac_prog; ac_word=$2 3.332 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.333 $as_echo_n "checking for $ac_word... " >&6; } 3.334 -if test "${ac_cv_path_DIFF+set}" = set; then : 3.335 +if ${ac_cv_path_DIFF+:} false; then : 3.336 $as_echo_n "(cached) " >&6 3.337 else 3.338 case $DIFF in 3.339 @@ -4243,7 +4252,7 @@ 3.340 set dummy $ac_prog; ac_word=$2 3.341 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.342 $as_echo_n "checking for $ac_word... " >&6; } 3.343 -if test "${ac_cv_path_DIRNAME+set}" = set; then : 3.344 +if ${ac_cv_path_DIRNAME+:} false; then : 3.345 $as_echo_n "(cached) " >&6 3.346 else 3.347 case $DIRNAME in 3.348 @@ -4302,7 +4311,7 @@ 3.349 set dummy $ac_prog; ac_word=$2 3.350 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.351 $as_echo_n "checking for $ac_word... " >&6; } 3.352 -if test "${ac_cv_path_ECHO+set}" = set; then : 3.353 +if ${ac_cv_path_ECHO+:} false; then : 3.354 $as_echo_n "(cached) " >&6 3.355 else 3.356 case $ECHO in 3.357 @@ -4361,7 +4370,7 @@ 3.358 set dummy $ac_prog; ac_word=$2 3.359 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.360 $as_echo_n "checking for $ac_word... " >&6; } 3.361 -if test "${ac_cv_path_EXPR+set}" = set; then : 3.362 +if ${ac_cv_path_EXPR+:} false; then : 3.363 $as_echo_n "(cached) " >&6 3.364 else 3.365 case $EXPR in 3.366 @@ -4420,7 +4429,7 @@ 3.367 set dummy $ac_prog; ac_word=$2 3.368 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.369 $as_echo_n "checking for $ac_word... " >&6; } 3.370 -if test "${ac_cv_path_FILE+set}" = set; then : 3.371 +if ${ac_cv_path_FILE+:} false; then : 3.372 $as_echo_n "(cached) " >&6 3.373 else 3.374 case $FILE in 3.375 @@ -4479,7 +4488,7 @@ 3.376 set dummy $ac_prog; ac_word=$2 3.377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.378 $as_echo_n "checking for $ac_word... " >&6; } 3.379 -if test "${ac_cv_path_FIND+set}" = set; then : 3.380 +if ${ac_cv_path_FIND+:} false; then : 3.381 $as_echo_n "(cached) " >&6 3.382 else 3.383 case $FIND in 3.384 @@ -4538,7 +4547,7 @@ 3.385 set dummy $ac_prog; ac_word=$2 3.386 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.387 $as_echo_n "checking for $ac_word... " >&6; } 3.388 -if test "${ac_cv_path_HEAD+set}" = set; then : 3.389 +if ${ac_cv_path_HEAD+:} false; then : 3.390 $as_echo_n "(cached) " >&6 3.391 else 3.392 case $HEAD in 3.393 @@ -4597,7 +4606,7 @@ 3.394 set dummy $ac_prog; ac_word=$2 3.395 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.396 $as_echo_n "checking for $ac_word... " >&6; } 3.397 -if test "${ac_cv_path_LN+set}" = set; then : 3.398 +if ${ac_cv_path_LN+:} false; then : 3.399 $as_echo_n "(cached) " >&6 3.400 else 3.401 case $LN in 3.402 @@ -4656,7 +4665,7 @@ 3.403 set dummy $ac_prog; ac_word=$2 3.404 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.405 $as_echo_n "checking for $ac_word... " >&6; } 3.406 -if test "${ac_cv_path_LS+set}" = set; then : 3.407 +if ${ac_cv_path_LS+:} false; then : 3.408 $as_echo_n "(cached) " >&6 3.409 else 3.410 case $LS in 3.411 @@ -4715,7 +4724,7 @@ 3.412 set dummy $ac_prog; ac_word=$2 3.413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.414 $as_echo_n "checking for $ac_word... " >&6; } 3.415 -if test "${ac_cv_path_MKDIR+set}" = set; then : 3.416 +if ${ac_cv_path_MKDIR+:} false; then : 3.417 $as_echo_n "(cached) " >&6 3.418 else 3.419 case $MKDIR in 3.420 @@ -4774,7 +4783,7 @@ 3.421 set dummy $ac_prog; ac_word=$2 3.422 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.423 $as_echo_n "checking for $ac_word... " >&6; } 3.424 -if test "${ac_cv_path_MKTEMP+set}" = set; then : 3.425 +if ${ac_cv_path_MKTEMP+:} false; then : 3.426 $as_echo_n "(cached) " >&6 3.427 else 3.428 case $MKTEMP in 3.429 @@ -4833,7 +4842,7 @@ 3.430 set dummy $ac_prog; ac_word=$2 3.431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.432 $as_echo_n "checking for $ac_word... " >&6; } 3.433 -if test "${ac_cv_path_MV+set}" = set; then : 3.434 +if ${ac_cv_path_MV+:} false; then : 3.435 $as_echo_n "(cached) " >&6 3.436 else 3.437 case $MV in 3.438 @@ -4892,7 +4901,7 @@ 3.439 set dummy $ac_prog; ac_word=$2 3.440 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.441 $as_echo_n "checking for $ac_word... " >&6; } 3.442 -if test "${ac_cv_path_PRINTF+set}" = set; then : 3.443 +if ${ac_cv_path_PRINTF+:} false; then : 3.444 $as_echo_n "(cached) " >&6 3.445 else 3.446 case $PRINTF in 3.447 @@ -4951,7 +4960,7 @@ 3.448 set dummy $ac_prog; ac_word=$2 3.449 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.450 $as_echo_n "checking for $ac_word... " >&6; } 3.451 -if test "${ac_cv_path_THEPWDCMD+set}" = set; then : 3.452 +if ${ac_cv_path_THEPWDCMD+:} false; then : 3.453 $as_echo_n "(cached) " >&6 3.454 else 3.455 case $THEPWDCMD in 3.456 @@ -5010,7 +5019,7 @@ 3.457 set dummy $ac_prog; ac_word=$2 3.458 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.459 $as_echo_n "checking for $ac_word... " >&6; } 3.460 -if test "${ac_cv_path_RM+set}" = set; then : 3.461 +if ${ac_cv_path_RM+:} false; then : 3.462 $as_echo_n "(cached) " >&6 3.463 else 3.464 case $RM in 3.465 @@ -5069,7 +5078,7 @@ 3.466 set dummy $ac_prog; ac_word=$2 3.467 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.468 $as_echo_n "checking for $ac_word... " >&6; } 3.469 -if test "${ac_cv_path_SH+set}" = set; then : 3.470 +if ${ac_cv_path_SH+:} false; then : 3.471 $as_echo_n "(cached) " >&6 3.472 else 3.473 case $SH in 3.474 @@ -5128,7 +5137,7 @@ 3.475 set dummy $ac_prog; ac_word=$2 3.476 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.477 $as_echo_n "checking for $ac_word... " >&6; } 3.478 -if test "${ac_cv_path_SORT+set}" = set; then : 3.479 +if ${ac_cv_path_SORT+:} false; then : 3.480 $as_echo_n "(cached) " >&6 3.481 else 3.482 case $SORT in 3.483 @@ -5187,7 +5196,7 @@ 3.484 set dummy $ac_prog; ac_word=$2 3.485 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.486 $as_echo_n "checking for $ac_word... " >&6; } 3.487 -if test "${ac_cv_path_TAIL+set}" = set; then : 3.488 +if ${ac_cv_path_TAIL+:} false; then : 3.489 $as_echo_n "(cached) " >&6 3.490 else 3.491 case $TAIL in 3.492 @@ -5246,7 +5255,7 @@ 3.493 set dummy $ac_prog; ac_word=$2 3.494 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.495 $as_echo_n "checking for $ac_word... " >&6; } 3.496 -if test "${ac_cv_path_TAR+set}" = set; then : 3.497 +if ${ac_cv_path_TAR+:} false; then : 3.498 $as_echo_n "(cached) " >&6 3.499 else 3.500 case $TAR in 3.501 @@ -5305,7 +5314,7 @@ 3.502 set dummy $ac_prog; ac_word=$2 3.503 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.504 $as_echo_n "checking for $ac_word... " >&6; } 3.505 -if test "${ac_cv_path_TEE+set}" = set; then : 3.506 +if ${ac_cv_path_TEE+:} false; then : 3.507 $as_echo_n "(cached) " >&6 3.508 else 3.509 case $TEE in 3.510 @@ -5364,7 +5373,7 @@ 3.511 set dummy $ac_prog; ac_word=$2 3.512 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.513 $as_echo_n "checking for $ac_word... " >&6; } 3.514 -if test "${ac_cv_path_TOUCH+set}" = set; then : 3.515 +if ${ac_cv_path_TOUCH+:} false; then : 3.516 $as_echo_n "(cached) " >&6 3.517 else 3.518 case $TOUCH in 3.519 @@ -5423,7 +5432,7 @@ 3.520 set dummy $ac_prog; ac_word=$2 3.521 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.522 $as_echo_n "checking for $ac_word... " >&6; } 3.523 -if test "${ac_cv_path_TR+set}" = set; then : 3.524 +if ${ac_cv_path_TR+:} false; then : 3.525 $as_echo_n "(cached) " >&6 3.526 else 3.527 case $TR in 3.528 @@ -5482,7 +5491,7 @@ 3.529 set dummy $ac_prog; ac_word=$2 3.530 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.531 $as_echo_n "checking for $ac_word... " >&6; } 3.532 -if test "${ac_cv_path_UNAME+set}" = set; then : 3.533 +if ${ac_cv_path_UNAME+:} false; then : 3.534 $as_echo_n "(cached) " >&6 3.535 else 3.536 case $UNAME in 3.537 @@ -5541,7 +5550,7 @@ 3.538 set dummy $ac_prog; ac_word=$2 3.539 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.540 $as_echo_n "checking for $ac_word... " >&6; } 3.541 -if test "${ac_cv_path_UNIQ+set}" = set; then : 3.542 +if ${ac_cv_path_UNIQ+:} false; then : 3.543 $as_echo_n "(cached) " >&6 3.544 else 3.545 case $UNIQ in 3.546 @@ -5600,7 +5609,7 @@ 3.547 set dummy $ac_prog; ac_word=$2 3.548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.549 $as_echo_n "checking for $ac_word... " >&6; } 3.550 -if test "${ac_cv_path_WC+set}" = set; then : 3.551 +if ${ac_cv_path_WC+:} false; then : 3.552 $as_echo_n "(cached) " >&6 3.553 else 3.554 case $WC in 3.555 @@ -5659,7 +5668,7 @@ 3.556 set dummy $ac_prog; ac_word=$2 3.557 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.558 $as_echo_n "checking for $ac_word... " >&6; } 3.559 -if test "${ac_cv_path_WHICH+set}" = set; then : 3.560 +if ${ac_cv_path_WHICH+:} false; then : 3.561 $as_echo_n "(cached) " >&6 3.562 else 3.563 case $WHICH in 3.564 @@ -5718,7 +5727,7 @@ 3.565 set dummy $ac_prog; ac_word=$2 3.566 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.567 $as_echo_n "checking for $ac_word... " >&6; } 3.568 -if test "${ac_cv_path_XARGS+set}" = set; then : 3.569 +if ${ac_cv_path_XARGS+:} false; then : 3.570 $as_echo_n "(cached) " >&6 3.571 else 3.572 case $XARGS in 3.573 @@ -5778,7 +5787,7 @@ 3.574 set dummy $ac_prog; ac_word=$2 3.575 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.576 $as_echo_n "checking for $ac_word... " >&6; } 3.577 -if test "${ac_cv_prog_AWK+set}" = set; then : 3.578 +if ${ac_cv_prog_AWK+:} false; then : 3.579 $as_echo_n "(cached) " >&6 3.580 else 3.581 if test -n "$AWK"; then 3.582 @@ -5828,7 +5837,7 @@ 3.583 3.584 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 3.585 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 3.586 -if test "${ac_cv_path_GREP+set}" = set; then : 3.587 +if ${ac_cv_path_GREP+:} false; then : 3.588 $as_echo_n "(cached) " >&6 3.589 else 3.590 if test -z "$GREP"; then 3.591 @@ -5903,7 +5912,7 @@ 3.592 3.593 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 3.594 $as_echo_n "checking for egrep... " >&6; } 3.595 -if test "${ac_cv_path_EGREP+set}" = set; then : 3.596 +if ${ac_cv_path_EGREP+:} false; then : 3.597 $as_echo_n "(cached) " >&6 3.598 else 3.599 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 3.600 @@ -5982,7 +5991,7 @@ 3.601 3.602 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 3.603 $as_echo_n "checking for fgrep... " >&6; } 3.604 -if test "${ac_cv_path_FGREP+set}" = set; then : 3.605 +if ${ac_cv_path_FGREP+:} false; then : 3.606 $as_echo_n "(cached) " >&6 3.607 else 3.608 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 3.609 @@ -6061,7 +6070,7 @@ 3.610 3.611 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 3.612 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 3.613 -if test "${ac_cv_path_SED+set}" = set; then : 3.614 +if ${ac_cv_path_SED+:} false; then : 3.615 $as_echo_n "(cached) " >&6 3.616 else 3.617 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ 3.618 @@ -6147,7 +6156,7 @@ 3.619 set dummy $ac_prog; ac_word=$2 3.620 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.621 $as_echo_n "checking for $ac_word... " >&6; } 3.622 -if test "${ac_cv_path_NAWK+set}" = set; then : 3.623 +if ${ac_cv_path_NAWK+:} false; then : 3.624 $as_echo_n "(cached) " >&6 3.625 else 3.626 case $NAWK in 3.627 @@ -6207,7 +6216,7 @@ 3.628 set dummy cygpath; ac_word=$2 3.629 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.630 $as_echo_n "checking for $ac_word... " >&6; } 3.631 -if test "${ac_cv_path_CYGPATH+set}" = set; then : 3.632 +if ${ac_cv_path_CYGPATH+:} false; then : 3.633 $as_echo_n "(cached) " >&6 3.634 else 3.635 case $CYGPATH in 3.636 @@ -6247,7 +6256,7 @@ 3.637 set dummy readlink; ac_word=$2 3.638 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.639 $as_echo_n "checking for $ac_word... " >&6; } 3.640 -if test "${ac_cv_path_READLINK+set}" = set; then : 3.641 +if ${ac_cv_path_READLINK+:} false; then : 3.642 $as_echo_n "(cached) " >&6 3.643 else 3.644 case $READLINK in 3.645 @@ -6287,7 +6296,7 @@ 3.646 set dummy df; ac_word=$2 3.647 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.648 $as_echo_n "checking for $ac_word... " >&6; } 3.649 -if test "${ac_cv_path_DF+set}" = set; then : 3.650 +if ${ac_cv_path_DF+:} false; then : 3.651 $as_echo_n "(cached) " >&6 3.652 else 3.653 case $DF in 3.654 @@ -6327,7 +6336,7 @@ 3.655 set dummy SetFile; ac_word=$2 3.656 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.657 $as_echo_n "checking for $ac_word... " >&6; } 3.658 -if test "${ac_cv_path_SETFILE+set}" = set; then : 3.659 +if ${ac_cv_path_SETFILE+:} false; then : 3.660 $as_echo_n "(cached) " >&6 3.661 else 3.662 case $SETFILE in 3.663 @@ -6373,7 +6382,7 @@ 3.664 3.665 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 3.666 $as_echo_n "checking build system type... " >&6; } 3.667 -if test "${ac_cv_build+set}" = set; then : 3.668 +if ${ac_cv_build+:} false; then : 3.669 $as_echo_n "(cached) " >&6 3.670 else 3.671 ac_build_alias=$build_alias 3.672 @@ -6389,7 +6398,7 @@ 3.673 $as_echo "$ac_cv_build" >&6; } 3.674 case $ac_cv_build in 3.675 *-*-*) ;; 3.676 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 3.677 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 3.678 esac 3.679 build=$ac_cv_build 3.680 ac_save_IFS=$IFS; IFS='-' 3.681 @@ -6407,7 +6416,7 @@ 3.682 3.683 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 3.684 $as_echo_n "checking host system type... " >&6; } 3.685 -if test "${ac_cv_host+set}" = set; then : 3.686 +if ${ac_cv_host+:} false; then : 3.687 $as_echo_n "(cached) " >&6 3.688 else 3.689 if test "x$host_alias" = x; then 3.690 @@ -6422,7 +6431,7 @@ 3.691 $as_echo "$ac_cv_host" >&6; } 3.692 case $ac_cv_host in 3.693 *-*-*) ;; 3.694 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 3.695 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 3.696 esac 3.697 host=$ac_cv_host 3.698 ac_save_IFS=$IFS; IFS='-' 3.699 @@ -6440,7 +6449,7 @@ 3.700 3.701 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 3.702 $as_echo_n "checking target system type... " >&6; } 3.703 -if test "${ac_cv_target+set}" = set; then : 3.704 +if ${ac_cv_target+:} false; then : 3.705 $as_echo_n "(cached) " >&6 3.706 else 3.707 if test "x$target_alias" = x; then 3.708 @@ -6455,7 +6464,7 @@ 3.709 $as_echo "$ac_cv_target" >&6; } 3.710 case $ac_cv_target in 3.711 *-*-*) ;; 3.712 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 3.713 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 3.714 esac 3.715 target=$ac_cv_target 3.716 ac_save_IFS=$IFS; IFS='-' 3.717 @@ -7387,6 +7396,7 @@ 3.718 # Currently we have: 3.719 # server: normal interpreter and a tiered C1/C2 compiler 3.720 # client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms) 3.721 +# minimal1: reduced form of client with optional VM services and features stripped out 3.722 # kernel: kernel footprint JVM that passes the TCK without major performance problems, 3.723 # ie normal interpreter and C1, only the serial GC, kernel jvmti etc 3.724 # zero: no machine code interpreter, no compiler 3.725 @@ -7405,16 +7415,17 @@ 3.726 fi 3.727 3.728 JVM_VARIANTS=",$with_jvm_variants," 3.729 -TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'` 3.730 +TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'` 3.731 3.732 if test "x$TEST_VARIANTS" != "x,"; then 3.733 - as_fn_error $? "The available JVM variants are: server, client, kernel, zero, zeroshark" "$LINENO" 5 3.734 + as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark" "$LINENO" 5 3.735 fi 3.736 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_variants" >&5 3.737 $as_echo "$with_jvm_variants" >&6; } 3.738 3.739 JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'` 3.740 JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'` 3.741 +JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'` 3.742 JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'` 3.743 JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'` 3.744 JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` 3.745 @@ -7429,10 +7440,15 @@ 3.746 as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5 3.747 fi 3.748 fi 3.749 +if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 3.750 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 3.751 + as_fn_error $? "You cannot build a minimal JVM for a 64-bit machine." "$LINENO" 5 3.752 + fi 3.753 +fi 3.754 3.755 # Replace the commas with AND for use in the build directory name. 3.756 ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` 3.757 -COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'` 3.758 +COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'` 3.759 if test "x$COUNT_VARIANTS" != "x,1"; then 3.760 BUILDING_MULTIPLE_JVM_VARIANTS=yes 3.761 else 3.762 @@ -7446,6 +7462,7 @@ 3.763 3.764 3.765 3.766 + 3.767 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 3.768 MACOSX_UNIVERSAL="true" 3.769 fi 3.770 @@ -7531,7 +7548,9 @@ 3.771 ##### 3.772 # Generate the legacy makefile targets for hotspot. 3.773 # The hotspot api for selecting the build artifacts, really, needs to be improved. 3.774 -# 3.775 +# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to 3.776 +# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc 3.777 +# But until then ... 3.778 HOTSPOT_TARGET="" 3.779 3.780 if test "x$JVM_VARIANT_SERVER" = xtrue; then 3.781 @@ -7542,6 +7561,10 @@ 3.782 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 " 3.783 fi 3.784 3.785 +if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 3.786 + HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 " 3.787 +fi 3.788 + 3.789 if test "x$JVM_VARIANT_KERNEL" = xtrue; then 3.790 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel " 3.791 fi 3.792 @@ -7860,7 +7883,7 @@ 3.793 set dummy $ac_prog; ac_word=$2 3.794 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.795 $as_echo_n "checking for $ac_word... " >&6; } 3.796 -if test "${ac_cv_prog_PKGHANDLER+set}" = set; then : 3.797 +if ${ac_cv_prog_PKGHANDLER+:} false; then : 3.798 $as_echo_n "(cached) " >&6 3.799 else 3.800 if test -n "$PKGHANDLER"; then 3.801 @@ -8165,14 +8188,26 @@ 3.802 tmp="$complete EOL" 3.803 arguments="${tmp#* }" 3.804 3.805 - new_path=`$WHICH $path 2> /dev/null` 3.806 - if test "x$new_path" = x; then 3.807 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.808 - if test "x$is_absolute_path" != x; then 3.809 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5 3.810 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;} 3.811 - new_path="$path" 3.812 - else 3.813 + # Cannot rely on the command "which" here since it doesn't always work. 3.814 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.815 + if test -z "$is_absolute_path"; then 3.816 + # Path to executable is not absolute. Find it. 3.817 + IFS_save="$IFS" 3.818 + IFS=: 3.819 + for p in $PATH; do 3.820 + if test -f "$p/$path" && test -x "$p/$path"; then 3.821 + new_path="$p/$path" 3.822 + break 3.823 + fi 3.824 + done 3.825 + IFS="$IFS_save" 3.826 + else 3.827 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5 3.828 +$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;} 3.829 + new_path="$path" 3.830 + fi 3.831 + 3.832 + if test "x$new_path" = x; then 3.833 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 3.834 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;} 3.835 has_space=`$ECHO "$complete" | $GREP " "` 3.836 @@ -8182,21 +8217,20 @@ 3.837 fi 3.838 as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 3.839 fi 3.840 - fi 3.841 - fi 3.842 - 3.843 - # Now join together the path and the arguments once again 3.844 - if test "x$arguments" != xEOL; then 3.845 - new_complete="$new_path ${arguments% *}" 3.846 - else 3.847 - new_complete="$new_path" 3.848 - fi 3.849 + fi 3.850 + 3.851 + # Now join together the path and the arguments once again 3.852 + if test "x$arguments" != xEOL; then 3.853 + new_complete="$new_path ${arguments% *}" 3.854 + else 3.855 + new_complete="$new_path" 3.856 + fi 3.857 3.858 if test "x$complete" != "x$new_complete"; then 3.859 - FOUND_MAKE="$new_complete" 3.860 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 3.861 + FOUND_MAKE="$new_complete" 3.862 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 3.863 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;} 3.864 - fi 3.865 + fi 3.866 3.867 fi 3.868 fi 3.869 @@ -8214,7 +8248,7 @@ 3.870 set dummy $ac_prog; ac_word=$2 3.871 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.872 $as_echo_n "checking for $ac_word... " >&6; } 3.873 -if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then : 3.874 +if ${ac_cv_path_CHECK_GMAKE+:} false; then : 3.875 $as_echo_n "(cached) " >&6 3.876 else 3.877 case $CHECK_GMAKE in 3.878 @@ -8511,14 +8545,26 @@ 3.879 tmp="$complete EOL" 3.880 arguments="${tmp#* }" 3.881 3.882 - new_path=`$WHICH $path 2> /dev/null` 3.883 - if test "x$new_path" = x; then 3.884 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.885 - if test "x$is_absolute_path" != x; then 3.886 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5 3.887 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;} 3.888 - new_path="$path" 3.889 - else 3.890 + # Cannot rely on the command "which" here since it doesn't always work. 3.891 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.892 + if test -z "$is_absolute_path"; then 3.893 + # Path to executable is not absolute. Find it. 3.894 + IFS_save="$IFS" 3.895 + IFS=: 3.896 + for p in $PATH; do 3.897 + if test -f "$p/$path" && test -x "$p/$path"; then 3.898 + new_path="$p/$path" 3.899 + break 3.900 + fi 3.901 + done 3.902 + IFS="$IFS_save" 3.903 + else 3.904 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5 3.905 +$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;} 3.906 + new_path="$path" 3.907 + fi 3.908 + 3.909 + if test "x$new_path" = x; then 3.910 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 3.911 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;} 3.912 has_space=`$ECHO "$complete" | $GREP " "` 3.913 @@ -8528,21 +8574,20 @@ 3.914 fi 3.915 as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 3.916 fi 3.917 - fi 3.918 - fi 3.919 - 3.920 - # Now join together the path and the arguments once again 3.921 - if test "x$arguments" != xEOL; then 3.922 - new_complete="$new_path ${arguments% *}" 3.923 - else 3.924 - new_complete="$new_path" 3.925 - fi 3.926 + fi 3.927 + 3.928 + # Now join together the path and the arguments once again 3.929 + if test "x$arguments" != xEOL; then 3.930 + new_complete="$new_path ${arguments% *}" 3.931 + else 3.932 + new_complete="$new_path" 3.933 + fi 3.934 3.935 if test "x$complete" != "x$new_complete"; then 3.936 - FOUND_MAKE="$new_complete" 3.937 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 3.938 + FOUND_MAKE="$new_complete" 3.939 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 3.940 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;} 3.941 - fi 3.942 + fi 3.943 3.944 fi 3.945 fi 3.946 @@ -8557,7 +8602,7 @@ 3.947 set dummy $ac_prog; ac_word=$2 3.948 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.949 $as_echo_n "checking for $ac_word... " >&6; } 3.950 -if test "${ac_cv_path_CHECK_MAKE+set}" = set; then : 3.951 +if ${ac_cv_path_CHECK_MAKE+:} false; then : 3.952 $as_echo_n "(cached) " >&6 3.953 else 3.954 case $CHECK_MAKE in 3.955 @@ -8854,14 +8899,26 @@ 3.956 tmp="$complete EOL" 3.957 arguments="${tmp#* }" 3.958 3.959 - new_path=`$WHICH $path 2> /dev/null` 3.960 - if test "x$new_path" = x; then 3.961 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.962 - if test "x$is_absolute_path" != x; then 3.963 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5 3.964 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;} 3.965 - new_path="$path" 3.966 - else 3.967 + # Cannot rely on the command "which" here since it doesn't always work. 3.968 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.969 + if test -z "$is_absolute_path"; then 3.970 + # Path to executable is not absolute. Find it. 3.971 + IFS_save="$IFS" 3.972 + IFS=: 3.973 + for p in $PATH; do 3.974 + if test -f "$p/$path" && test -x "$p/$path"; then 3.975 + new_path="$p/$path" 3.976 + break 3.977 + fi 3.978 + done 3.979 + IFS="$IFS_save" 3.980 + else 3.981 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5 3.982 +$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;} 3.983 + new_path="$path" 3.984 + fi 3.985 + 3.986 + if test "x$new_path" = x; then 3.987 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 3.988 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;} 3.989 has_space=`$ECHO "$complete" | $GREP " "` 3.990 @@ -8871,21 +8928,20 @@ 3.991 fi 3.992 as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 3.993 fi 3.994 - fi 3.995 - fi 3.996 - 3.997 - # Now join together the path and the arguments once again 3.998 - if test "x$arguments" != xEOL; then 3.999 - new_complete="$new_path ${arguments% *}" 3.1000 - else 3.1001 - new_complete="$new_path" 3.1002 - fi 3.1003 + fi 3.1004 + 3.1005 + # Now join together the path and the arguments once again 3.1006 + if test "x$arguments" != xEOL; then 3.1007 + new_complete="$new_path ${arguments% *}" 3.1008 + else 3.1009 + new_complete="$new_path" 3.1010 + fi 3.1011 3.1012 if test "x$complete" != "x$new_complete"; then 3.1013 - FOUND_MAKE="$new_complete" 3.1014 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 3.1015 + FOUND_MAKE="$new_complete" 3.1016 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 3.1017 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;} 3.1018 - fi 3.1019 + fi 3.1020 3.1021 fi 3.1022 fi 3.1023 @@ -8905,7 +8961,7 @@ 3.1024 set dummy $ac_prog; ac_word=$2 3.1025 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1026 $as_echo_n "checking for $ac_word... " >&6; } 3.1027 -if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then : 3.1028 +if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then : 3.1029 $as_echo_n "(cached) " >&6 3.1030 else 3.1031 case $CHECK_TOOLSDIR_GMAKE in 3.1032 @@ -9202,14 +9258,26 @@ 3.1033 tmp="$complete EOL" 3.1034 arguments="${tmp#* }" 3.1035 3.1036 - new_path=`$WHICH $path 2> /dev/null` 3.1037 - if test "x$new_path" = x; then 3.1038 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1039 - if test "x$is_absolute_path" != x; then 3.1040 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5 3.1041 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;} 3.1042 - new_path="$path" 3.1043 - else 3.1044 + # Cannot rely on the command "which" here since it doesn't always work. 3.1045 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1046 + if test -z "$is_absolute_path"; then 3.1047 + # Path to executable is not absolute. Find it. 3.1048 + IFS_save="$IFS" 3.1049 + IFS=: 3.1050 + for p in $PATH; do 3.1051 + if test -f "$p/$path" && test -x "$p/$path"; then 3.1052 + new_path="$p/$path" 3.1053 + break 3.1054 + fi 3.1055 + done 3.1056 + IFS="$IFS_save" 3.1057 + else 3.1058 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5 3.1059 +$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;} 3.1060 + new_path="$path" 3.1061 + fi 3.1062 + 3.1063 + if test "x$new_path" = x; then 3.1064 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 3.1065 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;} 3.1066 has_space=`$ECHO "$complete" | $GREP " "` 3.1067 @@ -9219,21 +9287,20 @@ 3.1068 fi 3.1069 as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 3.1070 fi 3.1071 - fi 3.1072 - fi 3.1073 - 3.1074 - # Now join together the path and the arguments once again 3.1075 - if test "x$arguments" != xEOL; then 3.1076 - new_complete="$new_path ${arguments% *}" 3.1077 - else 3.1078 - new_complete="$new_path" 3.1079 - fi 3.1080 + fi 3.1081 + 3.1082 + # Now join together the path and the arguments once again 3.1083 + if test "x$arguments" != xEOL; then 3.1084 + new_complete="$new_path ${arguments% *}" 3.1085 + else 3.1086 + new_complete="$new_path" 3.1087 + fi 3.1088 3.1089 if test "x$complete" != "x$new_complete"; then 3.1090 - FOUND_MAKE="$new_complete" 3.1091 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 3.1092 + FOUND_MAKE="$new_complete" 3.1093 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 3.1094 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;} 3.1095 - fi 3.1096 + fi 3.1097 3.1098 fi 3.1099 fi 3.1100 @@ -9247,7 +9314,7 @@ 3.1101 set dummy $ac_prog; ac_word=$2 3.1102 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1103 $as_echo_n "checking for $ac_word... " >&6; } 3.1104 -if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then : 3.1105 +if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then : 3.1106 $as_echo_n "(cached) " >&6 3.1107 else 3.1108 case $CHECK_TOOLSDIR_MAKE in 3.1109 @@ -9544,14 +9611,26 @@ 3.1110 tmp="$complete EOL" 3.1111 arguments="${tmp#* }" 3.1112 3.1113 - new_path=`$WHICH $path 2> /dev/null` 3.1114 - if test "x$new_path" = x; then 3.1115 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1116 - if test "x$is_absolute_path" != x; then 3.1117 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5 3.1118 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;} 3.1119 - new_path="$path" 3.1120 - else 3.1121 + # Cannot rely on the command "which" here since it doesn't always work. 3.1122 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1123 + if test -z "$is_absolute_path"; then 3.1124 + # Path to executable is not absolute. Find it. 3.1125 + IFS_save="$IFS" 3.1126 + IFS=: 3.1127 + for p in $PATH; do 3.1128 + if test -f "$p/$path" && test -x "$p/$path"; then 3.1129 + new_path="$p/$path" 3.1130 + break 3.1131 + fi 3.1132 + done 3.1133 + IFS="$IFS_save" 3.1134 + else 3.1135 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5 3.1136 +$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;} 3.1137 + new_path="$path" 3.1138 + fi 3.1139 + 3.1140 + if test "x$new_path" = x; then 3.1141 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5 3.1142 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;} 3.1143 has_space=`$ECHO "$complete" | $GREP " "` 3.1144 @@ -9561,21 +9640,20 @@ 3.1145 fi 3.1146 as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5 3.1147 fi 3.1148 - fi 3.1149 - fi 3.1150 - 3.1151 - # Now join together the path and the arguments once again 3.1152 - if test "x$arguments" != xEOL; then 3.1153 - new_complete="$new_path ${arguments% *}" 3.1154 - else 3.1155 - new_complete="$new_path" 3.1156 - fi 3.1157 + fi 3.1158 + 3.1159 + # Now join together the path and the arguments once again 3.1160 + if test "x$arguments" != xEOL; then 3.1161 + new_complete="$new_path ${arguments% *}" 3.1162 + else 3.1163 + new_complete="$new_path" 3.1164 + fi 3.1165 3.1166 if test "x$complete" != "x$new_complete"; then 3.1167 - FOUND_MAKE="$new_complete" 3.1168 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 3.1169 + FOUND_MAKE="$new_complete" 3.1170 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5 3.1171 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;} 3.1172 - fi 3.1173 + fi 3.1174 3.1175 fi 3.1176 fi 3.1177 @@ -9632,7 +9710,7 @@ 3.1178 set dummy $ac_prog; ac_word=$2 3.1179 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1180 $as_echo_n "checking for $ac_word... " >&6; } 3.1181 -if test "${ac_cv_path_UNZIP+set}" = set; then : 3.1182 +if ${ac_cv_path_UNZIP+:} false; then : 3.1183 $as_echo_n "(cached) " >&6 3.1184 else 3.1185 case $UNZIP in 3.1186 @@ -9691,7 +9769,7 @@ 3.1187 set dummy $ac_prog; ac_word=$2 3.1188 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1189 $as_echo_n "checking for $ac_word... " >&6; } 3.1190 -if test "${ac_cv_path_ZIP+set}" = set; then : 3.1191 +if ${ac_cv_path_ZIP+:} false; then : 3.1192 $as_echo_n "(cached) " >&6 3.1193 else 3.1194 case $ZIP in 3.1195 @@ -9750,7 +9828,7 @@ 3.1196 set dummy ldd; ac_word=$2 3.1197 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1198 $as_echo_n "checking for $ac_word... " >&6; } 3.1199 -if test "${ac_cv_path_LDD+set}" = set; then : 3.1200 +if ${ac_cv_path_LDD+:} false; then : 3.1201 $as_echo_n "(cached) " >&6 3.1202 else 3.1203 case $LDD in 3.1204 @@ -9796,7 +9874,7 @@ 3.1205 set dummy otool; ac_word=$2 3.1206 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1207 $as_echo_n "checking for $ac_word... " >&6; } 3.1208 -if test "${ac_cv_path_OTOOL+set}" = set; then : 3.1209 +if ${ac_cv_path_OTOOL+:} false; then : 3.1210 $as_echo_n "(cached) " >&6 3.1211 else 3.1212 case $OTOOL in 3.1213 @@ -9841,7 +9919,7 @@ 3.1214 set dummy $ac_prog; ac_word=$2 3.1215 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1216 $as_echo_n "checking for $ac_word... " >&6; } 3.1217 -if test "${ac_cv_path_READELF+set}" = set; then : 3.1218 +if ${ac_cv_path_READELF+:} false; then : 3.1219 $as_echo_n "(cached) " >&6 3.1220 else 3.1221 case $READELF in 3.1222 @@ -9884,7 +9962,7 @@ 3.1223 set dummy hg; ac_word=$2 3.1224 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1225 $as_echo_n "checking for $ac_word... " >&6; } 3.1226 -if test "${ac_cv_path_HG+set}" = set; then : 3.1227 +if ${ac_cv_path_HG+:} false; then : 3.1228 $as_echo_n "(cached) " >&6 3.1229 else 3.1230 case $HG in 3.1231 @@ -9924,7 +10002,7 @@ 3.1232 set dummy stat; ac_word=$2 3.1233 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1234 $as_echo_n "checking for $ac_word... " >&6; } 3.1235 -if test "${ac_cv_path_STAT+set}" = set; then : 3.1236 +if ${ac_cv_path_STAT+:} false; then : 3.1237 $as_echo_n "(cached) " >&6 3.1238 else 3.1239 case $STAT in 3.1240 @@ -9964,7 +10042,7 @@ 3.1241 set dummy time; ac_word=$2 3.1242 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1243 $as_echo_n "checking for $ac_word... " >&6; } 3.1244 -if test "${ac_cv_path_TIME+set}" = set; then : 3.1245 +if ${ac_cv_path_TIME+:} false; then : 3.1246 $as_echo_n "(cached) " >&6 3.1247 else 3.1248 case $TIME in 3.1249 @@ -10009,7 +10087,7 @@ 3.1250 set dummy $ac_prog; ac_word=$2 3.1251 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1252 $as_echo_n "checking for $ac_word... " >&6; } 3.1253 -if test "${ac_cv_path_COMM+set}" = set; then : 3.1254 +if ${ac_cv_path_COMM+:} false; then : 3.1255 $as_echo_n "(cached) " >&6 3.1256 else 3.1257 case $COMM in 3.1258 @@ -10073,7 +10151,7 @@ 3.1259 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 3.1260 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1261 $as_echo_n "checking for $ac_word... " >&6; } 3.1262 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 3.1263 +if ${ac_cv_path_PKG_CONFIG+:} false; then : 3.1264 $as_echo_n "(cached) " >&6 3.1265 else 3.1266 case $PKG_CONFIG in 3.1267 @@ -10116,7 +10194,7 @@ 3.1268 set dummy pkg-config; ac_word=$2 3.1269 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1270 $as_echo_n "checking for $ac_word... " >&6; } 3.1271 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : 3.1272 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : 3.1273 $as_echo_n "(cached) " >&6 3.1274 else 3.1275 case $ac_pt_PKG_CONFIG in 3.1276 @@ -10289,7 +10367,7 @@ 3.1277 set dummy $ac_prog; ac_word=$2 3.1278 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1279 $as_echo_n "checking for $ac_word... " >&6; } 3.1280 -if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then : 3.1281 +if ${ac_cv_prog_BDEPS_UNZIP+:} false; then : 3.1282 $as_echo_n "(cached) " >&6 3.1283 else 3.1284 if test -n "$BDEPS_UNZIP"; then 3.1285 @@ -10335,7 +10413,7 @@ 3.1286 set dummy $ac_prog; ac_word=$2 3.1287 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1288 $as_echo_n "checking for $ac_word... " >&6; } 3.1289 -if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then : 3.1290 +if ${ac_cv_prog_BDEPS_FTP+:} false; then : 3.1291 $as_echo_n "(cached) " >&6 3.1292 else 3.1293 if test -n "$BDEPS_FTP"; then 3.1294 @@ -11624,7 +11702,7 @@ 3.1295 set dummy javac; ac_word=$2 3.1296 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1297 $as_echo_n "checking for $ac_word... " >&6; } 3.1298 -if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then : 3.1299 +if ${ac_cv_path_JAVAC_CHECK+:} false; then : 3.1300 $as_echo_n "(cached) " >&6 3.1301 else 3.1302 case $JAVAC_CHECK in 3.1303 @@ -11664,7 +11742,7 @@ 3.1304 set dummy java; ac_word=$2 3.1305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1306 $as_echo_n "checking for $ac_word... " >&6; } 3.1307 -if test "${ac_cv_path_JAVA_CHECK+set}" = set; then : 3.1308 +if ${ac_cv_path_JAVA_CHECK+:} false; then : 3.1309 $as_echo_n "(cached) " >&6 3.1310 else 3.1311 case $JAVA_CHECK in 3.1312 @@ -15723,7 +15801,7 @@ 3.1313 set dummy link; ac_word=$2 3.1314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1315 $as_echo_n "checking for $ac_word... " >&6; } 3.1316 -if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then : 3.1317 +if ${ac_cv_path_CYGWIN_LINK+:} false; then : 3.1318 $as_echo_n "(cached) " >&6 3.1319 else 3.1320 case $CYGWIN_LINK in 3.1321 @@ -16373,14 +16451,26 @@ 3.1322 tmp="$complete EOL" 3.1323 arguments="${tmp#* }" 3.1324 3.1325 - new_path=`$WHICH $path 2> /dev/null` 3.1326 - if test "x$new_path" = x; then 3.1327 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1328 - if test "x$is_absolute_path" != x; then 3.1329 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving VS_ENV_CMD (as $path) with 'which' failed, using $path directly." >&5 3.1330 -$as_echo "$as_me: Resolving VS_ENV_CMD (as $path) with 'which' failed, using $path directly." >&6;} 3.1331 - new_path="$path" 3.1332 - else 3.1333 + # Cannot rely on the command "which" here since it doesn't always work. 3.1334 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1335 + if test -z "$is_absolute_path"; then 3.1336 + # Path to executable is not absolute. Find it. 3.1337 + IFS_save="$IFS" 3.1338 + IFS=: 3.1339 + for p in $PATH; do 3.1340 + if test -f "$p/$path" && test -x "$p/$path"; then 3.1341 + new_path="$p/$path" 3.1342 + break 3.1343 + fi 3.1344 + done 3.1345 + IFS="$IFS_save" 3.1346 + else 3.1347 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving VS_ENV_CMD (as $path) failed, using $path directly." >&5 3.1348 +$as_echo "$as_me: Resolving VS_ENV_CMD (as $path) failed, using $path directly." >&6;} 3.1349 + new_path="$path" 3.1350 + fi 3.1351 + 3.1352 + if test "x$new_path" = x; then 3.1353 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&5 3.1354 $as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&6;} 3.1355 has_space=`$ECHO "$complete" | $GREP " "` 3.1356 @@ -16390,21 +16480,20 @@ 3.1357 fi 3.1358 as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5 3.1359 fi 3.1360 - fi 3.1361 - fi 3.1362 - 3.1363 - # Now join together the path and the arguments once again 3.1364 - if test "x$arguments" != xEOL; then 3.1365 - new_complete="$new_path ${arguments% *}" 3.1366 - else 3.1367 - new_complete="$new_path" 3.1368 - fi 3.1369 + fi 3.1370 + 3.1371 + # Now join together the path and the arguments once again 3.1372 + if test "x$arguments" != xEOL; then 3.1373 + new_complete="$new_path ${arguments% *}" 3.1374 + else 3.1375 + new_complete="$new_path" 3.1376 + fi 3.1377 3.1378 if test "x$complete" != "x$new_complete"; then 3.1379 - VS_ENV_CMD="$new_complete" 3.1380 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting VS_ENV_CMD to \"$new_complete\"" >&5 3.1381 + VS_ENV_CMD="$new_complete" 3.1382 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting VS_ENV_CMD to \"$new_complete\"" >&5 3.1383 $as_echo "$as_me: Rewriting VS_ENV_CMD to \"$new_complete\"" >&6;} 3.1384 - fi 3.1385 + fi 3.1386 3.1387 3.1388 # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat 3.1389 @@ -16701,7 +16790,7 @@ 3.1390 set dummy $ac_prog; ac_word=$2 3.1391 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1392 $as_echo_n "checking for $ac_word... " >&6; } 3.1393 -if test "${ac_cv_path_BUILD_CC+set}" = set; then : 3.1394 +if ${ac_cv_path_BUILD_CC+:} false; then : 3.1395 $as_echo_n "(cached) " >&6 3.1396 else 3.1397 case $BUILD_CC in 3.1398 @@ -16962,14 +17051,26 @@ 3.1399 tmp="$complete EOL" 3.1400 arguments="${tmp#* }" 3.1401 3.1402 - new_path=`$WHICH $path 2> /dev/null` 3.1403 - if test "x$new_path" = x; then 3.1404 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1405 - if test "x$is_absolute_path" != x; then 3.1406 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CC (as $path) with 'which' failed, using $path directly." >&5 3.1407 -$as_echo "$as_me: Resolving BUILD_CC (as $path) with 'which' failed, using $path directly." >&6;} 3.1408 - new_path="$path" 3.1409 - else 3.1410 + # Cannot rely on the command "which" here since it doesn't always work. 3.1411 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1412 + if test -z "$is_absolute_path"; then 3.1413 + # Path to executable is not absolute. Find it. 3.1414 + IFS_save="$IFS" 3.1415 + IFS=: 3.1416 + for p in $PATH; do 3.1417 + if test -f "$p/$path" && test -x "$p/$path"; then 3.1418 + new_path="$p/$path" 3.1419 + break 3.1420 + fi 3.1421 + done 3.1422 + IFS="$IFS_save" 3.1423 + else 3.1424 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CC (as $path) failed, using $path directly." >&5 3.1425 +$as_echo "$as_me: Resolving BUILD_CC (as $path) failed, using $path directly." >&6;} 3.1426 + new_path="$path" 3.1427 + fi 3.1428 + 3.1429 + if test "x$new_path" = x; then 3.1430 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5 3.1431 $as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;} 3.1432 has_space=`$ECHO "$complete" | $GREP " "` 3.1433 @@ -16979,21 +17080,20 @@ 3.1434 fi 3.1435 as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5 3.1436 fi 3.1437 - fi 3.1438 - fi 3.1439 - 3.1440 - # Now join together the path and the arguments once again 3.1441 - if test "x$arguments" != xEOL; then 3.1442 - new_complete="$new_path ${arguments% *}" 3.1443 - else 3.1444 - new_complete="$new_path" 3.1445 - fi 3.1446 + fi 3.1447 + 3.1448 + # Now join together the path and the arguments once again 3.1449 + if test "x$arguments" != xEOL; then 3.1450 + new_complete="$new_path ${arguments% *}" 3.1451 + else 3.1452 + new_complete="$new_path" 3.1453 + fi 3.1454 3.1455 if test "x$complete" != "x$new_complete"; then 3.1456 - BUILD_CC="$new_complete" 3.1457 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CC to \"$new_complete\"" >&5 3.1458 + BUILD_CC="$new_complete" 3.1459 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CC to \"$new_complete\"" >&5 3.1460 $as_echo "$as_me: Rewriting BUILD_CC to \"$new_complete\"" >&6;} 3.1461 - fi 3.1462 + fi 3.1463 3.1464 for ac_prog in cl CC g++ 3.1465 do 3.1466 @@ -17001,7 +17101,7 @@ 3.1467 set dummy $ac_prog; ac_word=$2 3.1468 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1469 $as_echo_n "checking for $ac_word... " >&6; } 3.1470 -if test "${ac_cv_path_BUILD_CXX+set}" = set; then : 3.1471 +if ${ac_cv_path_BUILD_CXX+:} false; then : 3.1472 $as_echo_n "(cached) " >&6 3.1473 else 3.1474 case $BUILD_CXX in 3.1475 @@ -17262,14 +17362,26 @@ 3.1476 tmp="$complete EOL" 3.1477 arguments="${tmp#* }" 3.1478 3.1479 - new_path=`$WHICH $path 2> /dev/null` 3.1480 - if test "x$new_path" = x; then 3.1481 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1482 - if test "x$is_absolute_path" != x; then 3.1483 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CXX (as $path) with 'which' failed, using $path directly." >&5 3.1484 -$as_echo "$as_me: Resolving BUILD_CXX (as $path) with 'which' failed, using $path directly." >&6;} 3.1485 - new_path="$path" 3.1486 - else 3.1487 + # Cannot rely on the command "which" here since it doesn't always work. 3.1488 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1489 + if test -z "$is_absolute_path"; then 3.1490 + # Path to executable is not absolute. Find it. 3.1491 + IFS_save="$IFS" 3.1492 + IFS=: 3.1493 + for p in $PATH; do 3.1494 + if test -f "$p/$path" && test -x "$p/$path"; then 3.1495 + new_path="$p/$path" 3.1496 + break 3.1497 + fi 3.1498 + done 3.1499 + IFS="$IFS_save" 3.1500 + else 3.1501 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CXX (as $path) failed, using $path directly." >&5 3.1502 +$as_echo "$as_me: Resolving BUILD_CXX (as $path) failed, using $path directly." >&6;} 3.1503 + new_path="$path" 3.1504 + fi 3.1505 + 3.1506 + if test "x$new_path" = x; then 3.1507 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5 3.1508 $as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;} 3.1509 has_space=`$ECHO "$complete" | $GREP " "` 3.1510 @@ -17279,27 +17391,26 @@ 3.1511 fi 3.1512 as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5 3.1513 fi 3.1514 - fi 3.1515 - fi 3.1516 - 3.1517 - # Now join together the path and the arguments once again 3.1518 - if test "x$arguments" != xEOL; then 3.1519 - new_complete="$new_path ${arguments% *}" 3.1520 - else 3.1521 - new_complete="$new_path" 3.1522 - fi 3.1523 + fi 3.1524 + 3.1525 + # Now join together the path and the arguments once again 3.1526 + if test "x$arguments" != xEOL; then 3.1527 + new_complete="$new_path ${arguments% *}" 3.1528 + else 3.1529 + new_complete="$new_path" 3.1530 + fi 3.1531 3.1532 if test "x$complete" != "x$new_complete"; then 3.1533 - BUILD_CXX="$new_complete" 3.1534 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CXX to \"$new_complete\"" >&5 3.1535 + BUILD_CXX="$new_complete" 3.1536 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CXX to \"$new_complete\"" >&5 3.1537 $as_echo "$as_me: Rewriting BUILD_CXX to \"$new_complete\"" >&6;} 3.1538 - fi 3.1539 + fi 3.1540 3.1541 # Extract the first word of "ld", so it can be a program name with args. 3.1542 set dummy ld; ac_word=$2 3.1543 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1544 $as_echo_n "checking for $ac_word... " >&6; } 3.1545 -if test "${ac_cv_path_BUILD_LD+set}" = set; then : 3.1546 +if ${ac_cv_path_BUILD_LD+:} false; then : 3.1547 $as_echo_n "(cached) " >&6 3.1548 else 3.1549 case $BUILD_LD in 3.1550 @@ -17557,14 +17668,26 @@ 3.1551 tmp="$complete EOL" 3.1552 arguments="${tmp#* }" 3.1553 3.1554 - new_path=`$WHICH $path 2> /dev/null` 3.1555 - if test "x$new_path" = x; then 3.1556 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1557 - if test "x$is_absolute_path" != x; then 3.1558 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_LD (as $path) with 'which' failed, using $path directly." >&5 3.1559 -$as_echo "$as_me: Resolving BUILD_LD (as $path) with 'which' failed, using $path directly." >&6;} 3.1560 - new_path="$path" 3.1561 - else 3.1562 + # Cannot rely on the command "which" here since it doesn't always work. 3.1563 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1564 + if test -z "$is_absolute_path"; then 3.1565 + # Path to executable is not absolute. Find it. 3.1566 + IFS_save="$IFS" 3.1567 + IFS=: 3.1568 + for p in $PATH; do 3.1569 + if test -f "$p/$path" && test -x "$p/$path"; then 3.1570 + new_path="$p/$path" 3.1571 + break 3.1572 + fi 3.1573 + done 3.1574 + IFS="$IFS_save" 3.1575 + else 3.1576 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_LD (as $path) failed, using $path directly." >&5 3.1577 +$as_echo "$as_me: Resolving BUILD_LD (as $path) failed, using $path directly." >&6;} 3.1578 + new_path="$path" 3.1579 + fi 3.1580 + 3.1581 + if test "x$new_path" = x; then 3.1582 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5 3.1583 $as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;} 3.1584 has_space=`$ECHO "$complete" | $GREP " "` 3.1585 @@ -17574,21 +17697,20 @@ 3.1586 fi 3.1587 as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5 3.1588 fi 3.1589 - fi 3.1590 - fi 3.1591 - 3.1592 - # Now join together the path and the arguments once again 3.1593 - if test "x$arguments" != xEOL; then 3.1594 - new_complete="$new_path ${arguments% *}" 3.1595 - else 3.1596 - new_complete="$new_path" 3.1597 - fi 3.1598 + fi 3.1599 + 3.1600 + # Now join together the path and the arguments once again 3.1601 + if test "x$arguments" != xEOL; then 3.1602 + new_complete="$new_path ${arguments% *}" 3.1603 + else 3.1604 + new_complete="$new_path" 3.1605 + fi 3.1606 3.1607 if test "x$complete" != "x$new_complete"; then 3.1608 - BUILD_LD="$new_complete" 3.1609 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_LD to \"$new_complete\"" >&5 3.1610 + BUILD_LD="$new_complete" 3.1611 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_LD to \"$new_complete\"" >&5 3.1612 $as_echo "$as_me: Rewriting BUILD_LD to \"$new_complete\"" >&6;} 3.1613 - fi 3.1614 + fi 3.1615 3.1616 fi 3.1617 3.1618 @@ -17800,7 +17922,7 @@ 3.1619 set dummy $ac_prog; ac_word=$2 3.1620 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1621 $as_echo_n "checking for $ac_word... " >&6; } 3.1622 -if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then : 3.1623 +if ${ac_cv_path_TOOLS_DIR_CC+:} false; then : 3.1624 $as_echo_n "(cached) " >&6 3.1625 else 3.1626 case $TOOLS_DIR_CC in 3.1627 @@ -17852,7 +17974,7 @@ 3.1628 set dummy $ac_prog; ac_word=$2 3.1629 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1630 $as_echo_n "checking for $ac_word... " >&6; } 3.1631 -if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then : 3.1632 +if ${ac_cv_path_POTENTIAL_CC+:} false; then : 3.1633 $as_echo_n "(cached) " >&6 3.1634 else 3.1635 case $POTENTIAL_CC in 3.1636 @@ -18144,14 +18266,26 @@ 3.1637 tmp="$complete EOL" 3.1638 arguments="${tmp#* }" 3.1639 3.1640 - new_path=`$WHICH $path 2> /dev/null` 3.1641 - if test "x$new_path" = x; then 3.1642 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1643 - if test "x$is_absolute_path" != x; then 3.1644 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CC (as $path) with 'which' failed, using $path directly." >&5 3.1645 -$as_echo "$as_me: Resolving CC (as $path) with 'which' failed, using $path directly." >&6;} 3.1646 - new_path="$path" 3.1647 - else 3.1648 + # Cannot rely on the command "which" here since it doesn't always work. 3.1649 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1650 + if test -z "$is_absolute_path"; then 3.1651 + # Path to executable is not absolute. Find it. 3.1652 + IFS_save="$IFS" 3.1653 + IFS=: 3.1654 + for p in $PATH; do 3.1655 + if test -f "$p/$path" && test -x "$p/$path"; then 3.1656 + new_path="$p/$path" 3.1657 + break 3.1658 + fi 3.1659 + done 3.1660 + IFS="$IFS_save" 3.1661 + else 3.1662 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CC (as $path) failed, using $path directly." >&5 3.1663 +$as_echo "$as_me: Resolving CC (as $path) failed, using $path directly." >&6;} 3.1664 + new_path="$path" 3.1665 + fi 3.1666 + 3.1667 + if test "x$new_path" = x; then 3.1668 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$complete\", is not found." >&5 3.1669 $as_echo "$as_me: The path of CC, which resolves as \"$complete\", is not found." >&6;} 3.1670 has_space=`$ECHO "$complete" | $GREP " "` 3.1671 @@ -18161,21 +18295,20 @@ 3.1672 fi 3.1673 as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5 3.1674 fi 3.1675 - fi 3.1676 - fi 3.1677 - 3.1678 - # Now join together the path and the arguments once again 3.1679 - if test "x$arguments" != xEOL; then 3.1680 - new_complete="$new_path ${arguments% *}" 3.1681 - else 3.1682 - new_complete="$new_path" 3.1683 - fi 3.1684 + fi 3.1685 + 3.1686 + # Now join together the path and the arguments once again 3.1687 + if test "x$arguments" != xEOL; then 3.1688 + new_complete="$new_path ${arguments% *}" 3.1689 + else 3.1690 + new_complete="$new_path" 3.1691 + fi 3.1692 3.1693 if test "x$complete" != "x$new_complete"; then 3.1694 - CC="$new_complete" 3.1695 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CC to \"$new_complete\"" >&5 3.1696 + CC="$new_complete" 3.1697 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CC to \"$new_complete\"" >&5 3.1698 $as_echo "$as_me: Rewriting CC to \"$new_complete\"" >&6;} 3.1699 - fi 3.1700 + fi 3.1701 3.1702 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5 3.1703 $as_echo_n "checking resolved symbolic links for CC... " >&6; } 3.1704 @@ -18254,7 +18387,7 @@ 3.1705 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.1706 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1707 $as_echo_n "checking for $ac_word... " >&6; } 3.1708 -if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then : 3.1709 +if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then : 3.1710 $as_echo_n "(cached) " >&6 3.1711 else 3.1712 if test -n "$PROPER_COMPILER_CC"; then 3.1713 @@ -18298,7 +18431,7 @@ 3.1714 set dummy $ac_prog; ac_word=$2 3.1715 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1716 $as_echo_n "checking for $ac_word... " >&6; } 3.1717 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then : 3.1718 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then : 3.1719 $as_echo_n "(cached) " >&6 3.1720 else 3.1721 if test -n "$ac_ct_PROPER_COMPILER_CC"; then 3.1722 @@ -18569,14 +18702,26 @@ 3.1723 tmp="$complete EOL" 3.1724 arguments="${tmp#* }" 3.1725 3.1726 - new_path=`$WHICH $path 2> /dev/null` 3.1727 - if test "x$new_path" = x; then 3.1728 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1729 - if test "x$is_absolute_path" != x; then 3.1730 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CC (as $path) with 'which' failed, using $path directly." >&5 3.1731 -$as_echo "$as_me: Resolving PROPER_COMPILER_CC (as $path) with 'which' failed, using $path directly." >&6;} 3.1732 - new_path="$path" 3.1733 - else 3.1734 + # Cannot rely on the command "which" here since it doesn't always work. 3.1735 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1736 + if test -z "$is_absolute_path"; then 3.1737 + # Path to executable is not absolute. Find it. 3.1738 + IFS_save="$IFS" 3.1739 + IFS=: 3.1740 + for p in $PATH; do 3.1741 + if test -f "$p/$path" && test -x "$p/$path"; then 3.1742 + new_path="$p/$path" 3.1743 + break 3.1744 + fi 3.1745 + done 3.1746 + IFS="$IFS_save" 3.1747 + else 3.1748 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CC (as $path) failed, using $path directly." >&5 3.1749 +$as_echo "$as_me: Resolving PROPER_COMPILER_CC (as $path) failed, using $path directly." >&6;} 3.1750 + new_path="$path" 3.1751 + fi 3.1752 + 3.1753 + if test "x$new_path" = x; then 3.1754 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&5 3.1755 $as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&6;} 3.1756 has_space=`$ECHO "$complete" | $GREP " "` 3.1757 @@ -18586,21 +18731,20 @@ 3.1758 fi 3.1759 as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5 3.1760 fi 3.1761 - fi 3.1762 - fi 3.1763 - 3.1764 - # Now join together the path and the arguments once again 3.1765 - if test "x$arguments" != xEOL; then 3.1766 - new_complete="$new_path ${arguments% *}" 3.1767 - else 3.1768 - new_complete="$new_path" 3.1769 - fi 3.1770 + fi 3.1771 + 3.1772 + # Now join together the path and the arguments once again 3.1773 + if test "x$arguments" != xEOL; then 3.1774 + new_complete="$new_path ${arguments% *}" 3.1775 + else 3.1776 + new_complete="$new_path" 3.1777 + fi 3.1778 3.1779 if test "x$complete" != "x$new_complete"; then 3.1780 - PROPER_COMPILER_CC="$new_complete" 3.1781 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&5 3.1782 + PROPER_COMPILER_CC="$new_complete" 3.1783 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&5 3.1784 $as_echo "$as_me: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&6;} 3.1785 - fi 3.1786 + fi 3.1787 3.1788 PATH="$RETRY_COMPILER_SAVED_PATH" 3.1789 3.1790 @@ -18737,7 +18881,7 @@ 3.1791 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.1792 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1793 $as_echo_n "checking for $ac_word... " >&6; } 3.1794 -if test "${ac_cv_prog_CC+set}" = set; then : 3.1795 +if ${ac_cv_prog_CC+:} false; then : 3.1796 $as_echo_n "(cached) " >&6 3.1797 else 3.1798 if test -n "$CC"; then 3.1799 @@ -18781,7 +18925,7 @@ 3.1800 set dummy $ac_prog; ac_word=$2 3.1801 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1802 $as_echo_n "checking for $ac_word... " >&6; } 3.1803 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 3.1804 +if ${ac_cv_prog_ac_ct_CC+:} false; then : 3.1805 $as_echo_n "(cached) " >&6 3.1806 else 3.1807 if test -n "$ac_ct_CC"; then 3.1808 @@ -18834,7 +18978,7 @@ 3.1809 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.1810 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1811 as_fn_error $? "no acceptable C compiler found in \$PATH 3.1812 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1813 +See \`config.log' for more details" "$LINENO" 5; } 3.1814 3.1815 # Provide some information about the compiler. 3.1816 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 3.1817 @@ -18949,7 +19093,7 @@ 3.1818 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.1819 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1820 as_fn_error 77 "C compiler cannot create executables 3.1821 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1822 +See \`config.log' for more details" "$LINENO" 5; } 3.1823 else 3.1824 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3.1825 $as_echo "yes" >&6; } 3.1826 @@ -18992,7 +19136,7 @@ 3.1827 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.1828 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1829 as_fn_error $? "cannot compute suffix of executables: cannot compile and link 3.1830 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1831 +See \`config.log' for more details" "$LINENO" 5; } 3.1832 fi 3.1833 rm -f conftest conftest$ac_cv_exeext 3.1834 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 3.1835 @@ -19051,7 +19195,7 @@ 3.1836 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1837 as_fn_error $? "cannot run C compiled programs. 3.1838 If you meant to cross compile, use \`--host'. 3.1839 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1840 +See \`config.log' for more details" "$LINENO" 5; } 3.1841 fi 3.1842 fi 3.1843 fi 3.1844 @@ -19062,7 +19206,7 @@ 3.1845 ac_clean_files=$ac_clean_files_save 3.1846 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 3.1847 $as_echo_n "checking for suffix of object files... " >&6; } 3.1848 -if test "${ac_cv_objext+set}" = set; then : 3.1849 +if ${ac_cv_objext+:} false; then : 3.1850 $as_echo_n "(cached) " >&6 3.1851 else 3.1852 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.1853 @@ -19103,7 +19247,7 @@ 3.1854 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.1855 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1856 as_fn_error $? "cannot compute suffix of object files: cannot compile 3.1857 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1858 +See \`config.log' for more details" "$LINENO" 5; } 3.1859 fi 3.1860 rm -f conftest.$ac_cv_objext conftest.$ac_ext 3.1861 fi 3.1862 @@ -19113,7 +19257,7 @@ 3.1863 ac_objext=$OBJEXT 3.1864 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 3.1865 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 3.1866 -if test "${ac_cv_c_compiler_gnu+set}" = set; then : 3.1867 +if ${ac_cv_c_compiler_gnu+:} false; then : 3.1868 $as_echo_n "(cached) " >&6 3.1869 else 3.1870 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.1871 @@ -19150,7 +19294,7 @@ 3.1872 ac_save_CFLAGS=$CFLAGS 3.1873 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 3.1874 $as_echo_n "checking whether $CC accepts -g... " >&6; } 3.1875 -if test "${ac_cv_prog_cc_g+set}" = set; then : 3.1876 +if ${ac_cv_prog_cc_g+:} false; then : 3.1877 $as_echo_n "(cached) " >&6 3.1878 else 3.1879 ac_save_c_werror_flag=$ac_c_werror_flag 3.1880 @@ -19228,7 +19372,7 @@ 3.1881 fi 3.1882 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 3.1883 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 3.1884 -if test "${ac_cv_prog_cc_c89+set}" = set; then : 3.1885 +if ${ac_cv_prog_cc_c89+:} false; then : 3.1886 $as_echo_n "(cached) " >&6 3.1887 else 3.1888 ac_cv_prog_cc_c89=no 3.1889 @@ -19347,7 +19491,7 @@ 3.1890 set dummy $ac_prog; ac_word=$2 3.1891 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1892 $as_echo_n "checking for $ac_word... " >&6; } 3.1893 -if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then : 3.1894 +if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then : 3.1895 $as_echo_n "(cached) " >&6 3.1896 else 3.1897 case $TOOLS_DIR_CXX in 3.1898 @@ -19399,7 +19543,7 @@ 3.1899 set dummy $ac_prog; ac_word=$2 3.1900 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1901 $as_echo_n "checking for $ac_word... " >&6; } 3.1902 -if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then : 3.1903 +if ${ac_cv_path_POTENTIAL_CXX+:} false; then : 3.1904 $as_echo_n "(cached) " >&6 3.1905 else 3.1906 case $POTENTIAL_CXX in 3.1907 @@ -19691,14 +19835,26 @@ 3.1908 tmp="$complete EOL" 3.1909 arguments="${tmp#* }" 3.1910 3.1911 - new_path=`$WHICH $path 2> /dev/null` 3.1912 - if test "x$new_path" = x; then 3.1913 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1914 - if test "x$is_absolute_path" != x; then 3.1915 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXX (as $path) with 'which' failed, using $path directly." >&5 3.1916 -$as_echo "$as_me: Resolving CXX (as $path) with 'which' failed, using $path directly." >&6;} 3.1917 - new_path="$path" 3.1918 - else 3.1919 + # Cannot rely on the command "which" here since it doesn't always work. 3.1920 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.1921 + if test -z "$is_absolute_path"; then 3.1922 + # Path to executable is not absolute. Find it. 3.1923 + IFS_save="$IFS" 3.1924 + IFS=: 3.1925 + for p in $PATH; do 3.1926 + if test -f "$p/$path" && test -x "$p/$path"; then 3.1927 + new_path="$p/$path" 3.1928 + break 3.1929 + fi 3.1930 + done 3.1931 + IFS="$IFS_save" 3.1932 + else 3.1933 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXX (as $path) failed, using $path directly." >&5 3.1934 +$as_echo "$as_me: Resolving CXX (as $path) failed, using $path directly." >&6;} 3.1935 + new_path="$path" 3.1936 + fi 3.1937 + 3.1938 + if test "x$new_path" = x; then 3.1939 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$complete\", is not found." >&5 3.1940 $as_echo "$as_me: The path of CXX, which resolves as \"$complete\", is not found." >&6;} 3.1941 has_space=`$ECHO "$complete" | $GREP " "` 3.1942 @@ -19708,21 +19864,20 @@ 3.1943 fi 3.1944 as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5 3.1945 fi 3.1946 - fi 3.1947 - fi 3.1948 - 3.1949 - # Now join together the path and the arguments once again 3.1950 - if test "x$arguments" != xEOL; then 3.1951 - new_complete="$new_path ${arguments% *}" 3.1952 - else 3.1953 - new_complete="$new_path" 3.1954 - fi 3.1955 + fi 3.1956 + 3.1957 + # Now join together the path and the arguments once again 3.1958 + if test "x$arguments" != xEOL; then 3.1959 + new_complete="$new_path ${arguments% *}" 3.1960 + else 3.1961 + new_complete="$new_path" 3.1962 + fi 3.1963 3.1964 if test "x$complete" != "x$new_complete"; then 3.1965 - CXX="$new_complete" 3.1966 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXX to \"$new_complete\"" >&5 3.1967 + CXX="$new_complete" 3.1968 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXX to \"$new_complete\"" >&5 3.1969 $as_echo "$as_me: Rewriting CXX to \"$new_complete\"" >&6;} 3.1970 - fi 3.1971 + fi 3.1972 3.1973 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5 3.1974 $as_echo_n "checking resolved symbolic links for CXX... " >&6; } 3.1975 @@ -19801,7 +19956,7 @@ 3.1976 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.1977 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1978 $as_echo_n "checking for $ac_word... " >&6; } 3.1979 -if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then : 3.1980 +if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then : 3.1981 $as_echo_n "(cached) " >&6 3.1982 else 3.1983 if test -n "$PROPER_COMPILER_CXX"; then 3.1984 @@ -19845,7 +20000,7 @@ 3.1985 set dummy $ac_prog; ac_word=$2 3.1986 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1987 $as_echo_n "checking for $ac_word... " >&6; } 3.1988 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then : 3.1989 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then : 3.1990 $as_echo_n "(cached) " >&6 3.1991 else 3.1992 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then 3.1993 @@ -20116,14 +20271,26 @@ 3.1994 tmp="$complete EOL" 3.1995 arguments="${tmp#* }" 3.1996 3.1997 - new_path=`$WHICH $path 2> /dev/null` 3.1998 - if test "x$new_path" = x; then 3.1999 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2000 - if test "x$is_absolute_path" != x; then 3.2001 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CXX (as $path) with 'which' failed, using $path directly." >&5 3.2002 -$as_echo "$as_me: Resolving PROPER_COMPILER_CXX (as $path) with 'which' failed, using $path directly." >&6;} 3.2003 - new_path="$path" 3.2004 - else 3.2005 + # Cannot rely on the command "which" here since it doesn't always work. 3.2006 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2007 + if test -z "$is_absolute_path"; then 3.2008 + # Path to executable is not absolute. Find it. 3.2009 + IFS_save="$IFS" 3.2010 + IFS=: 3.2011 + for p in $PATH; do 3.2012 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2013 + new_path="$p/$path" 3.2014 + break 3.2015 + fi 3.2016 + done 3.2017 + IFS="$IFS_save" 3.2018 + else 3.2019 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CXX (as $path) failed, using $path directly." >&5 3.2020 +$as_echo "$as_me: Resolving PROPER_COMPILER_CXX (as $path) failed, using $path directly." >&6;} 3.2021 + new_path="$path" 3.2022 + fi 3.2023 + 3.2024 + if test "x$new_path" = x; then 3.2025 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&5 3.2026 $as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&6;} 3.2027 has_space=`$ECHO "$complete" | $GREP " "` 3.2028 @@ -20133,21 +20300,20 @@ 3.2029 fi 3.2030 as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5 3.2031 fi 3.2032 - fi 3.2033 - fi 3.2034 - 3.2035 - # Now join together the path and the arguments once again 3.2036 - if test "x$arguments" != xEOL; then 3.2037 - new_complete="$new_path ${arguments% *}" 3.2038 - else 3.2039 - new_complete="$new_path" 3.2040 - fi 3.2041 + fi 3.2042 + 3.2043 + # Now join together the path and the arguments once again 3.2044 + if test "x$arguments" != xEOL; then 3.2045 + new_complete="$new_path ${arguments% *}" 3.2046 + else 3.2047 + new_complete="$new_path" 3.2048 + fi 3.2049 3.2050 if test "x$complete" != "x$new_complete"; then 3.2051 - PROPER_COMPILER_CXX="$new_complete" 3.2052 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&5 3.2053 + PROPER_COMPILER_CXX="$new_complete" 3.2054 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&5 3.2055 $as_echo "$as_me: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&6;} 3.2056 - fi 3.2057 + fi 3.2058 3.2059 PATH="$RETRY_COMPILER_SAVED_PATH" 3.2060 3.2061 @@ -20288,7 +20454,7 @@ 3.2062 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.2063 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2064 $as_echo_n "checking for $ac_word... " >&6; } 3.2065 -if test "${ac_cv_prog_CXX+set}" = set; then : 3.2066 +if ${ac_cv_prog_CXX+:} false; then : 3.2067 $as_echo_n "(cached) " >&6 3.2068 else 3.2069 if test -n "$CXX"; then 3.2070 @@ -20332,7 +20498,7 @@ 3.2071 set dummy $ac_prog; ac_word=$2 3.2072 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2073 $as_echo_n "checking for $ac_word... " >&6; } 3.2074 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : 3.2075 +if ${ac_cv_prog_ac_ct_CXX+:} false; then : 3.2076 $as_echo_n "(cached) " >&6 3.2077 else 3.2078 if test -n "$ac_ct_CXX"; then 3.2079 @@ -20410,7 +20576,7 @@ 3.2080 3.2081 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 3.2082 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } 3.2083 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : 3.2084 +if ${ac_cv_cxx_compiler_gnu+:} false; then : 3.2085 $as_echo_n "(cached) " >&6 3.2086 else 3.2087 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.2088 @@ -20447,7 +20613,7 @@ 3.2089 ac_save_CXXFLAGS=$CXXFLAGS 3.2090 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 3.2091 $as_echo_n "checking whether $CXX accepts -g... " >&6; } 3.2092 -if test "${ac_cv_prog_cxx_g+set}" = set; then : 3.2093 +if ${ac_cv_prog_cxx_g+:} false; then : 3.2094 $as_echo_n "(cached) " >&6 3.2095 else 3.2096 ac_save_cxx_werror_flag=$ac_cxx_werror_flag 3.2097 @@ -20545,7 +20711,7 @@ 3.2098 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.2099 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2100 $as_echo_n "checking for $ac_word... " >&6; } 3.2101 -if test "${ac_cv_prog_OBJC+set}" = set; then : 3.2102 +if ${ac_cv_prog_OBJC+:} false; then : 3.2103 $as_echo_n "(cached) " >&6 3.2104 else 3.2105 if test -n "$OBJC"; then 3.2106 @@ -20589,7 +20755,7 @@ 3.2107 set dummy $ac_prog; ac_word=$2 3.2108 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2109 $as_echo_n "checking for $ac_word... " >&6; } 3.2110 -if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then : 3.2111 +if ${ac_cv_prog_ac_ct_OBJC+:} false; then : 3.2112 $as_echo_n "(cached) " >&6 3.2113 else 3.2114 if test -n "$ac_ct_OBJC"; then 3.2115 @@ -20665,7 +20831,7 @@ 3.2116 3.2117 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 3.2118 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } 3.2119 -if test "${ac_cv_objc_compiler_gnu+set}" = set; then : 3.2120 +if ${ac_cv_objc_compiler_gnu+:} false; then : 3.2121 $as_echo_n "(cached) " >&6 3.2122 else 3.2123 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.2124 @@ -20702,7 +20868,7 @@ 3.2125 ac_save_OBJCFLAGS=$OBJCFLAGS 3.2126 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 3.2127 $as_echo_n "checking whether $OBJC accepts -g... " >&6; } 3.2128 -if test "${ac_cv_prog_objc_g+set}" = set; then : 3.2129 +if ${ac_cv_prog_objc_g+:} false; then : 3.2130 $as_echo_n "(cached) " >&6 3.2131 else 3.2132 ac_save_objc_werror_flag=$ac_objc_werror_flag 3.2133 @@ -21006,14 +21172,26 @@ 3.2134 tmp="$complete EOL" 3.2135 arguments="${tmp#* }" 3.2136 3.2137 - new_path=`$WHICH $path 2> /dev/null` 3.2138 - if test "x$new_path" = x; then 3.2139 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2140 - if test "x$is_absolute_path" != x; then 3.2141 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJC (as $path) with 'which' failed, using $path directly." >&5 3.2142 -$as_echo "$as_me: Resolving OBJC (as $path) with 'which' failed, using $path directly." >&6;} 3.2143 - new_path="$path" 3.2144 - else 3.2145 + # Cannot rely on the command "which" here since it doesn't always work. 3.2146 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2147 + if test -z "$is_absolute_path"; then 3.2148 + # Path to executable is not absolute. Find it. 3.2149 + IFS_save="$IFS" 3.2150 + IFS=: 3.2151 + for p in $PATH; do 3.2152 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2153 + new_path="$p/$path" 3.2154 + break 3.2155 + fi 3.2156 + done 3.2157 + IFS="$IFS_save" 3.2158 + else 3.2159 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJC (as $path) failed, using $path directly." >&5 3.2160 +$as_echo "$as_me: Resolving OBJC (as $path) failed, using $path directly." >&6;} 3.2161 + new_path="$path" 3.2162 + fi 3.2163 + 3.2164 + if test "x$new_path" = x; then 3.2165 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$complete\", is not found." >&5 3.2166 $as_echo "$as_me: The path of OBJC, which resolves as \"$complete\", is not found." >&6;} 3.2167 has_space=`$ECHO "$complete" | $GREP " "` 3.2168 @@ -21023,21 +21201,20 @@ 3.2169 fi 3.2170 as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5 3.2171 fi 3.2172 - fi 3.2173 - fi 3.2174 - 3.2175 - # Now join together the path and the arguments once again 3.2176 - if test "x$arguments" != xEOL; then 3.2177 - new_complete="$new_path ${arguments% *}" 3.2178 - else 3.2179 - new_complete="$new_path" 3.2180 - fi 3.2181 + fi 3.2182 + 3.2183 + # Now join together the path and the arguments once again 3.2184 + if test "x$arguments" != xEOL; then 3.2185 + new_complete="$new_path ${arguments% *}" 3.2186 + else 3.2187 + new_complete="$new_path" 3.2188 + fi 3.2189 3.2190 if test "x$complete" != "x$new_complete"; then 3.2191 - OBJC="$new_complete" 3.2192 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJC to \"$new_complete\"" >&5 3.2193 + OBJC="$new_complete" 3.2194 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJC to \"$new_complete\"" >&5 3.2195 $as_echo "$as_me: Rewriting OBJC to \"$new_complete\"" >&6;} 3.2196 - fi 3.2197 + fi 3.2198 3.2199 else 3.2200 OBJC= 3.2201 @@ -21067,7 +21244,7 @@ 3.2202 set dummy ${ac_tool_prefix}ar; ac_word=$2 3.2203 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2204 $as_echo_n "checking for $ac_word... " >&6; } 3.2205 -if test "${ac_cv_prog_AR+set}" = set; then : 3.2206 +if ${ac_cv_prog_AR+:} false; then : 3.2207 $as_echo_n "(cached) " >&6 3.2208 else 3.2209 if test -n "$AR"; then 3.2210 @@ -21107,7 +21284,7 @@ 3.2211 set dummy ar; ac_word=$2 3.2212 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2213 $as_echo_n "checking for $ac_word... " >&6; } 3.2214 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 3.2215 +if ${ac_cv_prog_ac_ct_AR+:} false; then : 3.2216 $as_echo_n "(cached) " >&6 3.2217 else 3.2218 if test -n "$ac_ct_AR"; then 3.2219 @@ -21376,14 +21553,26 @@ 3.2220 tmp="$complete EOL" 3.2221 arguments="${tmp#* }" 3.2222 3.2223 - new_path=`$WHICH $path 2> /dev/null` 3.2224 - if test "x$new_path" = x; then 3.2225 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2226 - if test "x$is_absolute_path" != x; then 3.2227 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AR (as $path) with 'which' failed, using $path directly." >&5 3.2228 -$as_echo "$as_me: Resolving AR (as $path) with 'which' failed, using $path directly." >&6;} 3.2229 - new_path="$path" 3.2230 - else 3.2231 + # Cannot rely on the command "which" here since it doesn't always work. 3.2232 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2233 + if test -z "$is_absolute_path"; then 3.2234 + # Path to executable is not absolute. Find it. 3.2235 + IFS_save="$IFS" 3.2236 + IFS=: 3.2237 + for p in $PATH; do 3.2238 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2239 + new_path="$p/$path" 3.2240 + break 3.2241 + fi 3.2242 + done 3.2243 + IFS="$IFS_save" 3.2244 + else 3.2245 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AR (as $path) failed, using $path directly." >&5 3.2246 +$as_echo "$as_me: Resolving AR (as $path) failed, using $path directly." >&6;} 3.2247 + new_path="$path" 3.2248 + fi 3.2249 + 3.2250 + if test "x$new_path" = x; then 3.2251 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5 3.2252 $as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;} 3.2253 has_space=`$ECHO "$complete" | $GREP " "` 3.2254 @@ -21393,21 +21582,20 @@ 3.2255 fi 3.2256 as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5 3.2257 fi 3.2258 - fi 3.2259 - fi 3.2260 - 3.2261 - # Now join together the path and the arguments once again 3.2262 - if test "x$arguments" != xEOL; then 3.2263 - new_complete="$new_path ${arguments% *}" 3.2264 - else 3.2265 - new_complete="$new_path" 3.2266 - fi 3.2267 + fi 3.2268 + 3.2269 + # Now join together the path and the arguments once again 3.2270 + if test "x$arguments" != xEOL; then 3.2271 + new_complete="$new_path ${arguments% *}" 3.2272 + else 3.2273 + new_complete="$new_path" 3.2274 + fi 3.2275 3.2276 if test "x$complete" != "x$new_complete"; then 3.2277 - AR="$new_complete" 3.2278 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AR to \"$new_complete\"" >&5 3.2279 + AR="$new_complete" 3.2280 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AR to \"$new_complete\"" >&5 3.2281 $as_echo "$as_me: Rewriting AR to \"$new_complete\"" >&6;} 3.2282 - fi 3.2283 + fi 3.2284 3.2285 fi 3.2286 if test "x$OPENJDK_TARGET_OS" = xmacosx; then 3.2287 @@ -21438,7 +21626,7 @@ 3.2288 set dummy link; ac_word=$2 3.2289 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2290 $as_echo_n "checking for $ac_word... " >&6; } 3.2291 -if test "${ac_cv_prog_WINLD+set}" = set; then : 3.2292 +if ${ac_cv_prog_WINLD+:} false; then : 3.2293 $as_echo_n "(cached) " >&6 3.2294 else 3.2295 if test -n "$WINLD"; then 3.2296 @@ -21712,14 +21900,26 @@ 3.2297 tmp="$complete EOL" 3.2298 arguments="${tmp#* }" 3.2299 3.2300 - new_path=`$WHICH $path 2> /dev/null` 3.2301 - if test "x$new_path" = x; then 3.2302 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2303 - if test "x$is_absolute_path" != x; then 3.2304 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINLD (as $path) with 'which' failed, using $path directly." >&5 3.2305 -$as_echo "$as_me: Resolving WINLD (as $path) with 'which' failed, using $path directly." >&6;} 3.2306 - new_path="$path" 3.2307 - else 3.2308 + # Cannot rely on the command "which" here since it doesn't always work. 3.2309 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2310 + if test -z "$is_absolute_path"; then 3.2311 + # Path to executable is not absolute. Find it. 3.2312 + IFS_save="$IFS" 3.2313 + IFS=: 3.2314 + for p in $PATH; do 3.2315 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2316 + new_path="$p/$path" 3.2317 + break 3.2318 + fi 3.2319 + done 3.2320 + IFS="$IFS_save" 3.2321 + else 3.2322 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINLD (as $path) failed, using $path directly." >&5 3.2323 +$as_echo "$as_me: Resolving WINLD (as $path) failed, using $path directly." >&6;} 3.2324 + new_path="$path" 3.2325 + fi 3.2326 + 3.2327 + if test "x$new_path" = x; then 3.2328 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5 3.2329 $as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;} 3.2330 has_space=`$ECHO "$complete" | $GREP " "` 3.2331 @@ -21729,21 +21929,20 @@ 3.2332 fi 3.2333 as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5 3.2334 fi 3.2335 - fi 3.2336 - fi 3.2337 - 3.2338 - # Now join together the path and the arguments once again 3.2339 - if test "x$arguments" != xEOL; then 3.2340 - new_complete="$new_path ${arguments% *}" 3.2341 - else 3.2342 - new_complete="$new_path" 3.2343 - fi 3.2344 + fi 3.2345 + 3.2346 + # Now join together the path and the arguments once again 3.2347 + if test "x$arguments" != xEOL; then 3.2348 + new_complete="$new_path ${arguments% *}" 3.2349 + else 3.2350 + new_complete="$new_path" 3.2351 + fi 3.2352 3.2353 if test "x$complete" != "x$new_complete"; then 3.2354 - WINLD="$new_complete" 3.2355 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINLD to \"$new_complete\"" >&5 3.2356 + WINLD="$new_complete" 3.2357 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINLD to \"$new_complete\"" >&5 3.2358 $as_echo "$as_me: Rewriting WINLD to \"$new_complete\"" >&6;} 3.2359 - fi 3.2360 + fi 3.2361 3.2362 printf "Windows linker was found at $WINLD\n" 3.2363 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the found link.exe is actually the Visual Studio linker" >&5 3.2364 @@ -21766,7 +21965,7 @@ 3.2365 set dummy mt; ac_word=$2 3.2366 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2367 $as_echo_n "checking for $ac_word... " >&6; } 3.2368 -if test "${ac_cv_prog_MT+set}" = set; then : 3.2369 +if ${ac_cv_prog_MT+:} false; then : 3.2370 $as_echo_n "(cached) " >&6 3.2371 else 3.2372 if test -n "$MT"; then 3.2373 @@ -22038,14 +22237,26 @@ 3.2374 tmp="$complete EOL" 3.2375 arguments="${tmp#* }" 3.2376 3.2377 - new_path=`$WHICH $path 2> /dev/null` 3.2378 - if test "x$new_path" = x; then 3.2379 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2380 - if test "x$is_absolute_path" != x; then 3.2381 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MT (as $path) with 'which' failed, using $path directly." >&5 3.2382 -$as_echo "$as_me: Resolving MT (as $path) with 'which' failed, using $path directly." >&6;} 3.2383 - new_path="$path" 3.2384 - else 3.2385 + # Cannot rely on the command "which" here since it doesn't always work. 3.2386 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2387 + if test -z "$is_absolute_path"; then 3.2388 + # Path to executable is not absolute. Find it. 3.2389 + IFS_save="$IFS" 3.2390 + IFS=: 3.2391 + for p in $PATH; do 3.2392 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2393 + new_path="$p/$path" 3.2394 + break 3.2395 + fi 3.2396 + done 3.2397 + IFS="$IFS_save" 3.2398 + else 3.2399 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MT (as $path) failed, using $path directly." >&5 3.2400 +$as_echo "$as_me: Resolving MT (as $path) failed, using $path directly." >&6;} 3.2401 + new_path="$path" 3.2402 + fi 3.2403 + 3.2404 + if test "x$new_path" = x; then 3.2405 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5 3.2406 $as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;} 3.2407 has_space=`$ECHO "$complete" | $GREP " "` 3.2408 @@ -22055,28 +22266,27 @@ 3.2409 fi 3.2410 as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5 3.2411 fi 3.2412 - fi 3.2413 - fi 3.2414 - 3.2415 - # Now join together the path and the arguments once again 3.2416 - if test "x$arguments" != xEOL; then 3.2417 - new_complete="$new_path ${arguments% *}" 3.2418 - else 3.2419 - new_complete="$new_path" 3.2420 - fi 3.2421 + fi 3.2422 + 3.2423 + # Now join together the path and the arguments once again 3.2424 + if test "x$arguments" != xEOL; then 3.2425 + new_complete="$new_path ${arguments% *}" 3.2426 + else 3.2427 + new_complete="$new_path" 3.2428 + fi 3.2429 3.2430 if test "x$complete" != "x$new_complete"; then 3.2431 - MT="$new_complete" 3.2432 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MT to \"$new_complete\"" >&5 3.2433 + MT="$new_complete" 3.2434 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MT to \"$new_complete\"" >&5 3.2435 $as_echo "$as_me: Rewriting MT to \"$new_complete\"" >&6;} 3.2436 - fi 3.2437 + fi 3.2438 3.2439 # The resource compiler 3.2440 # Extract the first word of "rc", so it can be a program name with args. 3.2441 set dummy rc; ac_word=$2 3.2442 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2443 $as_echo_n "checking for $ac_word... " >&6; } 3.2444 -if test "${ac_cv_prog_RC+set}" = set; then : 3.2445 +if ${ac_cv_prog_RC+:} false; then : 3.2446 $as_echo_n "(cached) " >&6 3.2447 else 3.2448 if test -n "$RC"; then 3.2449 @@ -22348,14 +22558,26 @@ 3.2450 tmp="$complete EOL" 3.2451 arguments="${tmp#* }" 3.2452 3.2453 - new_path=`$WHICH $path 2> /dev/null` 3.2454 - if test "x$new_path" = x; then 3.2455 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2456 - if test "x$is_absolute_path" != x; then 3.2457 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving RC (as $path) with 'which' failed, using $path directly." >&5 3.2458 -$as_echo "$as_me: Resolving RC (as $path) with 'which' failed, using $path directly." >&6;} 3.2459 - new_path="$path" 3.2460 - else 3.2461 + # Cannot rely on the command "which" here since it doesn't always work. 3.2462 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2463 + if test -z "$is_absolute_path"; then 3.2464 + # Path to executable is not absolute. Find it. 3.2465 + IFS_save="$IFS" 3.2466 + IFS=: 3.2467 + for p in $PATH; do 3.2468 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2469 + new_path="$p/$path" 3.2470 + break 3.2471 + fi 3.2472 + done 3.2473 + IFS="$IFS_save" 3.2474 + else 3.2475 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving RC (as $path) failed, using $path directly." >&5 3.2476 +$as_echo "$as_me: Resolving RC (as $path) failed, using $path directly." >&6;} 3.2477 + new_path="$path" 3.2478 + fi 3.2479 + 3.2480 + if test "x$new_path" = x; then 3.2481 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5 3.2482 $as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;} 3.2483 has_space=`$ECHO "$complete" | $GREP " "` 3.2484 @@ -22365,21 +22587,20 @@ 3.2485 fi 3.2486 as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5 3.2487 fi 3.2488 - fi 3.2489 - fi 3.2490 - 3.2491 - # Now join together the path and the arguments once again 3.2492 - if test "x$arguments" != xEOL; then 3.2493 - new_complete="$new_path ${arguments% *}" 3.2494 - else 3.2495 - new_complete="$new_path" 3.2496 - fi 3.2497 + fi 3.2498 + 3.2499 + # Now join together the path and the arguments once again 3.2500 + if test "x$arguments" != xEOL; then 3.2501 + new_complete="$new_path ${arguments% *}" 3.2502 + else 3.2503 + new_complete="$new_path" 3.2504 + fi 3.2505 3.2506 if test "x$complete" != "x$new_complete"; then 3.2507 - RC="$new_complete" 3.2508 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting RC to \"$new_complete\"" >&5 3.2509 + RC="$new_complete" 3.2510 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting RC to \"$new_complete\"" >&5 3.2511 $as_echo "$as_me: Rewriting RC to \"$new_complete\"" >&6;} 3.2512 - fi 3.2513 + fi 3.2514 3.2515 3.2516 # For hotspot, we need these in Windows mixed path, 3.2517 @@ -22456,7 +22677,7 @@ 3.2518 set dummy lib; ac_word=$2 3.2519 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2520 $as_echo_n "checking for $ac_word... " >&6; } 3.2521 -if test "${ac_cv_prog_WINAR+set}" = set; then : 3.2522 +if ${ac_cv_prog_WINAR+:} false; then : 3.2523 $as_echo_n "(cached) " >&6 3.2524 else 3.2525 if test -n "$WINAR"; then 3.2526 @@ -22711,14 +22932,26 @@ 3.2527 tmp="$complete EOL" 3.2528 arguments="${tmp#* }" 3.2529 3.2530 - new_path=`$WHICH $path 2> /dev/null` 3.2531 - if test "x$new_path" = x; then 3.2532 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2533 - if test "x$is_absolute_path" != x; then 3.2534 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINAR (as $path) with 'which' failed, using $path directly." >&5 3.2535 -$as_echo "$as_me: Resolving WINAR (as $path) with 'which' failed, using $path directly." >&6;} 3.2536 - new_path="$path" 3.2537 - else 3.2538 + # Cannot rely on the command "which" here since it doesn't always work. 3.2539 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2540 + if test -z "$is_absolute_path"; then 3.2541 + # Path to executable is not absolute. Find it. 3.2542 + IFS_save="$IFS" 3.2543 + IFS=: 3.2544 + for p in $PATH; do 3.2545 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2546 + new_path="$p/$path" 3.2547 + break 3.2548 + fi 3.2549 + done 3.2550 + IFS="$IFS_save" 3.2551 + else 3.2552 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINAR (as $path) failed, using $path directly." >&5 3.2553 +$as_echo "$as_me: Resolving WINAR (as $path) failed, using $path directly." >&6;} 3.2554 + new_path="$path" 3.2555 + fi 3.2556 + 3.2557 + if test "x$new_path" = x; then 3.2558 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5 3.2559 $as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;} 3.2560 has_space=`$ECHO "$complete" | $GREP " "` 3.2561 @@ -22728,21 +22961,20 @@ 3.2562 fi 3.2563 as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5 3.2564 fi 3.2565 - fi 3.2566 - fi 3.2567 - 3.2568 - # Now join together the path and the arguments once again 3.2569 - if test "x$arguments" != xEOL; then 3.2570 - new_complete="$new_path ${arguments% *}" 3.2571 - else 3.2572 - new_complete="$new_path" 3.2573 - fi 3.2574 + fi 3.2575 + 3.2576 + # Now join together the path and the arguments once again 3.2577 + if test "x$arguments" != xEOL; then 3.2578 + new_complete="$new_path ${arguments% *}" 3.2579 + else 3.2580 + new_complete="$new_path" 3.2581 + fi 3.2582 3.2583 if test "x$complete" != "x$new_complete"; then 3.2584 - WINAR="$new_complete" 3.2585 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINAR to \"$new_complete\"" >&5 3.2586 + WINAR="$new_complete" 3.2587 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINAR to \"$new_complete\"" >&5 3.2588 $as_echo "$as_me: Rewriting WINAR to \"$new_complete\"" >&6;} 3.2589 - fi 3.2590 + fi 3.2591 3.2592 AR="$WINAR" 3.2593 ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT" 3.2594 @@ -22751,7 +22983,7 @@ 3.2595 set dummy dumpbin; ac_word=$2 3.2596 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2597 $as_echo_n "checking for $ac_word... " >&6; } 3.2598 -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : 3.2599 +if ${ac_cv_prog_DUMPBIN+:} false; then : 3.2600 $as_echo_n "(cached) " >&6 3.2601 else 3.2602 if test -n "$DUMPBIN"; then 3.2603 @@ -23006,14 +23238,26 @@ 3.2604 tmp="$complete EOL" 3.2605 arguments="${tmp#* }" 3.2606 3.2607 - new_path=`$WHICH $path 2> /dev/null` 3.2608 - if test "x$new_path" = x; then 3.2609 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2610 - if test "x$is_absolute_path" != x; then 3.2611 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving DUMPBIN (as $path) with 'which' failed, using $path directly." >&5 3.2612 -$as_echo "$as_me: Resolving DUMPBIN (as $path) with 'which' failed, using $path directly." >&6;} 3.2613 - new_path="$path" 3.2614 - else 3.2615 + # Cannot rely on the command "which" here since it doesn't always work. 3.2616 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2617 + if test -z "$is_absolute_path"; then 3.2618 + # Path to executable is not absolute. Find it. 3.2619 + IFS_save="$IFS" 3.2620 + IFS=: 3.2621 + for p in $PATH; do 3.2622 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2623 + new_path="$p/$path" 3.2624 + break 3.2625 + fi 3.2626 + done 3.2627 + IFS="$IFS_save" 3.2628 + else 3.2629 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving DUMPBIN (as $path) failed, using $path directly." >&5 3.2630 +$as_echo "$as_me: Resolving DUMPBIN (as $path) failed, using $path directly." >&6;} 3.2631 + new_path="$path" 3.2632 + fi 3.2633 + 3.2634 + if test "x$new_path" = x; then 3.2635 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5 3.2636 $as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;} 3.2637 has_space=`$ECHO "$complete" | $GREP " "` 3.2638 @@ -23023,21 +23267,20 @@ 3.2639 fi 3.2640 as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5 3.2641 fi 3.2642 - fi 3.2643 - fi 3.2644 - 3.2645 - # Now join together the path and the arguments once again 3.2646 - if test "x$arguments" != xEOL; then 3.2647 - new_complete="$new_path ${arguments% *}" 3.2648 - else 3.2649 - new_complete="$new_path" 3.2650 - fi 3.2651 + fi 3.2652 + 3.2653 + # Now join together the path and the arguments once again 3.2654 + if test "x$arguments" != xEOL; then 3.2655 + new_complete="$new_path ${arguments% *}" 3.2656 + else 3.2657 + new_complete="$new_path" 3.2658 + fi 3.2659 3.2660 if test "x$complete" != "x$new_complete"; then 3.2661 - DUMPBIN="$new_complete" 3.2662 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DUMPBIN to \"$new_complete\"" >&5 3.2663 + DUMPBIN="$new_complete" 3.2664 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DUMPBIN to \"$new_complete\"" >&5 3.2665 $as_echo "$as_me: Rewriting DUMPBIN to \"$new_complete\"" >&6;} 3.2666 - fi 3.2667 + fi 3.2668 3.2669 3.2670 COMPILER_TYPE=CL 3.2671 @@ -23059,7 +23302,7 @@ 3.2672 CPP= 3.2673 fi 3.2674 if test -z "$CPP"; then 3.2675 - if test "${ac_cv_prog_CPP+set}" = set; then : 3.2676 + if ${ac_cv_prog_CPP+:} false; then : 3.2677 $as_echo_n "(cached) " >&6 3.2678 else 3.2679 # Double quotes because CPP needs to be expanded 3.2680 @@ -23175,7 +23418,7 @@ 3.2681 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.2682 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.2683 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 3.2684 -See \`config.log' for more details" "$LINENO" 5 ; } 3.2685 +See \`config.log' for more details" "$LINENO" 5; } 3.2686 fi 3.2687 3.2688 ac_ext=cpp 3.2689 @@ -23406,14 +23649,26 @@ 3.2690 tmp="$complete EOL" 3.2691 arguments="${tmp#* }" 3.2692 3.2693 - new_path=`$WHICH $path 2> /dev/null` 3.2694 - if test "x$new_path" = x; then 3.2695 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2696 - if test "x$is_absolute_path" != x; then 3.2697 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CPP (as $path) with 'which' failed, using $path directly." >&5 3.2698 -$as_echo "$as_me: Resolving CPP (as $path) with 'which' failed, using $path directly." >&6;} 3.2699 - new_path="$path" 3.2700 - else 3.2701 + # Cannot rely on the command "which" here since it doesn't always work. 3.2702 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2703 + if test -z "$is_absolute_path"; then 3.2704 + # Path to executable is not absolute. Find it. 3.2705 + IFS_save="$IFS" 3.2706 + IFS=: 3.2707 + for p in $PATH; do 3.2708 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2709 + new_path="$p/$path" 3.2710 + break 3.2711 + fi 3.2712 + done 3.2713 + IFS="$IFS_save" 3.2714 + else 3.2715 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CPP (as $path) failed, using $path directly." >&5 3.2716 +$as_echo "$as_me: Resolving CPP (as $path) failed, using $path directly." >&6;} 3.2717 + new_path="$path" 3.2718 + fi 3.2719 + 3.2720 + if test "x$new_path" = x; then 3.2721 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5 3.2722 $as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;} 3.2723 has_space=`$ECHO "$complete" | $GREP " "` 3.2724 @@ -23423,21 +23678,20 @@ 3.2725 fi 3.2726 as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5 3.2727 fi 3.2728 - fi 3.2729 - fi 3.2730 - 3.2731 - # Now join together the path and the arguments once again 3.2732 - if test "x$arguments" != xEOL; then 3.2733 - new_complete="$new_path ${arguments% *}" 3.2734 - else 3.2735 - new_complete="$new_path" 3.2736 - fi 3.2737 + fi 3.2738 + 3.2739 + # Now join together the path and the arguments once again 3.2740 + if test "x$arguments" != xEOL; then 3.2741 + new_complete="$new_path ${arguments% *}" 3.2742 + else 3.2743 + new_complete="$new_path" 3.2744 + fi 3.2745 3.2746 if test "x$complete" != "x$new_complete"; then 3.2747 - CPP="$new_complete" 3.2748 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CPP to \"$new_complete\"" >&5 3.2749 + CPP="$new_complete" 3.2750 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CPP to \"$new_complete\"" >&5 3.2751 $as_echo "$as_me: Rewriting CPP to \"$new_complete\"" >&6;} 3.2752 - fi 3.2753 + fi 3.2754 3.2755 3.2756 ac_ext=cpp 3.2757 @@ -23448,7 +23702,7 @@ 3.2758 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 3.2759 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } 3.2760 if test -z "$CXXCPP"; then 3.2761 - if test "${ac_cv_prog_CXXCPP+set}" = set; then : 3.2762 + if ${ac_cv_prog_CXXCPP+:} false; then : 3.2763 $as_echo_n "(cached) " >&6 3.2764 else 3.2765 # Double quotes because CXXCPP needs to be expanded 3.2766 @@ -23564,7 +23818,7 @@ 3.2767 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.2768 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.2769 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check 3.2770 -See \`config.log' for more details" "$LINENO" 5 ; } 3.2771 +See \`config.log' for more details" "$LINENO" 5; } 3.2772 fi 3.2773 3.2774 ac_ext=cpp 3.2775 @@ -23795,14 +24049,26 @@ 3.2776 tmp="$complete EOL" 3.2777 arguments="${tmp#* }" 3.2778 3.2779 - new_path=`$WHICH $path 2> /dev/null` 3.2780 - if test "x$new_path" = x; then 3.2781 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2782 - if test "x$is_absolute_path" != x; then 3.2783 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXXCPP (as $path) with 'which' failed, using $path directly." >&5 3.2784 -$as_echo "$as_me: Resolving CXXCPP (as $path) with 'which' failed, using $path directly." >&6;} 3.2785 - new_path="$path" 3.2786 - else 3.2787 + # Cannot rely on the command "which" here since it doesn't always work. 3.2788 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2789 + if test -z "$is_absolute_path"; then 3.2790 + # Path to executable is not absolute. Find it. 3.2791 + IFS_save="$IFS" 3.2792 + IFS=: 3.2793 + for p in $PATH; do 3.2794 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2795 + new_path="$p/$path" 3.2796 + break 3.2797 + fi 3.2798 + done 3.2799 + IFS="$IFS_save" 3.2800 + else 3.2801 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXXCPP (as $path) failed, using $path directly." >&5 3.2802 +$as_echo "$as_me: Resolving CXXCPP (as $path) failed, using $path directly." >&6;} 3.2803 + new_path="$path" 3.2804 + fi 3.2805 + 3.2806 + if test "x$new_path" = x; then 3.2807 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5 3.2808 $as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;} 3.2809 has_space=`$ECHO "$complete" | $GREP " "` 3.2810 @@ -23812,21 +24078,20 @@ 3.2811 fi 3.2812 as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5 3.2813 fi 3.2814 - fi 3.2815 - fi 3.2816 - 3.2817 - # Now join together the path and the arguments once again 3.2818 - if test "x$arguments" != xEOL; then 3.2819 - new_complete="$new_path ${arguments% *}" 3.2820 - else 3.2821 - new_complete="$new_path" 3.2822 - fi 3.2823 + fi 3.2824 + 3.2825 + # Now join together the path and the arguments once again 3.2826 + if test "x$arguments" != xEOL; then 3.2827 + new_complete="$new_path ${arguments% *}" 3.2828 + else 3.2829 + new_complete="$new_path" 3.2830 + fi 3.2831 3.2832 if test "x$complete" != "x$new_complete"; then 3.2833 - CXXCPP="$new_complete" 3.2834 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXXCPP to \"$new_complete\"" >&5 3.2835 + CXXCPP="$new_complete" 3.2836 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXXCPP to \"$new_complete\"" >&5 3.2837 $as_echo "$as_me: Rewriting CXXCPP to \"$new_complete\"" >&6;} 3.2838 - fi 3.2839 + fi 3.2840 3.2841 3.2842 if test "x$COMPILE_TYPE" != "xcross"; then 3.2843 @@ -23855,7 +24120,7 @@ 3.2844 set dummy as; ac_word=$2 3.2845 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2846 $as_echo_n "checking for $ac_word... " >&6; } 3.2847 -if test "${ac_cv_path_AS+set}" = set; then : 3.2848 +if ${ac_cv_path_AS+:} false; then : 3.2849 $as_echo_n "(cached) " >&6 3.2850 else 3.2851 case $AS in 3.2852 @@ -24113,14 +24378,26 @@ 3.2853 tmp="$complete EOL" 3.2854 arguments="${tmp#* }" 3.2855 3.2856 - new_path=`$WHICH $path 2> /dev/null` 3.2857 - if test "x$new_path" = x; then 3.2858 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2859 - if test "x$is_absolute_path" != x; then 3.2860 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AS (as $path) with 'which' failed, using $path directly." >&5 3.2861 -$as_echo "$as_me: Resolving AS (as $path) with 'which' failed, using $path directly." >&6;} 3.2862 - new_path="$path" 3.2863 - else 3.2864 + # Cannot rely on the command "which" here since it doesn't always work. 3.2865 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2866 + if test -z "$is_absolute_path"; then 3.2867 + # Path to executable is not absolute. Find it. 3.2868 + IFS_save="$IFS" 3.2869 + IFS=: 3.2870 + for p in $PATH; do 3.2871 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2872 + new_path="$p/$path" 3.2873 + break 3.2874 + fi 3.2875 + done 3.2876 + IFS="$IFS_save" 3.2877 + else 3.2878 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AS (as $path) failed, using $path directly." >&5 3.2879 +$as_echo "$as_me: Resolving AS (as $path) failed, using $path directly." >&6;} 3.2880 + new_path="$path" 3.2881 + fi 3.2882 + 3.2883 + if test "x$new_path" = x; then 3.2884 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5 3.2885 $as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;} 3.2886 has_space=`$ECHO "$complete" | $GREP " "` 3.2887 @@ -24130,21 +24407,20 @@ 3.2888 fi 3.2889 as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5 3.2890 fi 3.2891 - fi 3.2892 - fi 3.2893 - 3.2894 - # Now join together the path and the arguments once again 3.2895 - if test "x$arguments" != xEOL; then 3.2896 - new_complete="$new_path ${arguments% *}" 3.2897 - else 3.2898 - new_complete="$new_path" 3.2899 - fi 3.2900 + fi 3.2901 + 3.2902 + # Now join together the path and the arguments once again 3.2903 + if test "x$arguments" != xEOL; then 3.2904 + new_complete="$new_path ${arguments% *}" 3.2905 + else 3.2906 + new_complete="$new_path" 3.2907 + fi 3.2908 3.2909 if test "x$complete" != "x$new_complete"; then 3.2910 - AS="$new_complete" 3.2911 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AS to \"$new_complete\"" >&5 3.2912 + AS="$new_complete" 3.2913 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AS to \"$new_complete\"" >&5 3.2914 $as_echo "$as_me: Rewriting AS to \"$new_complete\"" >&6;} 3.2915 - fi 3.2916 + fi 3.2917 3.2918 else 3.2919 AS="$CC -c" 3.2920 @@ -24158,7 +24434,7 @@ 3.2921 set dummy $ac_prog; ac_word=$2 3.2922 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2923 $as_echo_n "checking for $ac_word... " >&6; } 3.2924 -if test "${ac_cv_path_NM+set}" = set; then : 3.2925 +if ${ac_cv_path_NM+:} false; then : 3.2926 $as_echo_n "(cached) " >&6 3.2927 else 3.2928 case $NM in 3.2929 @@ -24419,14 +24695,26 @@ 3.2930 tmp="$complete EOL" 3.2931 arguments="${tmp#* }" 3.2932 3.2933 - new_path=`$WHICH $path 2> /dev/null` 3.2934 - if test "x$new_path" = x; then 3.2935 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2936 - if test "x$is_absolute_path" != x; then 3.2937 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) with 'which' failed, using $path directly." >&5 3.2938 -$as_echo "$as_me: Resolving NM (as $path) with 'which' failed, using $path directly." >&6;} 3.2939 - new_path="$path" 3.2940 - else 3.2941 + # Cannot rely on the command "which" here since it doesn't always work. 3.2942 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.2943 + if test -z "$is_absolute_path"; then 3.2944 + # Path to executable is not absolute. Find it. 3.2945 + IFS_save="$IFS" 3.2946 + IFS=: 3.2947 + for p in $PATH; do 3.2948 + if test -f "$p/$path" && test -x "$p/$path"; then 3.2949 + new_path="$p/$path" 3.2950 + break 3.2951 + fi 3.2952 + done 3.2953 + IFS="$IFS_save" 3.2954 + else 3.2955 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) failed, using $path directly." >&5 3.2956 +$as_echo "$as_me: Resolving NM (as $path) failed, using $path directly." >&6;} 3.2957 + new_path="$path" 3.2958 + fi 3.2959 + 3.2960 + if test "x$new_path" = x; then 3.2961 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5 3.2962 $as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;} 3.2963 has_space=`$ECHO "$complete" | $GREP " "` 3.2964 @@ -24436,27 +24724,26 @@ 3.2965 fi 3.2966 as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5 3.2967 fi 3.2968 - fi 3.2969 - fi 3.2970 - 3.2971 - # Now join together the path and the arguments once again 3.2972 - if test "x$arguments" != xEOL; then 3.2973 - new_complete="$new_path ${arguments% *}" 3.2974 - else 3.2975 - new_complete="$new_path" 3.2976 - fi 3.2977 + fi 3.2978 + 3.2979 + # Now join together the path and the arguments once again 3.2980 + if test "x$arguments" != xEOL; then 3.2981 + new_complete="$new_path ${arguments% *}" 3.2982 + else 3.2983 + new_complete="$new_path" 3.2984 + fi 3.2985 3.2986 if test "x$complete" != "x$new_complete"; then 3.2987 - NM="$new_complete" 3.2988 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5 3.2989 + NM="$new_complete" 3.2990 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5 3.2991 $as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;} 3.2992 - fi 3.2993 + fi 3.2994 3.2995 # Extract the first word of "strip", so it can be a program name with args. 3.2996 set dummy strip; ac_word=$2 3.2997 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.2998 $as_echo_n "checking for $ac_word... " >&6; } 3.2999 -if test "${ac_cv_path_STRIP+set}" = set; then : 3.3000 +if ${ac_cv_path_STRIP+:} false; then : 3.3001 $as_echo_n "(cached) " >&6 3.3002 else 3.3003 case $STRIP in 3.3004 @@ -24714,14 +25001,26 @@ 3.3005 tmp="$complete EOL" 3.3006 arguments="${tmp#* }" 3.3007 3.3008 - new_path=`$WHICH $path 2> /dev/null` 3.3009 - if test "x$new_path" = x; then 3.3010 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3011 - if test "x$is_absolute_path" != x; then 3.3012 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&5 3.3013 -$as_echo "$as_me: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&6;} 3.3014 - new_path="$path" 3.3015 - else 3.3016 + # Cannot rely on the command "which" here since it doesn't always work. 3.3017 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3018 + if test -z "$is_absolute_path"; then 3.3019 + # Path to executable is not absolute. Find it. 3.3020 + IFS_save="$IFS" 3.3021 + IFS=: 3.3022 + for p in $PATH; do 3.3023 + if test -f "$p/$path" && test -x "$p/$path"; then 3.3024 + new_path="$p/$path" 3.3025 + break 3.3026 + fi 3.3027 + done 3.3028 + IFS="$IFS_save" 3.3029 + else 3.3030 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) failed, using $path directly." >&5 3.3031 +$as_echo "$as_me: Resolving STRIP (as $path) failed, using $path directly." >&6;} 3.3032 + new_path="$path" 3.3033 + fi 3.3034 + 3.3035 + if test "x$new_path" = x; then 3.3036 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5 3.3037 $as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;} 3.3038 has_space=`$ECHO "$complete" | $GREP " "` 3.3039 @@ -24731,27 +25030,26 @@ 3.3040 fi 3.3041 as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5 3.3042 fi 3.3043 - fi 3.3044 - fi 3.3045 - 3.3046 - # Now join together the path and the arguments once again 3.3047 - if test "x$arguments" != xEOL; then 3.3048 - new_complete="$new_path ${arguments% *}" 3.3049 - else 3.3050 - new_complete="$new_path" 3.3051 - fi 3.3052 + fi 3.3053 + 3.3054 + # Now join together the path and the arguments once again 3.3055 + if test "x$arguments" != xEOL; then 3.3056 + new_complete="$new_path ${arguments% *}" 3.3057 + else 3.3058 + new_complete="$new_path" 3.3059 + fi 3.3060 3.3061 if test "x$complete" != "x$new_complete"; then 3.3062 - STRIP="$new_complete" 3.3063 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5 3.3064 + STRIP="$new_complete" 3.3065 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5 3.3066 $as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;} 3.3067 - fi 3.3068 + fi 3.3069 3.3070 # Extract the first word of "mcs", so it can be a program name with args. 3.3071 set dummy mcs; ac_word=$2 3.3072 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.3073 $as_echo_n "checking for $ac_word... " >&6; } 3.3074 -if test "${ac_cv_path_MCS+set}" = set; then : 3.3075 +if ${ac_cv_path_MCS+:} false; then : 3.3076 $as_echo_n "(cached) " >&6 3.3077 else 3.3078 case $MCS in 3.3079 @@ -25009,14 +25307,26 @@ 3.3080 tmp="$complete EOL" 3.3081 arguments="${tmp#* }" 3.3082 3.3083 - new_path=`$WHICH $path 2> /dev/null` 3.3084 - if test "x$new_path" = x; then 3.3085 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3086 - if test "x$is_absolute_path" != x; then 3.3087 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MCS (as $path) with 'which' failed, using $path directly." >&5 3.3088 -$as_echo "$as_me: Resolving MCS (as $path) with 'which' failed, using $path directly." >&6;} 3.3089 - new_path="$path" 3.3090 - else 3.3091 + # Cannot rely on the command "which" here since it doesn't always work. 3.3092 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3093 + if test -z "$is_absolute_path"; then 3.3094 + # Path to executable is not absolute. Find it. 3.3095 + IFS_save="$IFS" 3.3096 + IFS=: 3.3097 + for p in $PATH; do 3.3098 + if test -f "$p/$path" && test -x "$p/$path"; then 3.3099 + new_path="$p/$path" 3.3100 + break 3.3101 + fi 3.3102 + done 3.3103 + IFS="$IFS_save" 3.3104 + else 3.3105 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MCS (as $path) failed, using $path directly." >&5 3.3106 +$as_echo "$as_me: Resolving MCS (as $path) failed, using $path directly." >&6;} 3.3107 + new_path="$path" 3.3108 + fi 3.3109 + 3.3110 + if test "x$new_path" = x; then 3.3111 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5 3.3112 $as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;} 3.3113 has_space=`$ECHO "$complete" | $GREP " "` 3.3114 @@ -25026,21 +25336,20 @@ 3.3115 fi 3.3116 as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5 3.3117 fi 3.3118 - fi 3.3119 - fi 3.3120 - 3.3121 - # Now join together the path and the arguments once again 3.3122 - if test "x$arguments" != xEOL; then 3.3123 - new_complete="$new_path ${arguments% *}" 3.3124 - else 3.3125 - new_complete="$new_path" 3.3126 - fi 3.3127 + fi 3.3128 + 3.3129 + # Now join together the path and the arguments once again 3.3130 + if test "x$arguments" != xEOL; then 3.3131 + new_complete="$new_path ${arguments% *}" 3.3132 + else 3.3133 + new_complete="$new_path" 3.3134 + fi 3.3135 3.3136 if test "x$complete" != "x$new_complete"; then 3.3137 - MCS="$new_complete" 3.3138 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5 3.3139 + MCS="$new_complete" 3.3140 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5 3.3141 $as_echo "$as_me: Rewriting MCS to \"$new_complete\"" >&6;} 3.3142 - fi 3.3143 + fi 3.3144 3.3145 elif test "x$OPENJDK_TARGET_OS" != xwindows; then 3.3146 if test -n "$ac_tool_prefix"; then 3.3147 @@ -25048,7 +25357,7 @@ 3.3148 set dummy ${ac_tool_prefix}nm; ac_word=$2 3.3149 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.3150 $as_echo_n "checking for $ac_word... " >&6; } 3.3151 -if test "${ac_cv_prog_NM+set}" = set; then : 3.3152 +if ${ac_cv_prog_NM+:} false; then : 3.3153 $as_echo_n "(cached) " >&6 3.3154 else 3.3155 if test -n "$NM"; then 3.3156 @@ -25088,7 +25397,7 @@ 3.3157 set dummy nm; ac_word=$2 3.3158 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.3159 $as_echo_n "checking for $ac_word... " >&6; } 3.3160 -if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : 3.3161 +if ${ac_cv_prog_ac_ct_NM+:} false; then : 3.3162 $as_echo_n "(cached) " >&6 3.3163 else 3.3164 if test -n "$ac_ct_NM"; then 3.3165 @@ -25357,14 +25666,26 @@ 3.3166 tmp="$complete EOL" 3.3167 arguments="${tmp#* }" 3.3168 3.3169 - new_path=`$WHICH $path 2> /dev/null` 3.3170 - if test "x$new_path" = x; then 3.3171 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3172 - if test "x$is_absolute_path" != x; then 3.3173 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) with 'which' failed, using $path directly." >&5 3.3174 -$as_echo "$as_me: Resolving NM (as $path) with 'which' failed, using $path directly." >&6;} 3.3175 - new_path="$path" 3.3176 - else 3.3177 + # Cannot rely on the command "which" here since it doesn't always work. 3.3178 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3179 + if test -z "$is_absolute_path"; then 3.3180 + # Path to executable is not absolute. Find it. 3.3181 + IFS_save="$IFS" 3.3182 + IFS=: 3.3183 + for p in $PATH; do 3.3184 + if test -f "$p/$path" && test -x "$p/$path"; then 3.3185 + new_path="$p/$path" 3.3186 + break 3.3187 + fi 3.3188 + done 3.3189 + IFS="$IFS_save" 3.3190 + else 3.3191 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) failed, using $path directly." >&5 3.3192 +$as_echo "$as_me: Resolving NM (as $path) failed, using $path directly." >&6;} 3.3193 + new_path="$path" 3.3194 + fi 3.3195 + 3.3196 + if test "x$new_path" = x; then 3.3197 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5 3.3198 $as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;} 3.3199 has_space=`$ECHO "$complete" | $GREP " "` 3.3200 @@ -25374,28 +25695,27 @@ 3.3201 fi 3.3202 as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5 3.3203 fi 3.3204 - fi 3.3205 - fi 3.3206 - 3.3207 - # Now join together the path and the arguments once again 3.3208 - if test "x$arguments" != xEOL; then 3.3209 - new_complete="$new_path ${arguments% *}" 3.3210 - else 3.3211 - new_complete="$new_path" 3.3212 - fi 3.3213 + fi 3.3214 + 3.3215 + # Now join together the path and the arguments once again 3.3216 + if test "x$arguments" != xEOL; then 3.3217 + new_complete="$new_path ${arguments% *}" 3.3218 + else 3.3219 + new_complete="$new_path" 3.3220 + fi 3.3221 3.3222 if test "x$complete" != "x$new_complete"; then 3.3223 - NM="$new_complete" 3.3224 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5 3.3225 + NM="$new_complete" 3.3226 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5 3.3227 $as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;} 3.3228 - fi 3.3229 + fi 3.3230 3.3231 if test -n "$ac_tool_prefix"; then 3.3232 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. 3.3233 set dummy ${ac_tool_prefix}strip; ac_word=$2 3.3234 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.3235 $as_echo_n "checking for $ac_word... " >&6; } 3.3236 -if test "${ac_cv_prog_STRIP+set}" = set; then : 3.3237 +if ${ac_cv_prog_STRIP+:} false; then : 3.3238 $as_echo_n "(cached) " >&6 3.3239 else 3.3240 if test -n "$STRIP"; then 3.3241 @@ -25435,7 +25755,7 @@ 3.3242 set dummy strip; ac_word=$2 3.3243 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.3244 $as_echo_n "checking for $ac_word... " >&6; } 3.3245 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : 3.3246 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : 3.3247 $as_echo_n "(cached) " >&6 3.3248 else 3.3249 if test -n "$ac_ct_STRIP"; then 3.3250 @@ -25704,14 +26024,26 @@ 3.3251 tmp="$complete EOL" 3.3252 arguments="${tmp#* }" 3.3253 3.3254 - new_path=`$WHICH $path 2> /dev/null` 3.3255 - if test "x$new_path" = x; then 3.3256 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3257 - if test "x$is_absolute_path" != x; then 3.3258 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&5 3.3259 -$as_echo "$as_me: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&6;} 3.3260 - new_path="$path" 3.3261 - else 3.3262 + # Cannot rely on the command "which" here since it doesn't always work. 3.3263 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3264 + if test -z "$is_absolute_path"; then 3.3265 + # Path to executable is not absolute. Find it. 3.3266 + IFS_save="$IFS" 3.3267 + IFS=: 3.3268 + for p in $PATH; do 3.3269 + if test -f "$p/$path" && test -x "$p/$path"; then 3.3270 + new_path="$p/$path" 3.3271 + break 3.3272 + fi 3.3273 + done 3.3274 + IFS="$IFS_save" 3.3275 + else 3.3276 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) failed, using $path directly." >&5 3.3277 +$as_echo "$as_me: Resolving STRIP (as $path) failed, using $path directly." >&6;} 3.3278 + new_path="$path" 3.3279 + fi 3.3280 + 3.3281 + if test "x$new_path" = x; then 3.3282 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5 3.3283 $as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;} 3.3284 has_space=`$ECHO "$complete" | $GREP " "` 3.3285 @@ -25721,21 +26053,20 @@ 3.3286 fi 3.3287 as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5 3.3288 fi 3.3289 - fi 3.3290 - fi 3.3291 - 3.3292 - # Now join together the path and the arguments once again 3.3293 - if test "x$arguments" != xEOL; then 3.3294 - new_complete="$new_path ${arguments% *}" 3.3295 - else 3.3296 - new_complete="$new_path" 3.3297 - fi 3.3298 + fi 3.3299 + 3.3300 + # Now join together the path and the arguments once again 3.3301 + if test "x$arguments" != xEOL; then 3.3302 + new_complete="$new_path ${arguments% *}" 3.3303 + else 3.3304 + new_complete="$new_path" 3.3305 + fi 3.3306 3.3307 if test "x$complete" != "x$new_complete"; then 3.3308 - STRIP="$new_complete" 3.3309 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5 3.3310 + STRIP="$new_complete" 3.3311 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5 3.3312 $as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;} 3.3313 - fi 3.3314 + fi 3.3315 3.3316 fi 3.3317 3.3318 @@ -25749,7 +26080,7 @@ 3.3319 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.3320 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.3321 $as_echo_n "checking for $ac_word... " >&6; } 3.3322 -if test "${ac_cv_prog_OBJCOPY+set}" = set; then : 3.3323 +if ${ac_cv_prog_OBJCOPY+:} false; then : 3.3324 $as_echo_n "(cached) " >&6 3.3325 else 3.3326 if test -n "$OBJCOPY"; then 3.3327 @@ -25793,7 +26124,7 @@ 3.3328 set dummy $ac_prog; ac_word=$2 3.3329 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.3330 $as_echo_n "checking for $ac_word... " >&6; } 3.3331 -if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then : 3.3332 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then : 3.3333 $as_echo_n "(cached) " >&6 3.3334 else 3.3335 if test -n "$ac_ct_OBJCOPY"; then 3.3336 @@ -26066,14 +26397,26 @@ 3.3337 tmp="$complete EOL" 3.3338 arguments="${tmp#* }" 3.3339 3.3340 - new_path=`$WHICH $path 2> /dev/null` 3.3341 - if test "x$new_path" = x; then 3.3342 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3343 - if test "x$is_absolute_path" != x; then 3.3344 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJCOPY (as $path) with 'which' failed, using $path directly." >&5 3.3345 -$as_echo "$as_me: Resolving OBJCOPY (as $path) with 'which' failed, using $path directly." >&6;} 3.3346 - new_path="$path" 3.3347 - else 3.3348 + # Cannot rely on the command "which" here since it doesn't always work. 3.3349 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3350 + if test -z "$is_absolute_path"; then 3.3351 + # Path to executable is not absolute. Find it. 3.3352 + IFS_save="$IFS" 3.3353 + IFS=: 3.3354 + for p in $PATH; do 3.3355 + if test -f "$p/$path" && test -x "$p/$path"; then 3.3356 + new_path="$p/$path" 3.3357 + break 3.3358 + fi 3.3359 + done 3.3360 + IFS="$IFS_save" 3.3361 + else 3.3362 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJCOPY (as $path) failed, using $path directly." >&5 3.3363 +$as_echo "$as_me: Resolving OBJCOPY (as $path) failed, using $path directly." >&6;} 3.3364 + new_path="$path" 3.3365 + fi 3.3366 + 3.3367 + if test "x$new_path" = x; then 3.3368 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5 3.3369 $as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;} 3.3370 has_space=`$ECHO "$complete" | $GREP " "` 3.3371 @@ -26083,21 +26426,20 @@ 3.3372 fi 3.3373 as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5 3.3374 fi 3.3375 - fi 3.3376 - fi 3.3377 - 3.3378 - # Now join together the path and the arguments once again 3.3379 - if test "x$arguments" != xEOL; then 3.3380 - new_complete="$new_path ${arguments% *}" 3.3381 - else 3.3382 - new_complete="$new_path" 3.3383 - fi 3.3384 + fi 3.3385 + 3.3386 + # Now join together the path and the arguments once again 3.3387 + if test "x$arguments" != xEOL; then 3.3388 + new_complete="$new_path ${arguments% *}" 3.3389 + else 3.3390 + new_complete="$new_path" 3.3391 + fi 3.3392 3.3393 if test "x$complete" != "x$new_complete"; then 3.3394 - OBJCOPY="$new_complete" 3.3395 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJCOPY to \"$new_complete\"" >&5 3.3396 + OBJCOPY="$new_complete" 3.3397 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJCOPY to \"$new_complete\"" >&5 3.3398 $as_echo "$as_me: Rewriting OBJCOPY to \"$new_complete\"" >&6;} 3.3399 - fi 3.3400 + fi 3.3401 3.3402 fi 3.3403 fi 3.3404 @@ -26109,7 +26451,7 @@ 3.3405 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.3406 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.3407 $as_echo_n "checking for $ac_word... " >&6; } 3.3408 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : 3.3409 +if ${ac_cv_prog_OBJDUMP+:} false; then : 3.3410 $as_echo_n "(cached) " >&6 3.3411 else 3.3412 if test -n "$OBJDUMP"; then 3.3413 @@ -26153,7 +26495,7 @@ 3.3414 set dummy $ac_prog; ac_word=$2 3.3415 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.3416 $as_echo_n "checking for $ac_word... " >&6; } 3.3417 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : 3.3418 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : 3.3419 $as_echo_n "(cached) " >&6 3.3420 else 3.3421 if test -n "$ac_ct_OBJDUMP"; then 3.3422 @@ -26426,14 +26768,26 @@ 3.3423 tmp="$complete EOL" 3.3424 arguments="${tmp#* }" 3.3425 3.3426 - new_path=`$WHICH $path 2> /dev/null` 3.3427 - if test "x$new_path" = x; then 3.3428 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3429 - if test "x$is_absolute_path" != x; then 3.3430 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJDUMP (as $path) with 'which' failed, using $path directly." >&5 3.3431 -$as_echo "$as_me: Resolving OBJDUMP (as $path) with 'which' failed, using $path directly." >&6;} 3.3432 - new_path="$path" 3.3433 - else 3.3434 + # Cannot rely on the command "which" here since it doesn't always work. 3.3435 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3436 + if test -z "$is_absolute_path"; then 3.3437 + # Path to executable is not absolute. Find it. 3.3438 + IFS_save="$IFS" 3.3439 + IFS=: 3.3440 + for p in $PATH; do 3.3441 + if test -f "$p/$path" && test -x "$p/$path"; then 3.3442 + new_path="$p/$path" 3.3443 + break 3.3444 + fi 3.3445 + done 3.3446 + IFS="$IFS_save" 3.3447 + else 3.3448 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJDUMP (as $path) failed, using $path directly." >&5 3.3449 +$as_echo "$as_me: Resolving OBJDUMP (as $path) failed, using $path directly." >&6;} 3.3450 + new_path="$path" 3.3451 + fi 3.3452 + 3.3453 + if test "x$new_path" = x; then 3.3454 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5 3.3455 $as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;} 3.3456 has_space=`$ECHO "$complete" | $GREP " "` 3.3457 @@ -26443,21 +26797,20 @@ 3.3458 fi 3.3459 as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5 3.3460 fi 3.3461 - fi 3.3462 - fi 3.3463 - 3.3464 - # Now join together the path and the arguments once again 3.3465 - if test "x$arguments" != xEOL; then 3.3466 - new_complete="$new_path ${arguments% *}" 3.3467 - else 3.3468 - new_complete="$new_path" 3.3469 - fi 3.3470 + fi 3.3471 + 3.3472 + # Now join together the path and the arguments once again 3.3473 + if test "x$arguments" != xEOL; then 3.3474 + new_complete="$new_path ${arguments% *}" 3.3475 + else 3.3476 + new_complete="$new_path" 3.3477 + fi 3.3478 3.3479 if test "x$complete" != "x$new_complete"; then 3.3480 - OBJDUMP="$new_complete" 3.3481 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJDUMP to \"$new_complete\"" >&5 3.3482 + OBJDUMP="$new_complete" 3.3483 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJDUMP to \"$new_complete\"" >&5 3.3484 $as_echo "$as_me: Rewriting OBJDUMP to \"$new_complete\"" >&6;} 3.3485 - fi 3.3486 + fi 3.3487 3.3488 fi 3.3489 3.3490 @@ -26466,7 +26819,7 @@ 3.3491 set dummy lipo; ac_word=$2 3.3492 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.3493 $as_echo_n "checking for $ac_word... " >&6; } 3.3494 -if test "${ac_cv_path_LIPO+set}" = set; then : 3.3495 +if ${ac_cv_path_LIPO+:} false; then : 3.3496 $as_echo_n "(cached) " >&6 3.3497 else 3.3498 case $LIPO in 3.3499 @@ -26724,14 +27077,26 @@ 3.3500 tmp="$complete EOL" 3.3501 arguments="${tmp#* }" 3.3502 3.3503 - new_path=`$WHICH $path 2> /dev/null` 3.3504 - if test "x$new_path" = x; then 3.3505 - is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3506 - if test "x$is_absolute_path" != x; then 3.3507 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving LIPO (as $path) with 'which' failed, using $path directly." >&5 3.3508 -$as_echo "$as_me: Resolving LIPO (as $path) with 'which' failed, using $path directly." >&6;} 3.3509 - new_path="$path" 3.3510 - else 3.3511 + # Cannot rely on the command "which" here since it doesn't always work. 3.3512 + is_absolute_path=`$ECHO "$path" | $GREP ^/` 3.3513 + if test -z "$is_absolute_path"; then 3.3514 + # Path to executable is not absolute. Find it. 3.3515 + IFS_save="$IFS" 3.3516 + IFS=: 3.3517 + for p in $PATH; do 3.3518 + if test -f "$p/$path" && test -x "$p/$path"; then 3.3519 + new_path="$p/$path" 3.3520 + break 3.3521 + fi 3.3522 + done 3.3523 + IFS="$IFS_save" 3.3524 + else 3.3525 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving LIPO (as $path) failed, using $path directly." >&5 3.3526 +$as_echo "$as_me: Resolving LIPO (as $path) failed, using $path directly." >&6;} 3.3527 + new_path="$path" 3.3528 + fi 3.3529 + 3.3530 + if test "x$new_path" = x; then 3.3531 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5 3.3532 $as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;} 3.3533 has_space=`$ECHO "$complete" | $GREP " "` 3.3534 @@ -26741,21 +27106,20 @@ 3.3535 fi 3.3536 as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5 3.3537 fi 3.3538 - fi 3.3539 - fi 3.3540 - 3.3541 - # Now join together the path and the arguments once again 3.3542 - if test "x$arguments" != xEOL; then 3.3543 - new_complete="$new_path ${arguments% *}" 3.3544 - else 3.3545 - new_complete="$new_path" 3.3546 - fi 3.3547 + fi 3.3548 + 3.3549 + # Now join together the path and the arguments once again 3.3550 + if test "x$arguments" != xEOL; then 3.3551 + new_complete="$new_path ${arguments% *}" 3.3552 + else 3.3553 + new_complete="$new_path" 3.3554 + fi 3.3555 3.3556 if test "x$complete" != "x$new_complete"; then 3.3557 - LIPO="$new_complete" 3.3558 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting LIPO to \"$new_complete\"" >&5 3.3559 + LIPO="$new_complete" 3.3560 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting LIPO to \"$new_complete\"" >&5 3.3561 $as_echo "$as_me: Rewriting LIPO to \"$new_complete\"" >&6;} 3.3562 - fi 3.3563 + fi 3.3564 3.3565 fi 3.3566 3.3567 @@ -26770,7 +27134,7 @@ 3.3568 3.3569 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 3.3570 $as_echo_n "checking for ANSI C header files... " >&6; } 3.3571 -if test "${ac_cv_header_stdc+set}" = set; then : 3.3572 +if ${ac_cv_header_stdc+:} false; then : 3.3573 $as_echo_n "(cached) " >&6 3.3574 else 3.3575 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.3576 @@ -26946,7 +27310,7 @@ 3.3577 for ac_header in stdio.h 3.3578 do : 3.3579 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" 3.3580 -if test "x$ac_cv_header_stdio_h" = x""yes; then : 3.3581 +if test "x$ac_cv_header_stdio_h" = xyes; then : 3.3582 cat >>confdefs.h <<_ACEOF 3.3583 #define HAVE_STDIO_H 1 3.3584 _ACEOF 3.3585 @@ -26975,7 +27339,7 @@ 3.3586 # This bug is HP SR number 8606223364. 3.3587 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 3.3588 $as_echo_n "checking size of int *... " >&6; } 3.3589 -if test "${ac_cv_sizeof_int_p+set}" = set; then : 3.3590 +if ${ac_cv_sizeof_int_p+:} false; then : 3.3591 $as_echo_n "(cached) " >&6 3.3592 else 3.3593 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : 3.3594 @@ -26985,7 +27349,7 @@ 3.3595 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.3596 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.3597 as_fn_error 77 "cannot compute sizeof (int *) 3.3598 -See \`config.log' for more details" "$LINENO" 5 ; } 3.3599 +See \`config.log' for more details" "$LINENO" 5; } 3.3600 else 3.3601 ac_cv_sizeof_int_p=0 3.3602 fi 3.3603 @@ -27032,7 +27396,7 @@ 3.3604 # 3.3605 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 3.3606 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } 3.3607 -if test "${ac_cv_c_bigendian+set}" = set; then : 3.3608 +if ${ac_cv_c_bigendian+:} false; then : 3.3609 $as_echo_n "(cached) " >&6 3.3610 else 3.3611 ac_cv_c_bigendian=unknown 3.3612 @@ -27764,11 +28128,14 @@ 3.3613 3.3614 # On some platforms (mac) the linker warns about non existing -L dirs. 3.3615 # Add server first if available. Linking aginst client does not always produce the same results. 3.3616 - # Only add client dir if client is being built. Default to server for other variants. 3.3617 + # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1. 3.3618 + # Default to server for other variants. 3.3619 if test "x$JVM_VARIANT_SERVER" = xtrue; then 3.3620 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" 3.3621 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then 3.3622 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client" 3.3623 + elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 3.3624 + LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal" 3.3625 else 3.3626 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" 3.3627 fi 3.3628 @@ -28029,8 +28396,8 @@ 3.3629 have_x=disabled 3.3630 else 3.3631 case $x_includes,$x_libraries in #( 3.3632 - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( 3.3633 - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : 3.3634 + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( 3.3635 + *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : 3.3636 $as_echo_n "(cached) " >&6 3.3637 else 3.3638 # One or both of the vars are not set, and there is no cached value. 3.3639 @@ -28307,7 +28674,7 @@ 3.3640 else 3.3641 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 3.3642 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } 3.3643 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : 3.3644 +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : 3.3645 $as_echo_n "(cached) " >&6 3.3646 else 3.3647 ac_check_lib_save_LIBS=$LIBS 3.3648 @@ -28341,14 +28708,14 @@ 3.3649 fi 3.3650 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 3.3651 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } 3.3652 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : 3.3653 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : 3.3654 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 3.3655 fi 3.3656 3.3657 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 3.3658 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 3.3659 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } 3.3660 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : 3.3661 +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : 3.3662 $as_echo_n "(cached) " >&6 3.3663 else 3.3664 ac_check_lib_save_LIBS=$LIBS 3.3665 @@ -28382,7 +28749,7 @@ 3.3666 fi 3.3667 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 3.3668 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } 3.3669 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : 3.3670 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : 3.3671 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 3.3672 fi 3.3673 3.3674 @@ -28401,14 +28768,14 @@ 3.3675 # The functions gethostbyname, getservbyname, and inet_addr are 3.3676 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. 3.3677 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" 3.3678 -if test "x$ac_cv_func_gethostbyname" = x""yes; then : 3.3679 +if test "x$ac_cv_func_gethostbyname" = xyes; then : 3.3680 3.3681 fi 3.3682 3.3683 if test $ac_cv_func_gethostbyname = no; then 3.3684 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 3.3685 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } 3.3686 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : 3.3687 +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : 3.3688 $as_echo_n "(cached) " >&6 3.3689 else 3.3690 ac_check_lib_save_LIBS=$LIBS 3.3691 @@ -28442,14 +28809,14 @@ 3.3692 fi 3.3693 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 3.3694 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } 3.3695 -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : 3.3696 +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : 3.3697 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 3.3698 fi 3.3699 3.3700 if test $ac_cv_lib_nsl_gethostbyname = no; then 3.3701 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 3.3702 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } 3.3703 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : 3.3704 +if ${ac_cv_lib_bsd_gethostbyname+:} false; then : 3.3705 $as_echo_n "(cached) " >&6 3.3706 else 3.3707 ac_check_lib_save_LIBS=$LIBS 3.3708 @@ -28483,7 +28850,7 @@ 3.3709 fi 3.3710 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 3.3711 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } 3.3712 -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : 3.3713 +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : 3.3714 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" 3.3715 fi 3.3716 3.3717 @@ -28498,14 +28865,14 @@ 3.3718 # must be given before -lnsl if both are needed. We assume that 3.3719 # if connect needs -lnsl, so does gethostbyname. 3.3720 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect" 3.3721 -if test "x$ac_cv_func_connect" = x""yes; then : 3.3722 +if test "x$ac_cv_func_connect" = xyes; then : 3.3723 3.3724 fi 3.3725 3.3726 if test $ac_cv_func_connect = no; then 3.3727 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 3.3728 $as_echo_n "checking for connect in -lsocket... " >&6; } 3.3729 -if test "${ac_cv_lib_socket_connect+set}" = set; then : 3.3730 +if ${ac_cv_lib_socket_connect+:} false; then : 3.3731 $as_echo_n "(cached) " >&6 3.3732 else 3.3733 ac_check_lib_save_LIBS=$LIBS 3.3734 @@ -28539,7 +28906,7 @@ 3.3735 fi 3.3736 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 3.3737 $as_echo "$ac_cv_lib_socket_connect" >&6; } 3.3738 -if test "x$ac_cv_lib_socket_connect" = x""yes; then : 3.3739 +if test "x$ac_cv_lib_socket_connect" = xyes; then : 3.3740 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 3.3741 fi 3.3742 3.3743 @@ -28547,14 +28914,14 @@ 3.3744 3.3745 # Guillermo Gomez says -lposix is necessary on A/UX. 3.3746 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove" 3.3747 -if test "x$ac_cv_func_remove" = x""yes; then : 3.3748 +if test "x$ac_cv_func_remove" = xyes; then : 3.3749 3.3750 fi 3.3751 3.3752 if test $ac_cv_func_remove = no; then 3.3753 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 3.3754 $as_echo_n "checking for remove in -lposix... " >&6; } 3.3755 -if test "${ac_cv_lib_posix_remove+set}" = set; then : 3.3756 +if ${ac_cv_lib_posix_remove+:} false; then : 3.3757 $as_echo_n "(cached) " >&6 3.3758 else 3.3759 ac_check_lib_save_LIBS=$LIBS 3.3760 @@ -28588,7 +28955,7 @@ 3.3761 fi 3.3762 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 3.3763 $as_echo "$ac_cv_lib_posix_remove" >&6; } 3.3764 -if test "x$ac_cv_lib_posix_remove" = x""yes; then : 3.3765 +if test "x$ac_cv_lib_posix_remove" = xyes; then : 3.3766 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 3.3767 fi 3.3768 3.3769 @@ -28596,14 +28963,14 @@ 3.3770 3.3771 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 3.3772 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat" 3.3773 -if test "x$ac_cv_func_shmat" = x""yes; then : 3.3774 +if test "x$ac_cv_func_shmat" = xyes; then : 3.3775 3.3776 fi 3.3777 3.3778 if test $ac_cv_func_shmat = no; then 3.3779 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 3.3780 $as_echo_n "checking for shmat in -lipc... " >&6; } 3.3781 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then : 3.3782 +if ${ac_cv_lib_ipc_shmat+:} false; then : 3.3783 $as_echo_n "(cached) " >&6 3.3784 else 3.3785 ac_check_lib_save_LIBS=$LIBS 3.3786 @@ -28637,7 +29004,7 @@ 3.3787 fi 3.3788 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 3.3789 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } 3.3790 -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : 3.3791 +if test "x$ac_cv_lib_ipc_shmat" = xyes; then : 3.3792 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 3.3793 fi 3.3794 3.3795 @@ -28655,7 +29022,7 @@ 3.3796 # John Interrante, Karl Berry 3.3797 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 3.3798 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } 3.3799 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : 3.3800 +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : 3.3801 $as_echo_n "(cached) " >&6 3.3802 else 3.3803 ac_check_lib_save_LIBS=$LIBS 3.3804 @@ -28689,7 +29056,7 @@ 3.3805 fi 3.3806 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 3.3807 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } 3.3808 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : 3.3809 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : 3.3810 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 3.3811 fi 3.3812 3.3813 @@ -29696,7 +30063,7 @@ 3.3814 LDFLAGS="$FREETYPE2_LIBS" 3.3815 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 3.3816 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } 3.3817 -if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then : 3.3818 +if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then : 3.3819 $as_echo_n "(cached) " >&6 3.3820 else 3.3821 ac_check_lib_save_LIBS=$LIBS 3.3822 @@ -29730,7 +30097,7 @@ 3.3823 fi 3.3824 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 3.3825 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } 3.3826 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then : 3.3827 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : 3.3828 FREETYPE2_FOUND=true 3.3829 else 3.3830 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 3.3831 @@ -30018,7 +30385,7 @@ 3.3832 for ac_header in alsa/asoundlib.h 3.3833 do : 3.3834 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" 3.3835 -if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then : 3.3836 +if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then : 3.3837 cat >>confdefs.h <<_ACEOF 3.3838 #define HAVE_ALSA_ASOUNDLIB_H 1 3.3839 _ACEOF 3.3840 @@ -30077,7 +30444,7 @@ 3.3841 USE_EXTERNAL_LIBJPEG=true 3.3842 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5 3.3843 $as_echo_n "checking for main in -ljpeg... " >&6; } 3.3844 -if test "${ac_cv_lib_jpeg_main+set}" = set; then : 3.3845 +if ${ac_cv_lib_jpeg_main+:} false; then : 3.3846 $as_echo_n "(cached) " >&6 3.3847 else 3.3848 ac_check_lib_save_LIBS=$LIBS 3.3849 @@ -30105,7 +30472,7 @@ 3.3850 fi 3.3851 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5 3.3852 $as_echo "$ac_cv_lib_jpeg_main" >&6; } 3.3853 -if test "x$ac_cv_lib_jpeg_main" = x""yes; then : 3.3854 +if test "x$ac_cv_lib_jpeg_main" = xyes; then : 3.3855 cat >>confdefs.h <<_ACEOF 3.3856 #define HAVE_LIBJPEG 1 3.3857 _ACEOF 3.3858 @@ -30129,7 +30496,7 @@ 3.3859 USE_EXTERNAL_LIBJPEG=true 3.3860 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5 3.3861 $as_echo_n "checking for main in -lgif... " >&6; } 3.3862 -if test "${ac_cv_lib_gif_main+set}" = set; then : 3.3863 +if ${ac_cv_lib_gif_main+:} false; then : 3.3864 $as_echo_n "(cached) " >&6 3.3865 else 3.3866 ac_check_lib_save_LIBS=$LIBS 3.3867 @@ -30157,7 +30524,7 @@ 3.3868 fi 3.3869 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5 3.3870 $as_echo "$ac_cv_lib_gif_main" >&6; } 3.3871 -if test "x$ac_cv_lib_gif_main" = x""yes; then : 3.3872 +if test "x$ac_cv_lib_gif_main" = xyes; then : 3.3873 cat >>confdefs.h <<_ACEOF 3.3874 #define HAVE_LIBGIF 1 3.3875 _ACEOF 3.3876 @@ -30187,7 +30554,7 @@ 3.3877 3.3878 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 3.3879 $as_echo_n "checking for compress in -lz... " >&6; } 3.3880 -if test "${ac_cv_lib_z_compress+set}" = set; then : 3.3881 +if ${ac_cv_lib_z_compress+:} false; then : 3.3882 $as_echo_n "(cached) " >&6 3.3883 else 3.3884 ac_check_lib_save_LIBS=$LIBS 3.3885 @@ -30221,7 +30588,7 @@ 3.3886 fi 3.3887 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 3.3888 $as_echo "$ac_cv_lib_z_compress" >&6; } 3.3889 -if test "x$ac_cv_lib_z_compress" = x""yes; then : 3.3890 +if test "x$ac_cv_lib_z_compress" = xyes; then : 3.3891 ZLIB_FOUND=yes 3.3892 else 3.3893 ZLIB_FOUND=no 3.3894 @@ -30314,7 +30681,7 @@ 3.3895 3.3896 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 3.3897 $as_echo_n "checking for cos in -lm... " >&6; } 3.3898 -if test "${ac_cv_lib_m_cos+set}" = set; then : 3.3899 +if ${ac_cv_lib_m_cos+:} false; then : 3.3900 $as_echo_n "(cached) " >&6 3.3901 else 3.3902 ac_check_lib_save_LIBS=$LIBS 3.3903 @@ -30348,7 +30715,7 @@ 3.3904 fi 3.3905 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 3.3906 $as_echo "$ac_cv_lib_m_cos" >&6; } 3.3907 -if test "x$ac_cv_lib_m_cos" = x""yes; then : 3.3908 +if test "x$ac_cv_lib_m_cos" = xyes; then : 3.3909 cat >>confdefs.h <<_ACEOF 3.3910 #define HAVE_LIBM 1 3.3911 _ACEOF 3.3912 @@ -30372,7 +30739,7 @@ 3.3913 LIBS="" 3.3914 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 3.3915 $as_echo_n "checking for dlopen in -ldl... " >&6; } 3.3916 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : 3.3917 +if ${ac_cv_lib_dl_dlopen+:} false; then : 3.3918 $as_echo_n "(cached) " >&6 3.3919 else 3.3920 ac_check_lib_save_LIBS=$LIBS 3.3921 @@ -30406,7 +30773,7 @@ 3.3922 fi 3.3923 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 3.3924 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } 3.3925 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : 3.3926 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : 3.3927 cat >>confdefs.h <<_ACEOF 3.3928 #define HAVE_LIBDL 1 3.3929 _ACEOF 3.3930 @@ -31050,7 +31417,7 @@ 3.3931 set dummy ccache; ac_word=$2 3.3932 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.3933 $as_echo_n "checking for $ac_word... " >&6; } 3.3934 -if test "${ac_cv_path_CCACHE+set}" = set; then : 3.3935 +if ${ac_cv_path_CCACHE+:} false; then : 3.3936 $as_echo_n "(cached) " >&6 3.3937 else 3.3938 case $CCACHE in 3.3939 @@ -31301,10 +31668,21 @@ 3.3940 :end' >>confcache 3.3941 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 3.3942 if test -w "$cache_file"; then 3.3943 - test "x$cache_file" != "x/dev/null" && 3.3944 + if test "x$cache_file" != "x/dev/null"; then 3.3945 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 3.3946 $as_echo "$as_me: updating cache $cache_file" >&6;} 3.3947 - cat confcache >$cache_file 3.3948 + if test ! -f "$cache_file" || test -h "$cache_file"; then 3.3949 + cat confcache >"$cache_file" 3.3950 + else 3.3951 + case $cache_file in #( 3.3952 + */* | ?:*) 3.3953 + mv -f confcache "$cache_file"$$ && 3.3954 + mv -f "$cache_file"$$ "$cache_file" ;; #( 3.3955 + *) 3.3956 + mv -f confcache "$cache_file" ;; 3.3957 + esac 3.3958 + fi 3.3959 + fi 3.3960 else 3.3961 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 3.3962 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 3.3963 @@ -31336,7 +31714,7 @@ 3.3964 3.3965 3.3966 3.3967 -: ${CONFIG_STATUS=./config.status} 3.3968 +: "${CONFIG_STATUS=./config.status}" 3.3969 ac_write_fail=0 3.3970 ac_clean_files_save=$ac_clean_files 3.3971 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 3.3972 @@ -31437,6 +31815,7 @@ 3.3973 IFS=" "" $as_nl" 3.3974 3.3975 # Find who we are. Look in the path if we contain no directory separator. 3.3976 +as_myself= 3.3977 case $0 in #(( 3.3978 *[\\/]* ) as_myself=$0 ;; 3.3979 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.3980 @@ -31744,7 +32123,7 @@ 3.3981 # values after options handling. 3.3982 ac_log=" 3.3983 This file was extended by OpenJDK $as_me jdk8, which was 3.3984 -generated by GNU Autoconf 2.67. Invocation command line was 3.3985 +generated by GNU Autoconf 2.68. Invocation command line was 3.3986 3.3987 CONFIG_FILES = $CONFIG_FILES 3.3988 CONFIG_HEADERS = $CONFIG_HEADERS 3.3989 @@ -31807,7 +32186,7 @@ 3.3990 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 3.3991 ac_cs_version="\\ 3.3992 OpenJDK config.status jdk8 3.3993 -configured by $0, generated by GNU Autoconf 2.67, 3.3994 +configured by $0, generated by GNU Autoconf 2.68, 3.3995 with options \\"\$ac_cs_config\\" 3.3996 3.3997 Copyright (C) 2010 Free Software Foundation, Inc. 3.3998 @@ -31936,7 +32315,7 @@ 3.3999 "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;; 3.4000 "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;; 3.4001 3.4002 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 3.4003 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 3.4004 esac 3.4005 done 3.4006 3.4007 @@ -31958,9 +32337,10 @@ 3.4008 # after its creation but before its name has been assigned to `$tmp'. 3.4009 $debug || 3.4010 { 3.4011 - tmp= 3.4012 + tmp= ac_tmp= 3.4013 trap 'exit_status=$? 3.4014 - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 3.4015 + : "${ac_tmp:=$tmp}" 3.4016 + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 3.4017 ' 0 3.4018 trap 'as_fn_exit 1' 1 2 13 15 3.4019 } 3.4020 @@ -31968,12 +32348,13 @@ 3.4021 3.4022 { 3.4023 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 3.4024 - test -n "$tmp" && test -d "$tmp" 3.4025 + test -d "$tmp" 3.4026 } || 3.4027 { 3.4028 tmp=./conf$$-$RANDOM 3.4029 (umask 077 && mkdir "$tmp") 3.4030 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 3.4031 +ac_tmp=$tmp 3.4032 3.4033 # Set up the scripts for CONFIG_FILES section. 3.4034 # No need to generate them if there are no CONFIG_FILES. 3.4035 @@ -31995,7 +32376,7 @@ 3.4036 ac_cs_awk_cr=$ac_cr 3.4037 fi 3.4038 3.4039 -echo 'BEGIN {' >"$tmp/subs1.awk" && 3.4040 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 3.4041 _ACEOF 3.4042 3.4043 3.4044 @@ -32023,7 +32404,7 @@ 3.4045 rm -f conf$$subs.sh 3.4046 3.4047 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 3.4048 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 3.4049 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 3.4050 _ACEOF 3.4051 sed -n ' 3.4052 h 3.4053 @@ -32071,7 +32452,7 @@ 3.4054 rm -f conf$$subs.awk 3.4055 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 3.4056 _ACAWK 3.4057 -cat >>"\$tmp/subs1.awk" <<_ACAWK && 3.4058 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 3.4059 for (key in S) S_is_set[key] = 1 3.4060 FS = "" 3.4061 3.4062 @@ -32103,7 +32484,7 @@ 3.4063 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 3.4064 else 3.4065 cat 3.4066 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 3.4067 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 3.4068 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 3.4069 _ACEOF 3.4070 3.4071 @@ -32137,7 +32518,7 @@ 3.4072 # No need to generate them if there are no CONFIG_HEADERS. 3.4073 # This happens for instance with `./config.status Makefile'. 3.4074 if test -n "$CONFIG_HEADERS"; then 3.4075 -cat >"$tmp/defines.awk" <<\_ACAWK || 3.4076 +cat >"$ac_tmp/defines.awk" <<\_ACAWK || 3.4077 BEGIN { 3.4078 _ACEOF 3.4079 3.4080 @@ -32149,8 +32530,8 @@ 3.4081 # handling of long lines. 3.4082 ac_delim='%!_!# ' 3.4083 for ac_last_try in false false :; do 3.4084 - ac_t=`sed -n "/$ac_delim/p" confdefs.h` 3.4085 - if test -z "$ac_t"; then 3.4086 + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 3.4087 + if test -z "$ac_tt"; then 3.4088 break 3.4089 elif $ac_last_try; then 3.4090 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 3.4091 @@ -32251,7 +32632,7 @@ 3.4092 esac 3.4093 case $ac_mode$ac_tag in 3.4094 :[FHL]*:*);; 3.4095 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 3.4096 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 3.4097 :[FH]-) ac_tag=-:-;; 3.4098 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 3.4099 esac 3.4100 @@ -32270,7 +32651,7 @@ 3.4101 for ac_f 3.4102 do 3.4103 case $ac_f in 3.4104 - -) ac_f="$tmp/stdin";; 3.4105 + -) ac_f="$ac_tmp/stdin";; 3.4106 *) # Look for the file first in the build tree, then in the source tree 3.4107 # (if the path is not absolute). The absolute path cannot be DOS-style, 3.4108 # because $ac_f cannot contain `:'. 3.4109 @@ -32279,7 +32660,7 @@ 3.4110 [\\/$]*) false;; 3.4111 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 3.4112 esac || 3.4113 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 3.4114 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 3.4115 esac 3.4116 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 3.4117 as_fn_append ac_file_inputs " '$ac_f'" 3.4118 @@ -32305,8 +32686,8 @@ 3.4119 esac 3.4120 3.4121 case $ac_tag in 3.4122 - *:-:* | *:-) cat >"$tmp/stdin" \ 3.4123 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 3.4124 + *:-:* | *:-) cat >"$ac_tmp/stdin" \ 3.4125 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 3.4126 esac 3.4127 ;; 3.4128 esac 3.4129 @@ -32431,21 +32812,22 @@ 3.4130 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t 3.4131 $ac_datarootdir_hack 3.4132 " 3.4133 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 3.4134 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 3.4135 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ 3.4136 + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 3.4137 3.4138 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 3.4139 - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 3.4140 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 3.4141 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 3.4142 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 3.4143 + "$ac_tmp/out"`; test -z "$ac_out"; } && 3.4144 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 3.4145 which seems to be undefined. Please make sure it is defined" >&5 3.4146 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 3.4147 which seems to be undefined. Please make sure it is defined" >&2;} 3.4148 3.4149 - rm -f "$tmp/stdin" 3.4150 + rm -f "$ac_tmp/stdin" 3.4151 case $ac_file in 3.4152 - -) cat "$tmp/out" && rm -f "$tmp/out";; 3.4153 - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 3.4154 + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 3.4155 + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 3.4156 esac \ 3.4157 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 3.4158 ;; 3.4159 @@ -32456,20 +32838,20 @@ 3.4160 if test x"$ac_file" != x-; then 3.4161 { 3.4162 $as_echo "/* $configure_input */" \ 3.4163 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 3.4164 - } >"$tmp/config.h" \ 3.4165 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 3.4166 + } >"$ac_tmp/config.h" \ 3.4167 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 3.4168 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 3.4169 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 3.4170 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 3.4171 $as_echo "$as_me: $ac_file is unchanged" >&6;} 3.4172 else 3.4173 rm -f "$ac_file" 3.4174 - mv "$tmp/config.h" "$ac_file" \ 3.4175 + mv "$ac_tmp/config.h" "$ac_file" \ 3.4176 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 3.4177 fi 3.4178 else 3.4179 $as_echo "/* $configure_input */" \ 3.4180 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 3.4181 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 3.4182 || as_fn_error $? "could not create -" "$LINENO" 5 3.4183 fi 3.4184 ;;
4.1 --- a/common/autoconf/jdk-options.m4 Fri Dec 28 22:20:53 2012 -0800 4.2 +++ b/common/autoconf/jdk-options.m4 Tue Jan 01 12:47:16 2013 -0800 4.3 @@ -60,28 +60,30 @@ 4.4 # Currently we have: 4.5 # server: normal interpreter and a tiered C1/C2 compiler 4.6 # client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms) 4.7 +# minimal1: reduced form of client with optional VM services and features stripped out 4.8 # kernel: kernel footprint JVM that passes the TCK without major performance problems, 4.9 # ie normal interpreter and C1, only the serial GC, kernel jvmti etc 4.10 # zero: no machine code interpreter, no compiler 4.11 # zeroshark: zero interpreter and shark/llvm compiler backend 4.12 AC_MSG_CHECKING([which variants of the JVM to build]) 4.13 AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants], 4.14 - [JVM variants (separated by commas) to build (server, client, kernel, zero, zeroshark) @<:@server@:>@])]) 4.15 + [JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark) @<:@server@:>@])]) 4.16 4.17 if test "x$with_jvm_variants" = x; then 4.18 with_jvm_variants="server" 4.19 fi 4.20 4.21 JVM_VARIANTS=",$with_jvm_variants," 4.22 -TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'` 4.23 +TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'` 4.24 4.25 if test "x$TEST_VARIANTS" != "x,"; then 4.26 - AC_MSG_ERROR([The available JVM variants are: server, client, kernel, zero, zeroshark]) 4.27 + AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark]) 4.28 fi 4.29 AC_MSG_RESULT([$with_jvm_variants]) 4.30 4.31 JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'` 4.32 JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'` 4.33 +JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'` 4.34 JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'` 4.35 JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'` 4.36 JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` 4.37 @@ -96,10 +98,15 @@ 4.38 AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.]) 4.39 fi 4.40 fi 4.41 +if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 4.42 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 4.43 + AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.]) 4.44 + fi 4.45 +fi 4.46 4.47 # Replace the commas with AND for use in the build directory name. 4.48 ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` 4.49 -COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'` 4.50 +COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'` 4.51 if test "x$COUNT_VARIANTS" != "x,1"; then 4.52 BUILDING_MULTIPLE_JVM_VARIANTS=yes 4.53 else 4.54 @@ -109,6 +116,7 @@ 4.55 AC_SUBST(JVM_VARIANTS) 4.56 AC_SUBST(JVM_VARIANT_SERVER) 4.57 AC_SUBST(JVM_VARIANT_CLIENT) 4.58 +AC_SUBST(JVM_VARIANT_MINIMAL1) 4.59 AC_SUBST(JVM_VARIANT_KERNEL) 4.60 AC_SUBST(JVM_VARIANT_ZERO) 4.61 AC_SUBST(JVM_VARIANT_ZEROSHARK) 4.62 @@ -191,7 +199,9 @@ 4.63 ##### 4.64 # Generate the legacy makefile targets for hotspot. 4.65 # The hotspot api for selecting the build artifacts, really, needs to be improved. 4.66 -# 4.67 +# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to 4.68 +# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc 4.69 +# But until then ... 4.70 HOTSPOT_TARGET="" 4.71 4.72 if test "x$JVM_VARIANT_SERVER" = xtrue; then 4.73 @@ -202,6 +212,10 @@ 4.74 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 " 4.75 fi 4.76 4.77 +if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 4.78 + HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 " 4.79 +fi 4.80 + 4.81 if test "x$JVM_VARIANT_KERNEL" = xtrue; then 4.82 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel " 4.83 fi
5.1 --- a/common/autoconf/spec.gmk.in Fri Dec 28 22:20:53 2012 -0800 5.2 +++ b/common/autoconf/spec.gmk.in Tue Jan 01 12:47:16 2013 -0800 5.3 @@ -185,11 +185,12 @@ 5.4 5.5 # These are the libjvms that we want to build. 5.6 # The java launcher uses the default. 5.7 -# The other can be selected by specifying -client -server -kernel -zero or -zeroshark 5.8 +# The others can be selected by specifying -client -server -minimal1 -kernel -zero or -zeroshark 5.9 # on the java launcher command line. 5.10 JVM_VARIANTS:=@JVM_VARIANTS@ 5.11 JVM_VARIANT_SERVER:=@JVM_VARIANT_SERVER@ 5.12 JVM_VARIANT_CLIENT:=@JVM_VARIANT_CLIENT@ 5.13 +JVM_VARIANT_MINIMAL1:=@JVM_VARIANT_MINIMAL1@ 5.14 JVM_VARIANT_KERNEL:=@JVM_VARIANT_KERNEL@ 5.15 JVM_VARIANT_ZERO:=@JVM_VARIANT_ZERO@ 5.16 JVM_VARIANT_ZEROSHARK:=@JVM_VARIANT_ZEROSHARK@
6.1 --- a/common/autoconf/toolchain.m4 Fri Dec 28 22:20:53 2012 -0800 6.2 +++ b/common/autoconf/toolchain.m4 Tue Jan 01 12:47:16 2013 -0800 6.3 @@ -954,11 +954,14 @@ 6.4 6.5 # On some platforms (mac) the linker warns about non existing -L dirs. 6.6 # Add server first if available. Linking aginst client does not always produce the same results. 6.7 - # Only add client dir if client is being built. Default to server for other variants. 6.8 + # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1. 6.9 + # Default to server for other variants. 6.10 if test "x$JVM_VARIANT_SERVER" = xtrue; then 6.11 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" 6.12 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then 6.13 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client" 6.14 + elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 6.15 + LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal" 6.16 else 6.17 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" 6.18 fi
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/common/bin/hgforest.sh Tue Jan 01 12:47:16 2013 -0800 7.3 @@ -0,0 +1,194 @@ 7.4 +#!/bin/sh 7.5 + 7.6 +# 7.7 +# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. 7.8 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.9 +# 7.10 +# This code is free software; you can redistribute it and/or modify it 7.11 +# under the terms of the GNU General Public License version 2 only, as 7.12 +# published by the Free Software Foundation. 7.13 +# 7.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 7.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 7.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 7.17 +# version 2 for more details (a copy is included in the LICENSE file that 7.18 +# accompanied this code). 7.19 +# 7.20 +# You should have received a copy of the GNU General Public License version 7.21 +# 2 along with this work; if not, write to the Free Software Foundation, 7.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 7.23 +# 7.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 7.25 +# or visit www.oracle.com if you need additional information or have any 7.26 +# questions. 7.27 +# 7.28 + 7.29 +# Shell script for a fast parallel forest command 7.30 +command="$1" 7.31 +pull_extra_base="$2" 7.32 + 7.33 +# Python always buffers stdout significantly, thus we will not see any output from hg clone jdk, 7.34 +# until a lot of time has passed! By passing -u to python, we get incremental updates 7.35 +# on stdout. Much nicer. 7.36 +whichhg="`which hg`" 7.37 + 7.38 +if [ "${whichhg}" = "" ] ; then 7.39 + echo Cannot find hg! 7.40 + exit 1 7.41 +fi 7.42 + 7.43 +if [ "" = "$command" ] ; then 7.44 + echo No command to hg supplied! 7.45 + exit 1 7.46 +fi 7.47 + 7.48 +has_hash_bang="`head -n 1 "${whichhg}" | cut -b 1-2`" 7.49 +python="" 7.50 +bpython="" 7.51 + 7.52 +if [ "#!" = "$has_hash_bang" ] ; then 7.53 + python="`head -n 1 ${whichhg} | cut -b 3-`" 7.54 + bpython="`basename "$python"`" 7.55 +fi 7.56 + 7.57 +if [ "python" = "$bpython" -a -x "$python" ] ; then 7.58 + hg="${python} -u ${whichhg}" 7.59 +else 7.60 + echo Cannot find python from hg launcher. Running plain hg, which probably has buffered stdout. 7.61 + hg="hg" 7.62 +fi 7.63 + 7.64 +# Clean out the temporary directory that stores the pid files. 7.65 +tmp=/tmp/forest.$$ 7.66 +rm -f -r ${tmp} 7.67 +mkdir -p ${tmp} 7.68 + 7.69 +safe_interrupt () { 7.70 + if [ -d ${tmp} ]; then 7.71 + if [ "`ls ${tmp}`" != "" ]; then 7.72 + echo "Waiting for processes ( `cat ${tmp}/* | tr '\n' ' '`) to terminate nicely!" 7.73 + sleep 1 7.74 + # Pipe stderr to dev/null to silence kill, that complains when trying to kill 7.75 + # a subprocess that has already exited. 7.76 + kill -TERM `cat ${tmp}/* | tr '\n' ' '` 2> /dev/null 7.77 + wait 7.78 + echo Interrupt complete! 7.79 + fi 7.80 + fi 7.81 + rm -f -r ${tmp} 7.82 + exit 1 7.83 +} 7.84 + 7.85 +nice_exit () { 7.86 + if [ -d ${tmp} ]; then 7.87 + if [ "`ls ${tmp}`" != "" ]; then 7.88 + wait 7.89 + fi 7.90 + fi 7.91 + rm -f -r ${tmp} 7.92 +} 7.93 + 7.94 +trap 'safe_interrupt' INT QUIT 7.95 +trap 'nice_exit' EXIT 7.96 + 7.97 +# Only look in specific locations for possible forests (avoids long searches) 7.98 +pull_default="" 7.99 +repos="" 7.100 +repos_extra="" 7.101 +if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then 7.102 + subrepos="corba jaxp jaxws langtools jdk hotspot" 7.103 + if [ -f .hg/hgrc ] ; then 7.104 + pull_default=`hg paths default` 7.105 + if [ "${pull_default}" = "" ] ; then 7.106 + echo "ERROR: Need initial clone with 'hg paths default' defined" 7.107 + exit 1 7.108 + fi 7.109 + fi 7.110 + if [ "${pull_default}" = "" ] ; then 7.111 + echo "ERROR: Need initial repository to use this script" 7.112 + exit 1 7.113 + fi 7.114 + for i in ${subrepos} ; do 7.115 + if [ ! -f ${i}/.hg/hgrc ] ; then 7.116 + repos="${repos} ${i}" 7.117 + fi 7.118 + done 7.119 + if [ "${pull_extra_base}" != "" ] ; then 7.120 + subrepos_extra="jdk/src/closed jdk/make/closed jdk/test/closed hotspot/make/closed hotspot/src/closed hotspot/test/closed deploy install sponsors pubs" 7.121 + pull_default_tail=`echo ${pull_default} | sed -e 's@^.*://[^/]*/\(.*\)@\1@'` 7.122 + pull_extra="${pull_extra_base}/${pull_default_tail}" 7.123 + for i in ${subrepos_extra} ; do 7.124 + if [ ! -f ${i}/.hg/hgrc ] ; then 7.125 + repos_extra="${repos_extra} ${i}" 7.126 + fi 7.127 + done 7.128 + fi 7.129 + at_a_time=2 7.130 + # Any repos to deal with? 7.131 + if [ "${repos}" = "" -a "${repos_extra}" = "" ] ; then 7.132 + exit 7.133 + fi 7.134 +else 7.135 + hgdirs=`ls -d ./.hg ./*/.hg ./*/*/.hg ./*/*/*/.hg ./*/*/*/*/.hg 2>/dev/null` 7.136 + # Derive repository names from the .hg directory locations 7.137 + for i in ${hgdirs} ; do 7.138 + repos="${repos} `echo ${i} | sed -e 's@/.hg$@@'`" 7.139 + done 7.140 + for i in ${repos} ; do 7.141 + if [ -h ${i}/.hg/store/lock -o -f ${i}/.hg/store/lock ] ; then 7.142 + locked="${i} ${locked}" 7.143 + fi 7.144 + done 7.145 + at_a_time=8 7.146 + # Any repos to deal with? 7.147 + if [ "${repos}" = "" ] ; then 7.148 + echo "No repositories to process." 7.149 + exit 7.150 + fi 7.151 + if [ "${locked}" != "" ] ; then 7.152 + echo "These repositories are locked: ${locked}" 7.153 + exit 7.154 + fi 7.155 +fi 7.156 + 7.157 +# Echo out what repositories we do a command on. 7.158 +echo "# Repositories: ${repos} ${repos_extra}" 7.159 +echo 7.160 + 7.161 +# Run the supplied command on all repos in parallel. 7.162 +n=0 7.163 +for i in ${repos} ${repos_extra} ; do 7.164 + n=`expr ${n} '+' 1` 7.165 + repopidfile=`echo ${i} | sed -e 's@./@@' -e 's@/@_@g'` 7.166 + reponame=`echo ${i} | sed -e :a -e 's/^.\{1,20\}$/ &/;ta'` 7.167 + pull_base="${pull_default}" 7.168 + for j in $repos_extra ; do 7.169 + if [ "$i" = "$j" ] ; then 7.170 + pull_base="${pull_extra}" 7.171 + fi 7.172 + done 7.173 + ( 7.174 + ( 7.175 + if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then 7.176 + pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`" 7.177 + echo ${hg} clone ${pull_newrepo} ${i} 7.178 + ${hg} clone ${pull_newrepo} ${i} & 7.179 + else 7.180 + echo "cd ${i} && ${hg} $*" 7.181 + cd ${i} && ${hg} "$@" & 7.182 + fi 7.183 + echo $! > ${tmp}/${repopidfile}.pid 7.184 + ) 2>&1 | sed -e "s@^@${reponame}: @") & 7.185 + 7.186 + if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then 7.187 + sleep 2 7.188 + echo Waiting 5 secs before spawning next background command. 7.189 + sleep 3 7.190 + fi 7.191 +done 7.192 +# Wait for all hg commands to complete 7.193 +wait 7.194 + 7.195 +# Terminate with exit 0 all the time (hard to know when to say "failed") 7.196 +exit 0 7.197 +
8.1 --- a/common/makefiles/RMICompilation.gmk Fri Dec 28 22:20:53 2012 -0800 8.2 +++ b/common/makefiles/RMICompilation.gmk Tue Jan 01 12:47:16 2013 -0800 8.3 @@ -1,5 +1,5 @@ 8.4 # 8.5 -# Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. 8.6 +# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 8.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.8 # 8.9 # This code is free software; you can redistribute it and/or modify it
9.1 --- a/get_source.sh Fri Dec 28 22:20:53 2012 -0800 9.2 +++ b/get_source.sh Tue Jan 01 12:47:16 2013 -0800 9.3 @@ -26,8 +26,8 @@ 9.4 # 9.5 9.6 # Get clones of all nested repositories 9.7 -sh ./make/scripts/hgforest.sh clone $* 9.8 +sh ./common/bin/hgforest.sh clone "$@" 9.9 9.10 # Update all existing repositories to the latest sources 9.11 -sh ./make/scripts/hgforest.sh pull -u 9.12 +sh ./common/bin/hgforest.sh pull -u 9.13
