Mercurial > jdk8-mips64-public / changeset
changeset
7190137: Add support for JVM_VARIANT minimal1
Thu, 20 Dec 2012 01:44:02 -0500
- author
- dholmes
- date
- Thu, 20 Dec 2012 01:44:02 -0500
- changeset 542
- 6b93e7a4401d
- parent 540
- 6ee8080a6efe
- child 543
- cd06b2ea58dd
7190137: Add support for JVM_VARIANT minimal1
Summary: Allow configuration of minimal1 as a target VM along with client and server
Reviewed-by: ohair, erikj
1.1 --- a/common/autoconf/generated-configure.sh Wed Dec 19 13:36:21 2012 -0800 1.2 +++ b/common/autoconf/generated-configure.sh Thu Dec 20 01:44:02 2012 -0500 1.3 @@ -1,6 +1,6 @@ 1.4 #! /bin/sh 1.5 # Guess values for system-dependent variables and create Makefiles. 1.6 -# Generated by GNU Autoconf 2.67 for OpenJDK jdk8. 1.7 +# Generated by GNU Autoconf 2.68 for OpenJDK jdk8. 1.8 # 1.9 # Report bugs to <build-dev@openjdk.java.net>. 1.10 # 1.11 @@ -91,6 +91,7 @@ 1.12 IFS=" "" $as_nl" 1.13 1.14 # Find who we are. Look in the path if we contain no directory separator. 1.15 +as_myself= 1.16 case $0 in #(( 1.17 *[\\/]* ) as_myself=$0 ;; 1.18 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 1.19 @@ -216,11 +217,18 @@ 1.20 # We cannot yet assume a decent shell, so we have to provide a 1.21 # neutralization value for shells without unset; and this also 1.22 # works around shells that cannot unset nonexistent variables. 1.23 + # Preserve -v and -x to the replacement shell. 1.24 BASH_ENV=/dev/null 1.25 ENV=/dev/null 1.26 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 1.27 export CONFIG_SHELL 1.28 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 1.29 + case $- in # (((( 1.30 + *v*x* | *x*v* ) as_opts=-vx ;; 1.31 + *v* ) as_opts=-v ;; 1.32 + *x* ) as_opts=-x ;; 1.33 + * ) as_opts= ;; 1.34 + esac 1.35 + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 1.36 fi 1.37 1.38 if test x$as_have_required = xno; then : 1.39 @@ -812,6 +820,7 @@ 1.40 JVM_VARIANT_ZEROSHARK 1.41 JVM_VARIANT_ZERO 1.42 JVM_VARIANT_KERNEL 1.43 +JVM_VARIANT_MINIMAL1 1.44 JVM_VARIANT_CLIENT 1.45 JVM_VARIANT_SERVER 1.46 JVM_VARIANTS 1.47 @@ -1430,7 +1439,7 @@ 1.48 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 1.49 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 1.50 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 1.51 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 1.52 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 1.53 ;; 1.54 1.55 esac 1.56 @@ -1684,7 +1693,7 @@ 1.57 sys-root (for cross-compiling) 1.58 --with-jdk-variant JDK variant to build (normal) [normal] 1.59 --with-jvm-variants JVM variants (separated by commas) to build (server, 1.60 - client, kernel, zero, zeroshark) [server] 1.61 + client, minimal1, kernel, zero, zeroshark) [server] 1.62 --with-debug-level set the debug level (release, fastdebug, slowdebug) 1.63 [release] 1.64 --with-conf-name use this as the name of the configuration [generated 1.65 @@ -1850,7 +1859,7 @@ 1.66 if $ac_init_version; then 1.67 cat <<\_ACEOF 1.68 OpenJDK configure jdk8 1.69 -generated by GNU Autoconf 2.67 1.70 +generated by GNU Autoconf 2.68 1.71 1.72 Copyright (C) 2010 Free Software Foundation, Inc. 1.73 This configure script is free software; the Free Software Foundation 1.74 @@ -1896,7 +1905,7 @@ 1.75 1.76 ac_retval=1 1.77 fi 1.78 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.79 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.80 as_fn_set_status $ac_retval 1.81 1.82 } # ac_fn_c_try_compile 1.83 @@ -1934,7 +1943,7 @@ 1.84 1.85 ac_retval=1 1.86 fi 1.87 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.88 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.89 as_fn_set_status $ac_retval 1.90 1.91 } # ac_fn_cxx_try_compile 1.92 @@ -1972,7 +1981,7 @@ 1.93 1.94 ac_retval=1 1.95 fi 1.96 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.97 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.98 as_fn_set_status $ac_retval 1.99 1.100 } # ac_fn_objc_try_compile 1.101 @@ -2009,7 +2018,7 @@ 1.102 1.103 ac_retval=1 1.104 fi 1.105 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.106 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.107 as_fn_set_status $ac_retval 1.108 1.109 } # ac_fn_c_try_cpp 1.110 @@ -2046,7 +2055,7 @@ 1.111 1.112 ac_retval=1 1.113 fi 1.114 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.115 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.116 as_fn_set_status $ac_retval 1.117 1.118 } # ac_fn_cxx_try_cpp 1.119 @@ -2059,10 +2068,10 @@ 1.120 ac_fn_cxx_check_header_mongrel () 1.121 { 1.122 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.123 - if eval "test \"\${$3+set}\"" = set; then : 1.124 + if eval \${$3+:} false; then : 1.125 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.126 $as_echo_n "checking for $2... " >&6; } 1.127 -if eval "test \"\${$3+set}\"" = set; then : 1.128 +if eval \${$3+:} false; then : 1.129 $as_echo_n "(cached) " >&6 1.130 fi 1.131 eval ac_res=\$$3 1.132 @@ -2129,7 +2138,7 @@ 1.133 esac 1.134 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.135 $as_echo_n "checking for $2... " >&6; } 1.136 -if eval "test \"\${$3+set}\"" = set; then : 1.137 +if eval \${$3+:} false; then : 1.138 $as_echo_n "(cached) " >&6 1.139 else 1.140 eval "$3=\$ac_header_compiler" 1.141 @@ -2138,7 +2147,7 @@ 1.142 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.143 $as_echo "$ac_res" >&6; } 1.144 fi 1.145 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.146 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.147 1.148 } # ac_fn_cxx_check_header_mongrel 1.149 1.150 @@ -2179,7 +2188,7 @@ 1.151 ac_retval=$ac_status 1.152 fi 1.153 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1.154 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.155 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.156 as_fn_set_status $ac_retval 1.157 1.158 } # ac_fn_cxx_try_run 1.159 @@ -2193,7 +2202,7 @@ 1.160 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.161 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.162 $as_echo_n "checking for $2... " >&6; } 1.163 -if eval "test \"\${$3+set}\"" = set; then : 1.164 +if eval \${$3+:} false; then : 1.165 $as_echo_n "(cached) " >&6 1.166 else 1.167 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.168 @@ -2211,7 +2220,7 @@ 1.169 eval ac_res=\$$3 1.170 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.171 $as_echo "$ac_res" >&6; } 1.172 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.173 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.174 1.175 } # ac_fn_cxx_check_header_compile 1.176 1.177 @@ -2388,7 +2397,7 @@ 1.178 rm -f conftest.val 1.179 1.180 fi 1.181 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.182 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.183 as_fn_set_status $ac_retval 1.184 1.185 } # ac_fn_cxx_compute_int 1.186 @@ -2434,7 +2443,7 @@ 1.187 # interfere with the next link command; also delete a directory that is 1.188 # left behind by Apple's compiler. We do this before executing the actions. 1.189 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1.190 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.191 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.192 as_fn_set_status $ac_retval 1.193 1.194 } # ac_fn_cxx_try_link 1.195 @@ -2447,7 +2456,7 @@ 1.196 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.197 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.198 $as_echo_n "checking for $2... " >&6; } 1.199 -if eval "test \"\${$3+set}\"" = set; then : 1.200 +if eval \${$3+:} false; then : 1.201 $as_echo_n "(cached) " >&6 1.202 else 1.203 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.204 @@ -2502,7 +2511,7 @@ 1.205 eval ac_res=\$$3 1.206 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.207 $as_echo "$ac_res" >&6; } 1.208 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.209 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.210 1.211 } # ac_fn_cxx_check_func 1.212 1.213 @@ -2515,7 +2524,7 @@ 1.214 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.215 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.216 $as_echo_n "checking for $2... " >&6; } 1.217 -if eval "test \"\${$3+set}\"" = set; then : 1.218 +if eval \${$3+:} false; then : 1.219 $as_echo_n "(cached) " >&6 1.220 else 1.221 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.222 @@ -2533,7 +2542,7 @@ 1.223 eval ac_res=\$$3 1.224 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.225 $as_echo "$ac_res" >&6; } 1.226 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.227 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.228 1.229 } # ac_fn_c_check_header_compile 1.230 cat >config.log <<_ACEOF 1.231 @@ -2541,7 +2550,7 @@ 1.232 running configure, to aid debugging if configure makes a mistake. 1.233 1.234 It was created by OpenJDK $as_me jdk8, which was 1.235 -generated by GNU Autoconf 2.67. Invocation command line was 1.236 +generated by GNU Autoconf 2.68. Invocation command line was 1.237 1.238 $ $0 $@ 1.239 1.240 @@ -2799,7 +2808,7 @@ 1.241 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.242 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.243 as_fn_error $? "failed to load site script $ac_site_file 1.244 -See \`config.log' for more details" "$LINENO" 5 ; } 1.245 +See \`config.log' for more details" "$LINENO" 5; } 1.246 fi 1.247 done 1.248 1.249 @@ -3674,7 +3683,7 @@ 1.250 #CUSTOM_AUTOCONF_INCLUDE 1.251 1.252 # Do not change or remove the following line, it is needed for consistency checks: 1.253 -DATE_WHEN_GENERATED=1355849613 1.254 +DATE_WHEN_GENERATED=1355963953 1.255 1.256 ############################################################################### 1.257 # 1.258 @@ -3712,7 +3721,7 @@ 1.259 set dummy $ac_prog; ac_word=$2 1.260 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.261 $as_echo_n "checking for $ac_word... " >&6; } 1.262 -if test "${ac_cv_path_BASENAME+set}" = set; then : 1.263 +if ${ac_cv_path_BASENAME+:} false; then : 1.264 $as_echo_n "(cached) " >&6 1.265 else 1.266 case $BASENAME in 1.267 @@ -3771,7 +3780,7 @@ 1.268 set dummy $ac_prog; ac_word=$2 1.269 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.270 $as_echo_n "checking for $ac_word... " >&6; } 1.271 -if test "${ac_cv_path_BASH+set}" = set; then : 1.272 +if ${ac_cv_path_BASH+:} false; then : 1.273 $as_echo_n "(cached) " >&6 1.274 else 1.275 case $BASH in 1.276 @@ -3830,7 +3839,7 @@ 1.277 set dummy $ac_prog; ac_word=$2 1.278 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.279 $as_echo_n "checking for $ac_word... " >&6; } 1.280 -if test "${ac_cv_path_CAT+set}" = set; then : 1.281 +if ${ac_cv_path_CAT+:} false; then : 1.282 $as_echo_n "(cached) " >&6 1.283 else 1.284 case $CAT in 1.285 @@ -3889,7 +3898,7 @@ 1.286 set dummy $ac_prog; ac_word=$2 1.287 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.288 $as_echo_n "checking for $ac_word... " >&6; } 1.289 -if test "${ac_cv_path_CHMOD+set}" = set; then : 1.290 +if ${ac_cv_path_CHMOD+:} false; then : 1.291 $as_echo_n "(cached) " >&6 1.292 else 1.293 case $CHMOD in 1.294 @@ -3948,7 +3957,7 @@ 1.295 set dummy $ac_prog; ac_word=$2 1.296 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.297 $as_echo_n "checking for $ac_word... " >&6; } 1.298 -if test "${ac_cv_path_CMP+set}" = set; then : 1.299 +if ${ac_cv_path_CMP+:} false; then : 1.300 $as_echo_n "(cached) " >&6 1.301 else 1.302 case $CMP in 1.303 @@ -4007,7 +4016,7 @@ 1.304 set dummy $ac_prog; ac_word=$2 1.305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.306 $as_echo_n "checking for $ac_word... " >&6; } 1.307 -if test "${ac_cv_path_CP+set}" = set; then : 1.308 +if ${ac_cv_path_CP+:} false; then : 1.309 $as_echo_n "(cached) " >&6 1.310 else 1.311 case $CP in 1.312 @@ -4066,7 +4075,7 @@ 1.313 set dummy $ac_prog; ac_word=$2 1.314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.315 $as_echo_n "checking for $ac_word... " >&6; } 1.316 -if test "${ac_cv_path_CUT+set}" = set; then : 1.317 +if ${ac_cv_path_CUT+:} false; then : 1.318 $as_echo_n "(cached) " >&6 1.319 else 1.320 case $CUT in 1.321 @@ -4125,7 +4134,7 @@ 1.322 set dummy $ac_prog; ac_word=$2 1.323 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.324 $as_echo_n "checking for $ac_word... " >&6; } 1.325 -if test "${ac_cv_path_DATE+set}" = set; then : 1.326 +if ${ac_cv_path_DATE+:} false; then : 1.327 $as_echo_n "(cached) " >&6 1.328 else 1.329 case $DATE in 1.330 @@ -4184,7 +4193,7 @@ 1.331 set dummy $ac_prog; ac_word=$2 1.332 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.333 $as_echo_n "checking for $ac_word... " >&6; } 1.334 -if test "${ac_cv_path_DIFF+set}" = set; then : 1.335 +if ${ac_cv_path_DIFF+:} false; then : 1.336 $as_echo_n "(cached) " >&6 1.337 else 1.338 case $DIFF in 1.339 @@ -4243,7 +4252,7 @@ 1.340 set dummy $ac_prog; ac_word=$2 1.341 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.342 $as_echo_n "checking for $ac_word... " >&6; } 1.343 -if test "${ac_cv_path_DIRNAME+set}" = set; then : 1.344 +if ${ac_cv_path_DIRNAME+:} false; then : 1.345 $as_echo_n "(cached) " >&6 1.346 else 1.347 case $DIRNAME in 1.348 @@ -4302,7 +4311,7 @@ 1.349 set dummy $ac_prog; ac_word=$2 1.350 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.351 $as_echo_n "checking for $ac_word... " >&6; } 1.352 -if test "${ac_cv_path_ECHO+set}" = set; then : 1.353 +if ${ac_cv_path_ECHO+:} false; then : 1.354 $as_echo_n "(cached) " >&6 1.355 else 1.356 case $ECHO in 1.357 @@ -4361,7 +4370,7 @@ 1.358 set dummy $ac_prog; ac_word=$2 1.359 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.360 $as_echo_n "checking for $ac_word... " >&6; } 1.361 -if test "${ac_cv_path_EXPR+set}" = set; then : 1.362 +if ${ac_cv_path_EXPR+:} false; then : 1.363 $as_echo_n "(cached) " >&6 1.364 else 1.365 case $EXPR in 1.366 @@ -4420,7 +4429,7 @@ 1.367 set dummy $ac_prog; ac_word=$2 1.368 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.369 $as_echo_n "checking for $ac_word... " >&6; } 1.370 -if test "${ac_cv_path_FILE+set}" = set; then : 1.371 +if ${ac_cv_path_FILE+:} false; then : 1.372 $as_echo_n "(cached) " >&6 1.373 else 1.374 case $FILE in 1.375 @@ -4479,7 +4488,7 @@ 1.376 set dummy $ac_prog; ac_word=$2 1.377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.378 $as_echo_n "checking for $ac_word... " >&6; } 1.379 -if test "${ac_cv_path_FIND+set}" = set; then : 1.380 +if ${ac_cv_path_FIND+:} false; then : 1.381 $as_echo_n "(cached) " >&6 1.382 else 1.383 case $FIND in 1.384 @@ -4538,7 +4547,7 @@ 1.385 set dummy $ac_prog; ac_word=$2 1.386 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.387 $as_echo_n "checking for $ac_word... " >&6; } 1.388 -if test "${ac_cv_path_HEAD+set}" = set; then : 1.389 +if ${ac_cv_path_HEAD+:} false; then : 1.390 $as_echo_n "(cached) " >&6 1.391 else 1.392 case $HEAD in 1.393 @@ -4597,7 +4606,7 @@ 1.394 set dummy $ac_prog; ac_word=$2 1.395 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.396 $as_echo_n "checking for $ac_word... " >&6; } 1.397 -if test "${ac_cv_path_LN+set}" = set; then : 1.398 +if ${ac_cv_path_LN+:} false; then : 1.399 $as_echo_n "(cached) " >&6 1.400 else 1.401 case $LN in 1.402 @@ -4656,7 +4665,7 @@ 1.403 set dummy $ac_prog; ac_word=$2 1.404 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.405 $as_echo_n "checking for $ac_word... " >&6; } 1.406 -if test "${ac_cv_path_LS+set}" = set; then : 1.407 +if ${ac_cv_path_LS+:} false; then : 1.408 $as_echo_n "(cached) " >&6 1.409 else 1.410 case $LS in 1.411 @@ -4715,7 +4724,7 @@ 1.412 set dummy $ac_prog; ac_word=$2 1.413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.414 $as_echo_n "checking for $ac_word... " >&6; } 1.415 -if test "${ac_cv_path_MKDIR+set}" = set; then : 1.416 +if ${ac_cv_path_MKDIR+:} false; then : 1.417 $as_echo_n "(cached) " >&6 1.418 else 1.419 case $MKDIR in 1.420 @@ -4774,7 +4783,7 @@ 1.421 set dummy $ac_prog; ac_word=$2 1.422 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.423 $as_echo_n "checking for $ac_word... " >&6; } 1.424 -if test "${ac_cv_path_MKTEMP+set}" = set; then : 1.425 +if ${ac_cv_path_MKTEMP+:} false; then : 1.426 $as_echo_n "(cached) " >&6 1.427 else 1.428 case $MKTEMP in 1.429 @@ -4833,7 +4842,7 @@ 1.430 set dummy $ac_prog; ac_word=$2 1.431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.432 $as_echo_n "checking for $ac_word... " >&6; } 1.433 -if test "${ac_cv_path_MV+set}" = set; then : 1.434 +if ${ac_cv_path_MV+:} false; then : 1.435 $as_echo_n "(cached) " >&6 1.436 else 1.437 case $MV in 1.438 @@ -4892,7 +4901,7 @@ 1.439 set dummy $ac_prog; ac_word=$2 1.440 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.441 $as_echo_n "checking for $ac_word... " >&6; } 1.442 -if test "${ac_cv_path_PRINTF+set}" = set; then : 1.443 +if ${ac_cv_path_PRINTF+:} false; then : 1.444 $as_echo_n "(cached) " >&6 1.445 else 1.446 case $PRINTF in 1.447 @@ -4951,7 +4960,7 @@ 1.448 set dummy $ac_prog; ac_word=$2 1.449 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.450 $as_echo_n "checking for $ac_word... " >&6; } 1.451 -if test "${ac_cv_path_THEPWDCMD+set}" = set; then : 1.452 +if ${ac_cv_path_THEPWDCMD+:} false; then : 1.453 $as_echo_n "(cached) " >&6 1.454 else 1.455 case $THEPWDCMD in 1.456 @@ -5010,7 +5019,7 @@ 1.457 set dummy $ac_prog; ac_word=$2 1.458 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.459 $as_echo_n "checking for $ac_word... " >&6; } 1.460 -if test "${ac_cv_path_RM+set}" = set; then : 1.461 +if ${ac_cv_path_RM+:} false; then : 1.462 $as_echo_n "(cached) " >&6 1.463 else 1.464 case $RM in 1.465 @@ -5069,7 +5078,7 @@ 1.466 set dummy $ac_prog; ac_word=$2 1.467 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.468 $as_echo_n "checking for $ac_word... " >&6; } 1.469 -if test "${ac_cv_path_SH+set}" = set; then : 1.470 +if ${ac_cv_path_SH+:} false; then : 1.471 $as_echo_n "(cached) " >&6 1.472 else 1.473 case $SH in 1.474 @@ -5128,7 +5137,7 @@ 1.475 set dummy $ac_prog; ac_word=$2 1.476 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.477 $as_echo_n "checking for $ac_word... " >&6; } 1.478 -if test "${ac_cv_path_SORT+set}" = set; then : 1.479 +if ${ac_cv_path_SORT+:} false; then : 1.480 $as_echo_n "(cached) " >&6 1.481 else 1.482 case $SORT in 1.483 @@ -5187,7 +5196,7 @@ 1.484 set dummy $ac_prog; ac_word=$2 1.485 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.486 $as_echo_n "checking for $ac_word... " >&6; } 1.487 -if test "${ac_cv_path_TAIL+set}" = set; then : 1.488 +if ${ac_cv_path_TAIL+:} false; then : 1.489 $as_echo_n "(cached) " >&6 1.490 else 1.491 case $TAIL in 1.492 @@ -5246,7 +5255,7 @@ 1.493 set dummy $ac_prog; ac_word=$2 1.494 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.495 $as_echo_n "checking for $ac_word... " >&6; } 1.496 -if test "${ac_cv_path_TAR+set}" = set; then : 1.497 +if ${ac_cv_path_TAR+:} false; then : 1.498 $as_echo_n "(cached) " >&6 1.499 else 1.500 case $TAR in 1.501 @@ -5305,7 +5314,7 @@ 1.502 set dummy $ac_prog; ac_word=$2 1.503 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.504 $as_echo_n "checking for $ac_word... " >&6; } 1.505 -if test "${ac_cv_path_TEE+set}" = set; then : 1.506 +if ${ac_cv_path_TEE+:} false; then : 1.507 $as_echo_n "(cached) " >&6 1.508 else 1.509 case $TEE in 1.510 @@ -5364,7 +5373,7 @@ 1.511 set dummy $ac_prog; ac_word=$2 1.512 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.513 $as_echo_n "checking for $ac_word... " >&6; } 1.514 -if test "${ac_cv_path_TOUCH+set}" = set; then : 1.515 +if ${ac_cv_path_TOUCH+:} false; then : 1.516 $as_echo_n "(cached) " >&6 1.517 else 1.518 case $TOUCH in 1.519 @@ -5423,7 +5432,7 @@ 1.520 set dummy $ac_prog; ac_word=$2 1.521 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.522 $as_echo_n "checking for $ac_word... " >&6; } 1.523 -if test "${ac_cv_path_TR+set}" = set; then : 1.524 +if ${ac_cv_path_TR+:} false; then : 1.525 $as_echo_n "(cached) " >&6 1.526 else 1.527 case $TR in 1.528 @@ -5482,7 +5491,7 @@ 1.529 set dummy $ac_prog; ac_word=$2 1.530 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.531 $as_echo_n "checking for $ac_word... " >&6; } 1.532 -if test "${ac_cv_path_UNAME+set}" = set; then : 1.533 +if ${ac_cv_path_UNAME+:} false; then : 1.534 $as_echo_n "(cached) " >&6 1.535 else 1.536 case $UNAME in 1.537 @@ -5541,7 +5550,7 @@ 1.538 set dummy $ac_prog; ac_word=$2 1.539 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.540 $as_echo_n "checking for $ac_word... " >&6; } 1.541 -if test "${ac_cv_path_UNIQ+set}" = set; then : 1.542 +if ${ac_cv_path_UNIQ+:} false; then : 1.543 $as_echo_n "(cached) " >&6 1.544 else 1.545 case $UNIQ in 1.546 @@ -5600,7 +5609,7 @@ 1.547 set dummy $ac_prog; ac_word=$2 1.548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.549 $as_echo_n "checking for $ac_word... " >&6; } 1.550 -if test "${ac_cv_path_WC+set}" = set; then : 1.551 +if ${ac_cv_path_WC+:} false; then : 1.552 $as_echo_n "(cached) " >&6 1.553 else 1.554 case $WC in 1.555 @@ -5659,7 +5668,7 @@ 1.556 set dummy $ac_prog; ac_word=$2 1.557 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.558 $as_echo_n "checking for $ac_word... " >&6; } 1.559 -if test "${ac_cv_path_WHICH+set}" = set; then : 1.560 +if ${ac_cv_path_WHICH+:} false; then : 1.561 $as_echo_n "(cached) " >&6 1.562 else 1.563 case $WHICH in 1.564 @@ -5718,7 +5727,7 @@ 1.565 set dummy $ac_prog; ac_word=$2 1.566 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.567 $as_echo_n "checking for $ac_word... " >&6; } 1.568 -if test "${ac_cv_path_XARGS+set}" = set; then : 1.569 +if ${ac_cv_path_XARGS+:} false; then : 1.570 $as_echo_n "(cached) " >&6 1.571 else 1.572 case $XARGS in 1.573 @@ -5778,7 +5787,7 @@ 1.574 set dummy $ac_prog; ac_word=$2 1.575 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.576 $as_echo_n "checking for $ac_word... " >&6; } 1.577 -if test "${ac_cv_prog_AWK+set}" = set; then : 1.578 +if ${ac_cv_prog_AWK+:} false; then : 1.579 $as_echo_n "(cached) " >&6 1.580 else 1.581 if test -n "$AWK"; then 1.582 @@ -5828,7 +5837,7 @@ 1.583 1.584 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 1.585 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 1.586 -if test "${ac_cv_path_GREP+set}" = set; then : 1.587 +if ${ac_cv_path_GREP+:} false; then : 1.588 $as_echo_n "(cached) " >&6 1.589 else 1.590 if test -z "$GREP"; then 1.591 @@ -5903,7 +5912,7 @@ 1.592 1.593 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 1.594 $as_echo_n "checking for egrep... " >&6; } 1.595 -if test "${ac_cv_path_EGREP+set}" = set; then : 1.596 +if ${ac_cv_path_EGREP+:} false; then : 1.597 $as_echo_n "(cached) " >&6 1.598 else 1.599 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 1.600 @@ -5982,7 +5991,7 @@ 1.601 1.602 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 1.603 $as_echo_n "checking for fgrep... " >&6; } 1.604 -if test "${ac_cv_path_FGREP+set}" = set; then : 1.605 +if ${ac_cv_path_FGREP+:} false; then : 1.606 $as_echo_n "(cached) " >&6 1.607 else 1.608 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 1.609 @@ -6061,7 +6070,7 @@ 1.610 1.611 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 1.612 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 1.613 -if test "${ac_cv_path_SED+set}" = set; then : 1.614 +if ${ac_cv_path_SED+:} false; then : 1.615 $as_echo_n "(cached) " >&6 1.616 else 1.617 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ 1.618 @@ -6147,7 +6156,7 @@ 1.619 set dummy $ac_prog; ac_word=$2 1.620 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.621 $as_echo_n "checking for $ac_word... " >&6; } 1.622 -if test "${ac_cv_path_NAWK+set}" = set; then : 1.623 +if ${ac_cv_path_NAWK+:} false; then : 1.624 $as_echo_n "(cached) " >&6 1.625 else 1.626 case $NAWK in 1.627 @@ -6207,7 +6216,7 @@ 1.628 set dummy cygpath; ac_word=$2 1.629 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.630 $as_echo_n "checking for $ac_word... " >&6; } 1.631 -if test "${ac_cv_path_CYGPATH+set}" = set; then : 1.632 +if ${ac_cv_path_CYGPATH+:} false; then : 1.633 $as_echo_n "(cached) " >&6 1.634 else 1.635 case $CYGPATH in 1.636 @@ -6247,7 +6256,7 @@ 1.637 set dummy readlink; ac_word=$2 1.638 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.639 $as_echo_n "checking for $ac_word... " >&6; } 1.640 -if test "${ac_cv_path_READLINK+set}" = set; then : 1.641 +if ${ac_cv_path_READLINK+:} false; then : 1.642 $as_echo_n "(cached) " >&6 1.643 else 1.644 case $READLINK in 1.645 @@ -6287,7 +6296,7 @@ 1.646 set dummy df; ac_word=$2 1.647 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.648 $as_echo_n "checking for $ac_word... " >&6; } 1.649 -if test "${ac_cv_path_DF+set}" = set; then : 1.650 +if ${ac_cv_path_DF+:} false; then : 1.651 $as_echo_n "(cached) " >&6 1.652 else 1.653 case $DF in 1.654 @@ -6327,7 +6336,7 @@ 1.655 set dummy SetFile; ac_word=$2 1.656 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.657 $as_echo_n "checking for $ac_word... " >&6; } 1.658 -if test "${ac_cv_path_SETFILE+set}" = set; then : 1.659 +if ${ac_cv_path_SETFILE+:} false; then : 1.660 $as_echo_n "(cached) " >&6 1.661 else 1.662 case $SETFILE in 1.663 @@ -6373,7 +6382,7 @@ 1.664 1.665 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 1.666 $as_echo_n "checking build system type... " >&6; } 1.667 -if test "${ac_cv_build+set}" = set; then : 1.668 +if ${ac_cv_build+:} false; then : 1.669 $as_echo_n "(cached) " >&6 1.670 else 1.671 ac_build_alias=$build_alias 1.672 @@ -6389,7 +6398,7 @@ 1.673 $as_echo "$ac_cv_build" >&6; } 1.674 case $ac_cv_build in 1.675 *-*-*) ;; 1.676 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 1.677 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 1.678 esac 1.679 build=$ac_cv_build 1.680 ac_save_IFS=$IFS; IFS='-' 1.681 @@ -6407,7 +6416,7 @@ 1.682 1.683 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 1.684 $as_echo_n "checking host system type... " >&6; } 1.685 -if test "${ac_cv_host+set}" = set; then : 1.686 +if ${ac_cv_host+:} false; then : 1.687 $as_echo_n "(cached) " >&6 1.688 else 1.689 if test "x$host_alias" = x; then 1.690 @@ -6422,7 +6431,7 @@ 1.691 $as_echo "$ac_cv_host" >&6; } 1.692 case $ac_cv_host in 1.693 *-*-*) ;; 1.694 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 1.695 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 1.696 esac 1.697 host=$ac_cv_host 1.698 ac_save_IFS=$IFS; IFS='-' 1.699 @@ -6440,7 +6449,7 @@ 1.700 1.701 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 1.702 $as_echo_n "checking target system type... " >&6; } 1.703 -if test "${ac_cv_target+set}" = set; then : 1.704 +if ${ac_cv_target+:} false; then : 1.705 $as_echo_n "(cached) " >&6 1.706 else 1.707 if test "x$target_alias" = x; then 1.708 @@ -6455,7 +6464,7 @@ 1.709 $as_echo "$ac_cv_target" >&6; } 1.710 case $ac_cv_target in 1.711 *-*-*) ;; 1.712 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 1.713 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 1.714 esac 1.715 target=$ac_cv_target 1.716 ac_save_IFS=$IFS; IFS='-' 1.717 @@ -7387,6 +7396,7 @@ 1.718 # Currently we have: 1.719 # server: normal interpreter and a tiered C1/C2 compiler 1.720 # client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms) 1.721 +# minimal1: reduced form of client with optional VM services and features stripped out 1.722 # kernel: kernel footprint JVM that passes the TCK without major performance problems, 1.723 # ie normal interpreter and C1, only the serial GC, kernel jvmti etc 1.724 # zero: no machine code interpreter, no compiler 1.725 @@ -7405,16 +7415,17 @@ 1.726 fi 1.727 1.728 JVM_VARIANTS=",$with_jvm_variants," 1.729 -TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'` 1.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,//'` 1.731 1.732 if test "x$TEST_VARIANTS" != "x,"; then 1.733 - as_fn_error $? "The available JVM variants are: server, client, kernel, zero, zeroshark" "$LINENO" 5 1.734 + as_fn_error $? "The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark" "$LINENO" 5 1.735 fi 1.736 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_jvm_variants" >&5 1.737 $as_echo "$with_jvm_variants" >&6; } 1.738 1.739 JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'` 1.740 JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'` 1.741 +JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'` 1.742 JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'` 1.743 JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'` 1.744 JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` 1.745 @@ -7429,10 +7440,15 @@ 1.746 as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5 1.747 fi 1.748 fi 1.749 +if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 1.750 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 1.751 + as_fn_error $? "You cannot build a minimal JVM for a 64-bit machine." "$LINENO" 5 1.752 + fi 1.753 +fi 1.754 1.755 # Replace the commas with AND for use in the build directory name. 1.756 ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` 1.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/'` 1.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/'` 1.759 if test "x$COUNT_VARIANTS" != "x,1"; then 1.760 BUILDING_MULTIPLE_JVM_VARIANTS=yes 1.761 else 1.762 @@ -7446,6 +7462,7 @@ 1.763 1.764 1.765 1.766 + 1.767 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 1.768 MACOSX_UNIVERSAL="true" 1.769 fi 1.770 @@ -7531,7 +7548,9 @@ 1.771 ##### 1.772 # Generate the legacy makefile targets for hotspot. 1.773 # The hotspot api for selecting the build artifacts, really, needs to be improved. 1.774 -# 1.775 +# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to 1.776 +# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc 1.777 +# But until then ... 1.778 HOTSPOT_TARGET="" 1.779 1.780 if test "x$JVM_VARIANT_SERVER" = xtrue; then 1.781 @@ -7542,6 +7561,10 @@ 1.782 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 " 1.783 fi 1.784 1.785 +if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 1.786 + HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 " 1.787 +fi 1.788 + 1.789 if test "x$JVM_VARIANT_KERNEL" = xtrue; then 1.790 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel " 1.791 fi 1.792 @@ -7860,7 +7883,7 @@ 1.793 set dummy $ac_prog; ac_word=$2 1.794 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.795 $as_echo_n "checking for $ac_word... " >&6; } 1.796 -if test "${ac_cv_prog_PKGHANDLER+set}" = set; then : 1.797 +if ${ac_cv_prog_PKGHANDLER+:} false; then : 1.798 $as_echo_n "(cached) " >&6 1.799 else 1.800 if test -n "$PKGHANDLER"; then 1.801 @@ -8225,7 +8248,7 @@ 1.802 set dummy $ac_prog; ac_word=$2 1.803 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.804 $as_echo_n "checking for $ac_word... " >&6; } 1.805 -if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then : 1.806 +if ${ac_cv_path_CHECK_GMAKE+:} false; then : 1.807 $as_echo_n "(cached) " >&6 1.808 else 1.809 case $CHECK_GMAKE in 1.810 @@ -8579,7 +8602,7 @@ 1.811 set dummy $ac_prog; ac_word=$2 1.812 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.813 $as_echo_n "checking for $ac_word... " >&6; } 1.814 -if test "${ac_cv_path_CHECK_MAKE+set}" = set; then : 1.815 +if ${ac_cv_path_CHECK_MAKE+:} false; then : 1.816 $as_echo_n "(cached) " >&6 1.817 else 1.818 case $CHECK_MAKE in 1.819 @@ -8938,7 +8961,7 @@ 1.820 set dummy $ac_prog; ac_word=$2 1.821 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.822 $as_echo_n "checking for $ac_word... " >&6; } 1.823 -if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then : 1.824 +if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then : 1.825 $as_echo_n "(cached) " >&6 1.826 else 1.827 case $CHECK_TOOLSDIR_GMAKE in 1.828 @@ -9291,7 +9314,7 @@ 1.829 set dummy $ac_prog; ac_word=$2 1.830 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.831 $as_echo_n "checking for $ac_word... " >&6; } 1.832 -if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then : 1.833 +if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then : 1.834 $as_echo_n "(cached) " >&6 1.835 else 1.836 case $CHECK_TOOLSDIR_MAKE in 1.837 @@ -9687,7 +9710,7 @@ 1.838 set dummy $ac_prog; ac_word=$2 1.839 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.840 $as_echo_n "checking for $ac_word... " >&6; } 1.841 -if test "${ac_cv_path_UNZIP+set}" = set; then : 1.842 +if ${ac_cv_path_UNZIP+:} false; then : 1.843 $as_echo_n "(cached) " >&6 1.844 else 1.845 case $UNZIP in 1.846 @@ -9746,7 +9769,7 @@ 1.847 set dummy $ac_prog; ac_word=$2 1.848 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.849 $as_echo_n "checking for $ac_word... " >&6; } 1.850 -if test "${ac_cv_path_ZIP+set}" = set; then : 1.851 +if ${ac_cv_path_ZIP+:} false; then : 1.852 $as_echo_n "(cached) " >&6 1.853 else 1.854 case $ZIP in 1.855 @@ -9805,7 +9828,7 @@ 1.856 set dummy ldd; ac_word=$2 1.857 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.858 $as_echo_n "checking for $ac_word... " >&6; } 1.859 -if test "${ac_cv_path_LDD+set}" = set; then : 1.860 +if ${ac_cv_path_LDD+:} false; then : 1.861 $as_echo_n "(cached) " >&6 1.862 else 1.863 case $LDD in 1.864 @@ -9851,7 +9874,7 @@ 1.865 set dummy otool; ac_word=$2 1.866 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.867 $as_echo_n "checking for $ac_word... " >&6; } 1.868 -if test "${ac_cv_path_OTOOL+set}" = set; then : 1.869 +if ${ac_cv_path_OTOOL+:} false; then : 1.870 $as_echo_n "(cached) " >&6 1.871 else 1.872 case $OTOOL in 1.873 @@ -9896,7 +9919,7 @@ 1.874 set dummy $ac_prog; ac_word=$2 1.875 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.876 $as_echo_n "checking for $ac_word... " >&6; } 1.877 -if test "${ac_cv_path_READELF+set}" = set; then : 1.878 +if ${ac_cv_path_READELF+:} false; then : 1.879 $as_echo_n "(cached) " >&6 1.880 else 1.881 case $READELF in 1.882 @@ -9939,7 +9962,7 @@ 1.883 set dummy hg; ac_word=$2 1.884 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.885 $as_echo_n "checking for $ac_word... " >&6; } 1.886 -if test "${ac_cv_path_HG+set}" = set; then : 1.887 +if ${ac_cv_path_HG+:} false; then : 1.888 $as_echo_n "(cached) " >&6 1.889 else 1.890 case $HG in 1.891 @@ -9979,7 +10002,7 @@ 1.892 set dummy stat; ac_word=$2 1.893 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.894 $as_echo_n "checking for $ac_word... " >&6; } 1.895 -if test "${ac_cv_path_STAT+set}" = set; then : 1.896 +if ${ac_cv_path_STAT+:} false; then : 1.897 $as_echo_n "(cached) " >&6 1.898 else 1.899 case $STAT in 1.900 @@ -10019,7 +10042,7 @@ 1.901 set dummy time; ac_word=$2 1.902 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.903 $as_echo_n "checking for $ac_word... " >&6; } 1.904 -if test "${ac_cv_path_TIME+set}" = set; then : 1.905 +if ${ac_cv_path_TIME+:} false; then : 1.906 $as_echo_n "(cached) " >&6 1.907 else 1.908 case $TIME in 1.909 @@ -10064,7 +10087,7 @@ 1.910 set dummy $ac_prog; ac_word=$2 1.911 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.912 $as_echo_n "checking for $ac_word... " >&6; } 1.913 -if test "${ac_cv_path_COMM+set}" = set; then : 1.914 +if ${ac_cv_path_COMM+:} false; then : 1.915 $as_echo_n "(cached) " >&6 1.916 else 1.917 case $COMM in 1.918 @@ -10128,7 +10151,7 @@ 1.919 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 1.920 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.921 $as_echo_n "checking for $ac_word... " >&6; } 1.922 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 1.923 +if ${ac_cv_path_PKG_CONFIG+:} false; then : 1.924 $as_echo_n "(cached) " >&6 1.925 else 1.926 case $PKG_CONFIG in 1.927 @@ -10171,7 +10194,7 @@ 1.928 set dummy pkg-config; ac_word=$2 1.929 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.930 $as_echo_n "checking for $ac_word... " >&6; } 1.931 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : 1.932 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : 1.933 $as_echo_n "(cached) " >&6 1.934 else 1.935 case $ac_pt_PKG_CONFIG in 1.936 @@ -10344,7 +10367,7 @@ 1.937 set dummy $ac_prog; ac_word=$2 1.938 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.939 $as_echo_n "checking for $ac_word... " >&6; } 1.940 -if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then : 1.941 +if ${ac_cv_prog_BDEPS_UNZIP+:} false; then : 1.942 $as_echo_n "(cached) " >&6 1.943 else 1.944 if test -n "$BDEPS_UNZIP"; then 1.945 @@ -10390,7 +10413,7 @@ 1.946 set dummy $ac_prog; ac_word=$2 1.947 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.948 $as_echo_n "checking for $ac_word... " >&6; } 1.949 -if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then : 1.950 +if ${ac_cv_prog_BDEPS_FTP+:} false; then : 1.951 $as_echo_n "(cached) " >&6 1.952 else 1.953 if test -n "$BDEPS_FTP"; then 1.954 @@ -11679,7 +11702,7 @@ 1.955 set dummy javac; ac_word=$2 1.956 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.957 $as_echo_n "checking for $ac_word... " >&6; } 1.958 -if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then : 1.959 +if ${ac_cv_path_JAVAC_CHECK+:} false; then : 1.960 $as_echo_n "(cached) " >&6 1.961 else 1.962 case $JAVAC_CHECK in 1.963 @@ -11719,7 +11742,7 @@ 1.964 set dummy java; ac_word=$2 1.965 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.966 $as_echo_n "checking for $ac_word... " >&6; } 1.967 -if test "${ac_cv_path_JAVA_CHECK+set}" = set; then : 1.968 +if ${ac_cv_path_JAVA_CHECK+:} false; then : 1.969 $as_echo_n "(cached) " >&6 1.970 else 1.971 case $JAVA_CHECK in 1.972 @@ -15778,7 +15801,7 @@ 1.973 set dummy link; ac_word=$2 1.974 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.975 $as_echo_n "checking for $ac_word... " >&6; } 1.976 -if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then : 1.977 +if ${ac_cv_path_CYGWIN_LINK+:} false; then : 1.978 $as_echo_n "(cached) " >&6 1.979 else 1.980 case $CYGWIN_LINK in 1.981 @@ -16767,7 +16790,7 @@ 1.982 set dummy $ac_prog; ac_word=$2 1.983 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.984 $as_echo_n "checking for $ac_word... " >&6; } 1.985 -if test "${ac_cv_path_BUILD_CC+set}" = set; then : 1.986 +if ${ac_cv_path_BUILD_CC+:} false; then : 1.987 $as_echo_n "(cached) " >&6 1.988 else 1.989 case $BUILD_CC in 1.990 @@ -17078,7 +17101,7 @@ 1.991 set dummy $ac_prog; ac_word=$2 1.992 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.993 $as_echo_n "checking for $ac_word... " >&6; } 1.994 -if test "${ac_cv_path_BUILD_CXX+set}" = set; then : 1.995 +if ${ac_cv_path_BUILD_CXX+:} false; then : 1.996 $as_echo_n "(cached) " >&6 1.997 else 1.998 case $BUILD_CXX in 1.999 @@ -17387,7 +17410,7 @@ 1.1000 set dummy ld; ac_word=$2 1.1001 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1002 $as_echo_n "checking for $ac_word... " >&6; } 1.1003 -if test "${ac_cv_path_BUILD_LD+set}" = set; then : 1.1004 +if ${ac_cv_path_BUILD_LD+:} false; then : 1.1005 $as_echo_n "(cached) " >&6 1.1006 else 1.1007 case $BUILD_LD in 1.1008 @@ -17899,7 +17922,7 @@ 1.1009 set dummy $ac_prog; ac_word=$2 1.1010 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1011 $as_echo_n "checking for $ac_word... " >&6; } 1.1012 -if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then : 1.1013 +if ${ac_cv_path_TOOLS_DIR_CC+:} false; then : 1.1014 $as_echo_n "(cached) " >&6 1.1015 else 1.1016 case $TOOLS_DIR_CC in 1.1017 @@ -17951,7 +17974,7 @@ 1.1018 set dummy $ac_prog; ac_word=$2 1.1019 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1020 $as_echo_n "checking for $ac_word... " >&6; } 1.1021 -if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then : 1.1022 +if ${ac_cv_path_POTENTIAL_CC+:} false; then : 1.1023 $as_echo_n "(cached) " >&6 1.1024 else 1.1025 case $POTENTIAL_CC in 1.1026 @@ -18364,7 +18387,7 @@ 1.1027 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1028 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1029 $as_echo_n "checking for $ac_word... " >&6; } 1.1030 -if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then : 1.1031 +if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then : 1.1032 $as_echo_n "(cached) " >&6 1.1033 else 1.1034 if test -n "$PROPER_COMPILER_CC"; then 1.1035 @@ -18408,7 +18431,7 @@ 1.1036 set dummy $ac_prog; ac_word=$2 1.1037 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1038 $as_echo_n "checking for $ac_word... " >&6; } 1.1039 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then : 1.1040 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then : 1.1041 $as_echo_n "(cached) " >&6 1.1042 else 1.1043 if test -n "$ac_ct_PROPER_COMPILER_CC"; then 1.1044 @@ -18858,7 +18881,7 @@ 1.1045 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1046 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1047 $as_echo_n "checking for $ac_word... " >&6; } 1.1048 -if test "${ac_cv_prog_CC+set}" = set; then : 1.1049 +if ${ac_cv_prog_CC+:} false; then : 1.1050 $as_echo_n "(cached) " >&6 1.1051 else 1.1052 if test -n "$CC"; then 1.1053 @@ -18902,7 +18925,7 @@ 1.1054 set dummy $ac_prog; ac_word=$2 1.1055 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1056 $as_echo_n "checking for $ac_word... " >&6; } 1.1057 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 1.1058 +if ${ac_cv_prog_ac_ct_CC+:} false; then : 1.1059 $as_echo_n "(cached) " >&6 1.1060 else 1.1061 if test -n "$ac_ct_CC"; then 1.1062 @@ -18955,7 +18978,7 @@ 1.1063 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1064 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1065 as_fn_error $? "no acceptable C compiler found in \$PATH 1.1066 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1067 +See \`config.log' for more details" "$LINENO" 5; } 1.1068 1.1069 # Provide some information about the compiler. 1.1070 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 1.1071 @@ -19070,7 +19093,7 @@ 1.1072 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1073 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1074 as_fn_error 77 "C compiler cannot create executables 1.1075 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1076 +See \`config.log' for more details" "$LINENO" 5; } 1.1077 else 1.1078 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 1.1079 $as_echo "yes" >&6; } 1.1080 @@ -19113,7 +19136,7 @@ 1.1081 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1082 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1083 as_fn_error $? "cannot compute suffix of executables: cannot compile and link 1.1084 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1085 +See \`config.log' for more details" "$LINENO" 5; } 1.1086 fi 1.1087 rm -f conftest conftest$ac_cv_exeext 1.1088 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 1.1089 @@ -19172,7 +19195,7 @@ 1.1090 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1091 as_fn_error $? "cannot run C compiled programs. 1.1092 If you meant to cross compile, use \`--host'. 1.1093 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1094 +See \`config.log' for more details" "$LINENO" 5; } 1.1095 fi 1.1096 fi 1.1097 fi 1.1098 @@ -19183,7 +19206,7 @@ 1.1099 ac_clean_files=$ac_clean_files_save 1.1100 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 1.1101 $as_echo_n "checking for suffix of object files... " >&6; } 1.1102 -if test "${ac_cv_objext+set}" = set; then : 1.1103 +if ${ac_cv_objext+:} false; then : 1.1104 $as_echo_n "(cached) " >&6 1.1105 else 1.1106 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1107 @@ -19224,7 +19247,7 @@ 1.1108 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1109 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1110 as_fn_error $? "cannot compute suffix of object files: cannot compile 1.1111 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1112 +See \`config.log' for more details" "$LINENO" 5; } 1.1113 fi 1.1114 rm -f conftest.$ac_cv_objext conftest.$ac_ext 1.1115 fi 1.1116 @@ -19234,7 +19257,7 @@ 1.1117 ac_objext=$OBJEXT 1.1118 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 1.1119 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 1.1120 -if test "${ac_cv_c_compiler_gnu+set}" = set; then : 1.1121 +if ${ac_cv_c_compiler_gnu+:} false; then : 1.1122 $as_echo_n "(cached) " >&6 1.1123 else 1.1124 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1125 @@ -19271,7 +19294,7 @@ 1.1126 ac_save_CFLAGS=$CFLAGS 1.1127 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 1.1128 $as_echo_n "checking whether $CC accepts -g... " >&6; } 1.1129 -if test "${ac_cv_prog_cc_g+set}" = set; then : 1.1130 +if ${ac_cv_prog_cc_g+:} false; then : 1.1131 $as_echo_n "(cached) " >&6 1.1132 else 1.1133 ac_save_c_werror_flag=$ac_c_werror_flag 1.1134 @@ -19349,7 +19372,7 @@ 1.1135 fi 1.1136 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 1.1137 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 1.1138 -if test "${ac_cv_prog_cc_c89+set}" = set; then : 1.1139 +if ${ac_cv_prog_cc_c89+:} false; then : 1.1140 $as_echo_n "(cached) " >&6 1.1141 else 1.1142 ac_cv_prog_cc_c89=no 1.1143 @@ -19468,7 +19491,7 @@ 1.1144 set dummy $ac_prog; ac_word=$2 1.1145 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1146 $as_echo_n "checking for $ac_word... " >&6; } 1.1147 -if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then : 1.1148 +if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then : 1.1149 $as_echo_n "(cached) " >&6 1.1150 else 1.1151 case $TOOLS_DIR_CXX in 1.1152 @@ -19520,7 +19543,7 @@ 1.1153 set dummy $ac_prog; ac_word=$2 1.1154 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1155 $as_echo_n "checking for $ac_word... " >&6; } 1.1156 -if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then : 1.1157 +if ${ac_cv_path_POTENTIAL_CXX+:} false; then : 1.1158 $as_echo_n "(cached) " >&6 1.1159 else 1.1160 case $POTENTIAL_CXX in 1.1161 @@ -19933,7 +19956,7 @@ 1.1162 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1163 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1164 $as_echo_n "checking for $ac_word... " >&6; } 1.1165 -if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then : 1.1166 +if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then : 1.1167 $as_echo_n "(cached) " >&6 1.1168 else 1.1169 if test -n "$PROPER_COMPILER_CXX"; then 1.1170 @@ -19977,7 +20000,7 @@ 1.1171 set dummy $ac_prog; ac_word=$2 1.1172 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1173 $as_echo_n "checking for $ac_word... " >&6; } 1.1174 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then : 1.1175 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then : 1.1176 $as_echo_n "(cached) " >&6 1.1177 else 1.1178 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then 1.1179 @@ -20431,7 +20454,7 @@ 1.1180 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1181 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1182 $as_echo_n "checking for $ac_word... " >&6; } 1.1183 -if test "${ac_cv_prog_CXX+set}" = set; then : 1.1184 +if ${ac_cv_prog_CXX+:} false; then : 1.1185 $as_echo_n "(cached) " >&6 1.1186 else 1.1187 if test -n "$CXX"; then 1.1188 @@ -20475,7 +20498,7 @@ 1.1189 set dummy $ac_prog; ac_word=$2 1.1190 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1191 $as_echo_n "checking for $ac_word... " >&6; } 1.1192 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : 1.1193 +if ${ac_cv_prog_ac_ct_CXX+:} false; then : 1.1194 $as_echo_n "(cached) " >&6 1.1195 else 1.1196 if test -n "$ac_ct_CXX"; then 1.1197 @@ -20553,7 +20576,7 @@ 1.1198 1.1199 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 1.1200 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } 1.1201 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : 1.1202 +if ${ac_cv_cxx_compiler_gnu+:} false; then : 1.1203 $as_echo_n "(cached) " >&6 1.1204 else 1.1205 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1206 @@ -20590,7 +20613,7 @@ 1.1207 ac_save_CXXFLAGS=$CXXFLAGS 1.1208 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 1.1209 $as_echo_n "checking whether $CXX accepts -g... " >&6; } 1.1210 -if test "${ac_cv_prog_cxx_g+set}" = set; then : 1.1211 +if ${ac_cv_prog_cxx_g+:} false; then : 1.1212 $as_echo_n "(cached) " >&6 1.1213 else 1.1214 ac_save_cxx_werror_flag=$ac_cxx_werror_flag 1.1215 @@ -20688,7 +20711,7 @@ 1.1216 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1217 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1218 $as_echo_n "checking for $ac_word... " >&6; } 1.1219 -if test "${ac_cv_prog_OBJC+set}" = set; then : 1.1220 +if ${ac_cv_prog_OBJC+:} false; then : 1.1221 $as_echo_n "(cached) " >&6 1.1222 else 1.1223 if test -n "$OBJC"; then 1.1224 @@ -20732,7 +20755,7 @@ 1.1225 set dummy $ac_prog; ac_word=$2 1.1226 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1227 $as_echo_n "checking for $ac_word... " >&6; } 1.1228 -if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then : 1.1229 +if ${ac_cv_prog_ac_ct_OBJC+:} false; then : 1.1230 $as_echo_n "(cached) " >&6 1.1231 else 1.1232 if test -n "$ac_ct_OBJC"; then 1.1233 @@ -20808,7 +20831,7 @@ 1.1234 1.1235 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 1.1236 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } 1.1237 -if test "${ac_cv_objc_compiler_gnu+set}" = set; then : 1.1238 +if ${ac_cv_objc_compiler_gnu+:} false; then : 1.1239 $as_echo_n "(cached) " >&6 1.1240 else 1.1241 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1242 @@ -20845,7 +20868,7 @@ 1.1243 ac_save_OBJCFLAGS=$OBJCFLAGS 1.1244 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 1.1245 $as_echo_n "checking whether $OBJC accepts -g... " >&6; } 1.1246 -if test "${ac_cv_prog_objc_g+set}" = set; then : 1.1247 +if ${ac_cv_prog_objc_g+:} false; then : 1.1248 $as_echo_n "(cached) " >&6 1.1249 else 1.1250 ac_save_objc_werror_flag=$ac_objc_werror_flag 1.1251 @@ -21221,7 +21244,7 @@ 1.1252 set dummy ${ac_tool_prefix}ar; ac_word=$2 1.1253 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1254 $as_echo_n "checking for $ac_word... " >&6; } 1.1255 -if test "${ac_cv_prog_AR+set}" = set; then : 1.1256 +if ${ac_cv_prog_AR+:} false; then : 1.1257 $as_echo_n "(cached) " >&6 1.1258 else 1.1259 if test -n "$AR"; then 1.1260 @@ -21261,7 +21284,7 @@ 1.1261 set dummy ar; ac_word=$2 1.1262 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1263 $as_echo_n "checking for $ac_word... " >&6; } 1.1264 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 1.1265 +if ${ac_cv_prog_ac_ct_AR+:} false; then : 1.1266 $as_echo_n "(cached) " >&6 1.1267 else 1.1268 if test -n "$ac_ct_AR"; then 1.1269 @@ -21603,7 +21626,7 @@ 1.1270 set dummy link; ac_word=$2 1.1271 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1272 $as_echo_n "checking for $ac_word... " >&6; } 1.1273 -if test "${ac_cv_prog_WINLD+set}" = set; then : 1.1274 +if ${ac_cv_prog_WINLD+:} false; then : 1.1275 $as_echo_n "(cached) " >&6 1.1276 else 1.1277 if test -n "$WINLD"; then 1.1278 @@ -21942,7 +21965,7 @@ 1.1279 set dummy mt; ac_word=$2 1.1280 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1281 $as_echo_n "checking for $ac_word... " >&6; } 1.1282 -if test "${ac_cv_prog_MT+set}" = set; then : 1.1283 +if ${ac_cv_prog_MT+:} false; then : 1.1284 $as_echo_n "(cached) " >&6 1.1285 else 1.1286 if test -n "$MT"; then 1.1287 @@ -22263,7 +22286,7 @@ 1.1288 set dummy rc; ac_word=$2 1.1289 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1290 $as_echo_n "checking for $ac_word... " >&6; } 1.1291 -if test "${ac_cv_prog_RC+set}" = set; then : 1.1292 +if ${ac_cv_prog_RC+:} false; then : 1.1293 $as_echo_n "(cached) " >&6 1.1294 else 1.1295 if test -n "$RC"; then 1.1296 @@ -22654,7 +22677,7 @@ 1.1297 set dummy lib; ac_word=$2 1.1298 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1299 $as_echo_n "checking for $ac_word... " >&6; } 1.1300 -if test "${ac_cv_prog_WINAR+set}" = set; then : 1.1301 +if ${ac_cv_prog_WINAR+:} false; then : 1.1302 $as_echo_n "(cached) " >&6 1.1303 else 1.1304 if test -n "$WINAR"; then 1.1305 @@ -22960,7 +22983,7 @@ 1.1306 set dummy dumpbin; ac_word=$2 1.1307 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1308 $as_echo_n "checking for $ac_word... " >&6; } 1.1309 -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : 1.1310 +if ${ac_cv_prog_DUMPBIN+:} false; then : 1.1311 $as_echo_n "(cached) " >&6 1.1312 else 1.1313 if test -n "$DUMPBIN"; then 1.1314 @@ -23279,7 +23302,7 @@ 1.1315 CPP= 1.1316 fi 1.1317 if test -z "$CPP"; then 1.1318 - if test "${ac_cv_prog_CPP+set}" = set; then : 1.1319 + if ${ac_cv_prog_CPP+:} false; then : 1.1320 $as_echo_n "(cached) " >&6 1.1321 else 1.1322 # Double quotes because CPP needs to be expanded 1.1323 @@ -23395,7 +23418,7 @@ 1.1324 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1325 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1326 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 1.1327 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1328 +See \`config.log' for more details" "$LINENO" 5; } 1.1329 fi 1.1330 1.1331 ac_ext=cpp 1.1332 @@ -23679,7 +23702,7 @@ 1.1333 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 1.1334 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } 1.1335 if test -z "$CXXCPP"; then 1.1336 - if test "${ac_cv_prog_CXXCPP+set}" = set; then : 1.1337 + if ${ac_cv_prog_CXXCPP+:} false; then : 1.1338 $as_echo_n "(cached) " >&6 1.1339 else 1.1340 # Double quotes because CXXCPP needs to be expanded 1.1341 @@ -23795,7 +23818,7 @@ 1.1342 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1343 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1344 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check 1.1345 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1346 +See \`config.log' for more details" "$LINENO" 5; } 1.1347 fi 1.1348 1.1349 ac_ext=cpp 1.1350 @@ -24097,7 +24120,7 @@ 1.1351 set dummy as; ac_word=$2 1.1352 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1353 $as_echo_n "checking for $ac_word... " >&6; } 1.1354 -if test "${ac_cv_path_AS+set}" = set; then : 1.1355 +if ${ac_cv_path_AS+:} false; then : 1.1356 $as_echo_n "(cached) " >&6 1.1357 else 1.1358 case $AS in 1.1359 @@ -24411,7 +24434,7 @@ 1.1360 set dummy $ac_prog; ac_word=$2 1.1361 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1362 $as_echo_n "checking for $ac_word... " >&6; } 1.1363 -if test "${ac_cv_path_NM+set}" = set; then : 1.1364 +if ${ac_cv_path_NM+:} false; then : 1.1365 $as_echo_n "(cached) " >&6 1.1366 else 1.1367 case $NM in 1.1368 @@ -24720,7 +24743,7 @@ 1.1369 set dummy strip; ac_word=$2 1.1370 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1371 $as_echo_n "checking for $ac_word... " >&6; } 1.1372 -if test "${ac_cv_path_STRIP+set}" = set; then : 1.1373 +if ${ac_cv_path_STRIP+:} false; then : 1.1374 $as_echo_n "(cached) " >&6 1.1375 else 1.1376 case $STRIP in 1.1377 @@ -25026,7 +25049,7 @@ 1.1378 set dummy mcs; ac_word=$2 1.1379 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1380 $as_echo_n "checking for $ac_word... " >&6; } 1.1381 -if test "${ac_cv_path_MCS+set}" = set; then : 1.1382 +if ${ac_cv_path_MCS+:} false; then : 1.1383 $as_echo_n "(cached) " >&6 1.1384 else 1.1385 case $MCS in 1.1386 @@ -25334,7 +25357,7 @@ 1.1387 set dummy ${ac_tool_prefix}nm; ac_word=$2 1.1388 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1389 $as_echo_n "checking for $ac_word... " >&6; } 1.1390 -if test "${ac_cv_prog_NM+set}" = set; then : 1.1391 +if ${ac_cv_prog_NM+:} false; then : 1.1392 $as_echo_n "(cached) " >&6 1.1393 else 1.1394 if test -n "$NM"; then 1.1395 @@ -25374,7 +25397,7 @@ 1.1396 set dummy nm; ac_word=$2 1.1397 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1398 $as_echo_n "checking for $ac_word... " >&6; } 1.1399 -if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : 1.1400 +if ${ac_cv_prog_ac_ct_NM+:} false; then : 1.1401 $as_echo_n "(cached) " >&6 1.1402 else 1.1403 if test -n "$ac_ct_NM"; then 1.1404 @@ -25692,7 +25715,7 @@ 1.1405 set dummy ${ac_tool_prefix}strip; ac_word=$2 1.1406 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1407 $as_echo_n "checking for $ac_word... " >&6; } 1.1408 -if test "${ac_cv_prog_STRIP+set}" = set; then : 1.1409 +if ${ac_cv_prog_STRIP+:} false; then : 1.1410 $as_echo_n "(cached) " >&6 1.1411 else 1.1412 if test -n "$STRIP"; then 1.1413 @@ -25732,7 +25755,7 @@ 1.1414 set dummy strip; ac_word=$2 1.1415 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1416 $as_echo_n "checking for $ac_word... " >&6; } 1.1417 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : 1.1418 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : 1.1419 $as_echo_n "(cached) " >&6 1.1420 else 1.1421 if test -n "$ac_ct_STRIP"; then 1.1422 @@ -26057,7 +26080,7 @@ 1.1423 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1424 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1425 $as_echo_n "checking for $ac_word... " >&6; } 1.1426 -if test "${ac_cv_prog_OBJCOPY+set}" = set; then : 1.1427 +if ${ac_cv_prog_OBJCOPY+:} false; then : 1.1428 $as_echo_n "(cached) " >&6 1.1429 else 1.1430 if test -n "$OBJCOPY"; then 1.1431 @@ -26101,7 +26124,7 @@ 1.1432 set dummy $ac_prog; ac_word=$2 1.1433 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1434 $as_echo_n "checking for $ac_word... " >&6; } 1.1435 -if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then : 1.1436 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then : 1.1437 $as_echo_n "(cached) " >&6 1.1438 else 1.1439 if test -n "$ac_ct_OBJCOPY"; then 1.1440 @@ -26428,7 +26451,7 @@ 1.1441 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1442 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1443 $as_echo_n "checking for $ac_word... " >&6; } 1.1444 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : 1.1445 +if ${ac_cv_prog_OBJDUMP+:} false; then : 1.1446 $as_echo_n "(cached) " >&6 1.1447 else 1.1448 if test -n "$OBJDUMP"; then 1.1449 @@ -26472,7 +26495,7 @@ 1.1450 set dummy $ac_prog; ac_word=$2 1.1451 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1452 $as_echo_n "checking for $ac_word... " >&6; } 1.1453 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : 1.1454 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : 1.1455 $as_echo_n "(cached) " >&6 1.1456 else 1.1457 if test -n "$ac_ct_OBJDUMP"; then 1.1458 @@ -26796,7 +26819,7 @@ 1.1459 set dummy lipo; ac_word=$2 1.1460 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1461 $as_echo_n "checking for $ac_word... " >&6; } 1.1462 -if test "${ac_cv_path_LIPO+set}" = set; then : 1.1463 +if ${ac_cv_path_LIPO+:} false; then : 1.1464 $as_echo_n "(cached) " >&6 1.1465 else 1.1466 case $LIPO in 1.1467 @@ -27111,7 +27134,7 @@ 1.1468 1.1469 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 1.1470 $as_echo_n "checking for ANSI C header files... " >&6; } 1.1471 -if test "${ac_cv_header_stdc+set}" = set; then : 1.1472 +if ${ac_cv_header_stdc+:} false; then : 1.1473 $as_echo_n "(cached) " >&6 1.1474 else 1.1475 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1476 @@ -27287,7 +27310,7 @@ 1.1477 for ac_header in stdio.h 1.1478 do : 1.1479 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" 1.1480 -if test "x$ac_cv_header_stdio_h" = x""yes; then : 1.1481 +if test "x$ac_cv_header_stdio_h" = xyes; then : 1.1482 cat >>confdefs.h <<_ACEOF 1.1483 #define HAVE_STDIO_H 1 1.1484 _ACEOF 1.1485 @@ -27316,7 +27339,7 @@ 1.1486 # This bug is HP SR number 8606223364. 1.1487 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 1.1488 $as_echo_n "checking size of int *... " >&6; } 1.1489 -if test "${ac_cv_sizeof_int_p+set}" = set; then : 1.1490 +if ${ac_cv_sizeof_int_p+:} false; then : 1.1491 $as_echo_n "(cached) " >&6 1.1492 else 1.1493 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : 1.1494 @@ -27326,7 +27349,7 @@ 1.1495 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1496 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1497 as_fn_error 77 "cannot compute sizeof (int *) 1.1498 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1499 +See \`config.log' for more details" "$LINENO" 5; } 1.1500 else 1.1501 ac_cv_sizeof_int_p=0 1.1502 fi 1.1503 @@ -27373,7 +27396,7 @@ 1.1504 # 1.1505 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 1.1506 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } 1.1507 -if test "${ac_cv_c_bigendian+set}" = set; then : 1.1508 +if ${ac_cv_c_bigendian+:} false; then : 1.1509 $as_echo_n "(cached) " >&6 1.1510 else 1.1511 ac_cv_c_bigendian=unknown 1.1512 @@ -28105,11 +28128,14 @@ 1.1513 1.1514 # On some platforms (mac) the linker warns about non existing -L dirs. 1.1515 # Add server first if available. Linking aginst client does not always produce the same results. 1.1516 - # Only add client dir if client is being built. Default to server for other variants. 1.1517 + # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1. 1.1518 + # Default to server for other variants. 1.1519 if test "x$JVM_VARIANT_SERVER" = xtrue; then 1.1520 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" 1.1521 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then 1.1522 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client" 1.1523 + elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 1.1524 + LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal" 1.1525 else 1.1526 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" 1.1527 fi 1.1528 @@ -28370,8 +28396,8 @@ 1.1529 have_x=disabled 1.1530 else 1.1531 case $x_includes,$x_libraries in #( 1.1532 - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( 1.1533 - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : 1.1534 + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( 1.1535 + *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : 1.1536 $as_echo_n "(cached) " >&6 1.1537 else 1.1538 # One or both of the vars are not set, and there is no cached value. 1.1539 @@ -28648,7 +28674,7 @@ 1.1540 else 1.1541 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 1.1542 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } 1.1543 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : 1.1544 +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : 1.1545 $as_echo_n "(cached) " >&6 1.1546 else 1.1547 ac_check_lib_save_LIBS=$LIBS 1.1548 @@ -28682,14 +28708,14 @@ 1.1549 fi 1.1550 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 1.1551 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } 1.1552 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : 1.1553 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : 1.1554 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 1.1555 fi 1.1556 1.1557 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 1.1558 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 1.1559 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } 1.1560 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : 1.1561 +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : 1.1562 $as_echo_n "(cached) " >&6 1.1563 else 1.1564 ac_check_lib_save_LIBS=$LIBS 1.1565 @@ -28723,7 +28749,7 @@ 1.1566 fi 1.1567 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 1.1568 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } 1.1569 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : 1.1570 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : 1.1571 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 1.1572 fi 1.1573 1.1574 @@ -28742,14 +28768,14 @@ 1.1575 # The functions gethostbyname, getservbyname, and inet_addr are 1.1576 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. 1.1577 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" 1.1578 -if test "x$ac_cv_func_gethostbyname" = x""yes; then : 1.1579 +if test "x$ac_cv_func_gethostbyname" = xyes; then : 1.1580 1.1581 fi 1.1582 1.1583 if test $ac_cv_func_gethostbyname = no; then 1.1584 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 1.1585 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } 1.1586 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : 1.1587 +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : 1.1588 $as_echo_n "(cached) " >&6 1.1589 else 1.1590 ac_check_lib_save_LIBS=$LIBS 1.1591 @@ -28783,14 +28809,14 @@ 1.1592 fi 1.1593 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 1.1594 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } 1.1595 -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : 1.1596 +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : 1.1597 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 1.1598 fi 1.1599 1.1600 if test $ac_cv_lib_nsl_gethostbyname = no; then 1.1601 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 1.1602 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } 1.1603 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : 1.1604 +if ${ac_cv_lib_bsd_gethostbyname+:} false; then : 1.1605 $as_echo_n "(cached) " >&6 1.1606 else 1.1607 ac_check_lib_save_LIBS=$LIBS 1.1608 @@ -28824,7 +28850,7 @@ 1.1609 fi 1.1610 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 1.1611 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } 1.1612 -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : 1.1613 +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : 1.1614 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" 1.1615 fi 1.1616 1.1617 @@ -28839,14 +28865,14 @@ 1.1618 # must be given before -lnsl if both are needed. We assume that 1.1619 # if connect needs -lnsl, so does gethostbyname. 1.1620 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect" 1.1621 -if test "x$ac_cv_func_connect" = x""yes; then : 1.1622 +if test "x$ac_cv_func_connect" = xyes; then : 1.1623 1.1624 fi 1.1625 1.1626 if test $ac_cv_func_connect = no; then 1.1627 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 1.1628 $as_echo_n "checking for connect in -lsocket... " >&6; } 1.1629 -if test "${ac_cv_lib_socket_connect+set}" = set; then : 1.1630 +if ${ac_cv_lib_socket_connect+:} false; then : 1.1631 $as_echo_n "(cached) " >&6 1.1632 else 1.1633 ac_check_lib_save_LIBS=$LIBS 1.1634 @@ -28880,7 +28906,7 @@ 1.1635 fi 1.1636 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 1.1637 $as_echo "$ac_cv_lib_socket_connect" >&6; } 1.1638 -if test "x$ac_cv_lib_socket_connect" = x""yes; then : 1.1639 +if test "x$ac_cv_lib_socket_connect" = xyes; then : 1.1640 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 1.1641 fi 1.1642 1.1643 @@ -28888,14 +28914,14 @@ 1.1644 1.1645 # Guillermo Gomez says -lposix is necessary on A/UX. 1.1646 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove" 1.1647 -if test "x$ac_cv_func_remove" = x""yes; then : 1.1648 +if test "x$ac_cv_func_remove" = xyes; then : 1.1649 1.1650 fi 1.1651 1.1652 if test $ac_cv_func_remove = no; then 1.1653 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 1.1654 $as_echo_n "checking for remove in -lposix... " >&6; } 1.1655 -if test "${ac_cv_lib_posix_remove+set}" = set; then : 1.1656 +if ${ac_cv_lib_posix_remove+:} false; then : 1.1657 $as_echo_n "(cached) " >&6 1.1658 else 1.1659 ac_check_lib_save_LIBS=$LIBS 1.1660 @@ -28929,7 +28955,7 @@ 1.1661 fi 1.1662 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 1.1663 $as_echo "$ac_cv_lib_posix_remove" >&6; } 1.1664 -if test "x$ac_cv_lib_posix_remove" = x""yes; then : 1.1665 +if test "x$ac_cv_lib_posix_remove" = xyes; then : 1.1666 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 1.1667 fi 1.1668 1.1669 @@ -28937,14 +28963,14 @@ 1.1670 1.1671 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 1.1672 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat" 1.1673 -if test "x$ac_cv_func_shmat" = x""yes; then : 1.1674 +if test "x$ac_cv_func_shmat" = xyes; then : 1.1675 1.1676 fi 1.1677 1.1678 if test $ac_cv_func_shmat = no; then 1.1679 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 1.1680 $as_echo_n "checking for shmat in -lipc... " >&6; } 1.1681 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then : 1.1682 +if ${ac_cv_lib_ipc_shmat+:} false; then : 1.1683 $as_echo_n "(cached) " >&6 1.1684 else 1.1685 ac_check_lib_save_LIBS=$LIBS 1.1686 @@ -28978,7 +29004,7 @@ 1.1687 fi 1.1688 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 1.1689 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } 1.1690 -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : 1.1691 +if test "x$ac_cv_lib_ipc_shmat" = xyes; then : 1.1692 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 1.1693 fi 1.1694 1.1695 @@ -28996,7 +29022,7 @@ 1.1696 # John Interrante, Karl Berry 1.1697 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 1.1698 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } 1.1699 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : 1.1700 +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : 1.1701 $as_echo_n "(cached) " >&6 1.1702 else 1.1703 ac_check_lib_save_LIBS=$LIBS 1.1704 @@ -29030,7 +29056,7 @@ 1.1705 fi 1.1706 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 1.1707 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } 1.1708 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : 1.1709 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : 1.1710 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 1.1711 fi 1.1712 1.1713 @@ -30037,7 +30063,7 @@ 1.1714 LDFLAGS="$FREETYPE2_LIBS" 1.1715 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 1.1716 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } 1.1717 -if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then : 1.1718 +if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then : 1.1719 $as_echo_n "(cached) " >&6 1.1720 else 1.1721 ac_check_lib_save_LIBS=$LIBS 1.1722 @@ -30071,7 +30097,7 @@ 1.1723 fi 1.1724 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 1.1725 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } 1.1726 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then : 1.1727 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : 1.1728 FREETYPE2_FOUND=true 1.1729 else 1.1730 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 1.1731 @@ -30359,7 +30385,7 @@ 1.1732 for ac_header in alsa/asoundlib.h 1.1733 do : 1.1734 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" 1.1735 -if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then : 1.1736 +if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then : 1.1737 cat >>confdefs.h <<_ACEOF 1.1738 #define HAVE_ALSA_ASOUNDLIB_H 1 1.1739 _ACEOF 1.1740 @@ -30418,7 +30444,7 @@ 1.1741 USE_EXTERNAL_LIBJPEG=true 1.1742 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5 1.1743 $as_echo_n "checking for main in -ljpeg... " >&6; } 1.1744 -if test "${ac_cv_lib_jpeg_main+set}" = set; then : 1.1745 +if ${ac_cv_lib_jpeg_main+:} false; then : 1.1746 $as_echo_n "(cached) " >&6 1.1747 else 1.1748 ac_check_lib_save_LIBS=$LIBS 1.1749 @@ -30446,7 +30472,7 @@ 1.1750 fi 1.1751 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5 1.1752 $as_echo "$ac_cv_lib_jpeg_main" >&6; } 1.1753 -if test "x$ac_cv_lib_jpeg_main" = x""yes; then : 1.1754 +if test "x$ac_cv_lib_jpeg_main" = xyes; then : 1.1755 cat >>confdefs.h <<_ACEOF 1.1756 #define HAVE_LIBJPEG 1 1.1757 _ACEOF 1.1758 @@ -30470,7 +30496,7 @@ 1.1759 USE_EXTERNAL_LIBJPEG=true 1.1760 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5 1.1761 $as_echo_n "checking for main in -lgif... " >&6; } 1.1762 -if test "${ac_cv_lib_gif_main+set}" = set; then : 1.1763 +if ${ac_cv_lib_gif_main+:} false; then : 1.1764 $as_echo_n "(cached) " >&6 1.1765 else 1.1766 ac_check_lib_save_LIBS=$LIBS 1.1767 @@ -30498,7 +30524,7 @@ 1.1768 fi 1.1769 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5 1.1770 $as_echo "$ac_cv_lib_gif_main" >&6; } 1.1771 -if test "x$ac_cv_lib_gif_main" = x""yes; then : 1.1772 +if test "x$ac_cv_lib_gif_main" = xyes; then : 1.1773 cat >>confdefs.h <<_ACEOF 1.1774 #define HAVE_LIBGIF 1 1.1775 _ACEOF 1.1776 @@ -30528,7 +30554,7 @@ 1.1777 1.1778 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 1.1779 $as_echo_n "checking for compress in -lz... " >&6; } 1.1780 -if test "${ac_cv_lib_z_compress+set}" = set; then : 1.1781 +if ${ac_cv_lib_z_compress+:} false; then : 1.1782 $as_echo_n "(cached) " >&6 1.1783 else 1.1784 ac_check_lib_save_LIBS=$LIBS 1.1785 @@ -30562,7 +30588,7 @@ 1.1786 fi 1.1787 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 1.1788 $as_echo "$ac_cv_lib_z_compress" >&6; } 1.1789 -if test "x$ac_cv_lib_z_compress" = x""yes; then : 1.1790 +if test "x$ac_cv_lib_z_compress" = xyes; then : 1.1791 ZLIB_FOUND=yes 1.1792 else 1.1793 ZLIB_FOUND=no 1.1794 @@ -30655,7 +30681,7 @@ 1.1795 1.1796 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 1.1797 $as_echo_n "checking for cos in -lm... " >&6; } 1.1798 -if test "${ac_cv_lib_m_cos+set}" = set; then : 1.1799 +if ${ac_cv_lib_m_cos+:} false; then : 1.1800 $as_echo_n "(cached) " >&6 1.1801 else 1.1802 ac_check_lib_save_LIBS=$LIBS 1.1803 @@ -30689,7 +30715,7 @@ 1.1804 fi 1.1805 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 1.1806 $as_echo "$ac_cv_lib_m_cos" >&6; } 1.1807 -if test "x$ac_cv_lib_m_cos" = x""yes; then : 1.1808 +if test "x$ac_cv_lib_m_cos" = xyes; then : 1.1809 cat >>confdefs.h <<_ACEOF 1.1810 #define HAVE_LIBM 1 1.1811 _ACEOF 1.1812 @@ -30713,7 +30739,7 @@ 1.1813 LIBS="" 1.1814 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 1.1815 $as_echo_n "checking for dlopen in -ldl... " >&6; } 1.1816 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : 1.1817 +if ${ac_cv_lib_dl_dlopen+:} false; then : 1.1818 $as_echo_n "(cached) " >&6 1.1819 else 1.1820 ac_check_lib_save_LIBS=$LIBS 1.1821 @@ -30747,7 +30773,7 @@ 1.1822 fi 1.1823 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 1.1824 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } 1.1825 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : 1.1826 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : 1.1827 cat >>confdefs.h <<_ACEOF 1.1828 #define HAVE_LIBDL 1 1.1829 _ACEOF 1.1830 @@ -31391,7 +31417,7 @@ 1.1831 set dummy ccache; ac_word=$2 1.1832 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1833 $as_echo_n "checking for $ac_word... " >&6; } 1.1834 -if test "${ac_cv_path_CCACHE+set}" = set; then : 1.1835 +if ${ac_cv_path_CCACHE+:} false; then : 1.1836 $as_echo_n "(cached) " >&6 1.1837 else 1.1838 case $CCACHE in 1.1839 @@ -31642,10 +31668,21 @@ 1.1840 :end' >>confcache 1.1841 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 1.1842 if test -w "$cache_file"; then 1.1843 - test "x$cache_file" != "x/dev/null" && 1.1844 + if test "x$cache_file" != "x/dev/null"; then 1.1845 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 1.1846 $as_echo "$as_me: updating cache $cache_file" >&6;} 1.1847 - cat confcache >$cache_file 1.1848 + if test ! -f "$cache_file" || test -h "$cache_file"; then 1.1849 + cat confcache >"$cache_file" 1.1850 + else 1.1851 + case $cache_file in #( 1.1852 + */* | ?:*) 1.1853 + mv -f confcache "$cache_file"$$ && 1.1854 + mv -f "$cache_file"$$ "$cache_file" ;; #( 1.1855 + *) 1.1856 + mv -f confcache "$cache_file" ;; 1.1857 + esac 1.1858 + fi 1.1859 + fi 1.1860 else 1.1861 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 1.1862 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 1.1863 @@ -31677,7 +31714,7 @@ 1.1864 1.1865 1.1866 1.1867 -: ${CONFIG_STATUS=./config.status} 1.1868 +: "${CONFIG_STATUS=./config.status}" 1.1869 ac_write_fail=0 1.1870 ac_clean_files_save=$ac_clean_files 1.1871 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 1.1872 @@ -31778,6 +31815,7 @@ 1.1873 IFS=" "" $as_nl" 1.1874 1.1875 # Find who we are. Look in the path if we contain no directory separator. 1.1876 +as_myself= 1.1877 case $0 in #(( 1.1878 *[\\/]* ) as_myself=$0 ;; 1.1879 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 1.1880 @@ -32085,7 +32123,7 @@ 1.1881 # values after options handling. 1.1882 ac_log=" 1.1883 This file was extended by OpenJDK $as_me jdk8, which was 1.1884 -generated by GNU Autoconf 2.67. Invocation command line was 1.1885 +generated by GNU Autoconf 2.68. Invocation command line was 1.1886 1.1887 CONFIG_FILES = $CONFIG_FILES 1.1888 CONFIG_HEADERS = $CONFIG_HEADERS 1.1889 @@ -32148,7 +32186,7 @@ 1.1890 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 1.1891 ac_cs_version="\\ 1.1892 OpenJDK config.status jdk8 1.1893 -configured by $0, generated by GNU Autoconf 2.67, 1.1894 +configured by $0, generated by GNU Autoconf 2.68, 1.1895 with options \\"\$ac_cs_config\\" 1.1896 1.1897 Copyright (C) 2010 Free Software Foundation, Inc. 1.1898 @@ -32277,7 +32315,7 @@ 1.1899 "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;; 1.1900 "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;; 1.1901 1.1902 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 1.1903 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 1.1904 esac 1.1905 done 1.1906 1.1907 @@ -32299,9 +32337,10 @@ 1.1908 # after its creation but before its name has been assigned to `$tmp'. 1.1909 $debug || 1.1910 { 1.1911 - tmp= 1.1912 + tmp= ac_tmp= 1.1913 trap 'exit_status=$? 1.1914 - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 1.1915 + : "${ac_tmp:=$tmp}" 1.1916 + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 1.1917 ' 0 1.1918 trap 'as_fn_exit 1' 1 2 13 15 1.1919 } 1.1920 @@ -32309,12 +32348,13 @@ 1.1921 1.1922 { 1.1923 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 1.1924 - test -n "$tmp" && test -d "$tmp" 1.1925 + test -d "$tmp" 1.1926 } || 1.1927 { 1.1928 tmp=./conf$$-$RANDOM 1.1929 (umask 077 && mkdir "$tmp") 1.1930 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 1.1931 +ac_tmp=$tmp 1.1932 1.1933 # Set up the scripts for CONFIG_FILES section. 1.1934 # No need to generate them if there are no CONFIG_FILES. 1.1935 @@ -32336,7 +32376,7 @@ 1.1936 ac_cs_awk_cr=$ac_cr 1.1937 fi 1.1938 1.1939 -echo 'BEGIN {' >"$tmp/subs1.awk" && 1.1940 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 1.1941 _ACEOF 1.1942 1.1943 1.1944 @@ -32364,7 +32404,7 @@ 1.1945 rm -f conf$$subs.sh 1.1946 1.1947 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 1.1948 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 1.1949 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 1.1950 _ACEOF 1.1951 sed -n ' 1.1952 h 1.1953 @@ -32412,7 +32452,7 @@ 1.1954 rm -f conf$$subs.awk 1.1955 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 1.1956 _ACAWK 1.1957 -cat >>"\$tmp/subs1.awk" <<_ACAWK && 1.1958 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 1.1959 for (key in S) S_is_set[key] = 1 1.1960 FS = "" 1.1961 1.1962 @@ -32444,7 +32484,7 @@ 1.1963 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 1.1964 else 1.1965 cat 1.1966 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 1.1967 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 1.1968 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 1.1969 _ACEOF 1.1970 1.1971 @@ -32478,7 +32518,7 @@ 1.1972 # No need to generate them if there are no CONFIG_HEADERS. 1.1973 # This happens for instance with `./config.status Makefile'. 1.1974 if test -n "$CONFIG_HEADERS"; then 1.1975 -cat >"$tmp/defines.awk" <<\_ACAWK || 1.1976 +cat >"$ac_tmp/defines.awk" <<\_ACAWK || 1.1977 BEGIN { 1.1978 _ACEOF 1.1979 1.1980 @@ -32490,8 +32530,8 @@ 1.1981 # handling of long lines. 1.1982 ac_delim='%!_!# ' 1.1983 for ac_last_try in false false :; do 1.1984 - ac_t=`sed -n "/$ac_delim/p" confdefs.h` 1.1985 - if test -z "$ac_t"; then 1.1986 + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 1.1987 + if test -z "$ac_tt"; then 1.1988 break 1.1989 elif $ac_last_try; then 1.1990 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 1.1991 @@ -32592,7 +32632,7 @@ 1.1992 esac 1.1993 case $ac_mode$ac_tag in 1.1994 :[FHL]*:*);; 1.1995 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 1.1996 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 1.1997 :[FH]-) ac_tag=-:-;; 1.1998 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 1.1999 esac 1.2000 @@ -32611,7 +32651,7 @@ 1.2001 for ac_f 1.2002 do 1.2003 case $ac_f in 1.2004 - -) ac_f="$tmp/stdin";; 1.2005 + -) ac_f="$ac_tmp/stdin";; 1.2006 *) # Look for the file first in the build tree, then in the source tree 1.2007 # (if the path is not absolute). The absolute path cannot be DOS-style, 1.2008 # because $ac_f cannot contain `:'. 1.2009 @@ -32620,7 +32660,7 @@ 1.2010 [\\/$]*) false;; 1.2011 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 1.2012 esac || 1.2013 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 1.2014 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 1.2015 esac 1.2016 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 1.2017 as_fn_append ac_file_inputs " '$ac_f'" 1.2018 @@ -32646,8 +32686,8 @@ 1.2019 esac 1.2020 1.2021 case $ac_tag in 1.2022 - *:-:* | *:-) cat >"$tmp/stdin" \ 1.2023 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 1.2024 + *:-:* | *:-) cat >"$ac_tmp/stdin" \ 1.2025 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 1.2026 esac 1.2027 ;; 1.2028 esac 1.2029 @@ -32772,21 +32812,22 @@ 1.2030 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t 1.2031 $ac_datarootdir_hack 1.2032 " 1.2033 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 1.2034 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2035 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ 1.2036 + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2037 1.2038 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 1.2039 - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 1.2040 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 1.2041 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 1.2042 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 1.2043 + "$ac_tmp/out"`; test -z "$ac_out"; } && 1.2044 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 1.2045 which seems to be undefined. Please make sure it is defined" >&5 1.2046 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 1.2047 which seems to be undefined. Please make sure it is defined" >&2;} 1.2048 1.2049 - rm -f "$tmp/stdin" 1.2050 + rm -f "$ac_tmp/stdin" 1.2051 case $ac_file in 1.2052 - -) cat "$tmp/out" && rm -f "$tmp/out";; 1.2053 - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 1.2054 + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 1.2055 + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 1.2056 esac \ 1.2057 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2058 ;; 1.2059 @@ -32797,20 +32838,20 @@ 1.2060 if test x"$ac_file" != x-; then 1.2061 { 1.2062 $as_echo "/* $configure_input */" \ 1.2063 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 1.2064 - } >"$tmp/config.h" \ 1.2065 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 1.2066 + } >"$ac_tmp/config.h" \ 1.2067 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2068 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 1.2069 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 1.2070 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 1.2071 $as_echo "$as_me: $ac_file is unchanged" >&6;} 1.2072 else 1.2073 rm -f "$ac_file" 1.2074 - mv "$tmp/config.h" "$ac_file" \ 1.2075 + mv "$ac_tmp/config.h" "$ac_file" \ 1.2076 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2077 fi 1.2078 else 1.2079 $as_echo "/* $configure_input */" \ 1.2080 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 1.2081 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 1.2082 || as_fn_error $? "could not create -" "$LINENO" 5 1.2083 fi 1.2084 ;;
2.1 --- a/common/autoconf/jdk-options.m4 Wed Dec 19 13:36:21 2012 -0800 2.2 +++ b/common/autoconf/jdk-options.m4 Thu Dec 20 01:44:02 2012 -0500 2.3 @@ -60,28 +60,30 @@ 2.4 # Currently we have: 2.5 # server: normal interpreter and a tiered C1/C2 compiler 2.6 # client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms) 2.7 +# minimal1: reduced form of client with optional VM services and features stripped out 2.8 # kernel: kernel footprint JVM that passes the TCK without major performance problems, 2.9 # ie normal interpreter and C1, only the serial GC, kernel jvmti etc 2.10 # zero: no machine code interpreter, no compiler 2.11 # zeroshark: zero interpreter and shark/llvm compiler backend 2.12 AC_MSG_CHECKING([which variants of the JVM to build]) 2.13 AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants], 2.14 - [JVM variants (separated by commas) to build (server, client, kernel, zero, zeroshark) @<:@server@:>@])]) 2.15 + [JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark) @<:@server@:>@])]) 2.16 2.17 if test "x$with_jvm_variants" = x; then 2.18 with_jvm_variants="server" 2.19 fi 2.20 2.21 JVM_VARIANTS=",$with_jvm_variants," 2.22 -TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//'` 2.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,//'` 2.24 2.25 if test "x$TEST_VARIANTS" != "x,"; then 2.26 - AC_MSG_ERROR([The available JVM variants are: server, client, kernel, zero, zeroshark]) 2.27 + AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark]) 2.28 fi 2.29 AC_MSG_RESULT([$with_jvm_variants]) 2.30 2.31 JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'` 2.32 JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'` 2.33 +JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'` 2.34 JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'` 2.35 JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'` 2.36 JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` 2.37 @@ -96,10 +98,15 @@ 2.38 AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.]) 2.39 fi 2.40 fi 2.41 +if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 2.42 + if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 2.43 + AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.]) 2.44 + fi 2.45 +fi 2.46 2.47 # Replace the commas with AND for use in the build directory name. 2.48 ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` 2.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/'` 2.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/'` 2.51 if test "x$COUNT_VARIANTS" != "x,1"; then 2.52 BUILDING_MULTIPLE_JVM_VARIANTS=yes 2.53 else 2.54 @@ -109,6 +116,7 @@ 2.55 AC_SUBST(JVM_VARIANTS) 2.56 AC_SUBST(JVM_VARIANT_SERVER) 2.57 AC_SUBST(JVM_VARIANT_CLIENT) 2.58 +AC_SUBST(JVM_VARIANT_MINIMAL1) 2.59 AC_SUBST(JVM_VARIANT_KERNEL) 2.60 AC_SUBST(JVM_VARIANT_ZERO) 2.61 AC_SUBST(JVM_VARIANT_ZEROSHARK) 2.62 @@ -191,7 +199,9 @@ 2.63 ##### 2.64 # Generate the legacy makefile targets for hotspot. 2.65 # The hotspot api for selecting the build artifacts, really, needs to be improved. 2.66 -# 2.67 +# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to 2.68 +# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc 2.69 +# But until then ... 2.70 HOTSPOT_TARGET="" 2.71 2.72 if test "x$JVM_VARIANT_SERVER" = xtrue; then 2.73 @@ -202,6 +212,10 @@ 2.74 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 " 2.75 fi 2.76 2.77 +if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 2.78 + HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 " 2.79 +fi 2.80 + 2.81 if test "x$JVM_VARIANT_KERNEL" = xtrue; then 2.82 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel " 2.83 fi
3.1 --- a/common/autoconf/spec.gmk.in Wed Dec 19 13:36:21 2012 -0800 3.2 +++ b/common/autoconf/spec.gmk.in Thu Dec 20 01:44:02 2012 -0500 3.3 @@ -185,11 +185,12 @@ 3.4 3.5 # These are the libjvms that we want to build. 3.6 # The java launcher uses the default. 3.7 -# The other can be selected by specifying -client -server -kernel -zero or -zeroshark 3.8 +# The others can be selected by specifying -client -server -minimal1 -kernel -zero or -zeroshark 3.9 # on the java launcher command line. 3.10 JVM_VARIANTS:=@JVM_VARIANTS@ 3.11 JVM_VARIANT_SERVER:=@JVM_VARIANT_SERVER@ 3.12 JVM_VARIANT_CLIENT:=@JVM_VARIANT_CLIENT@ 3.13 +JVM_VARIANT_MINIMAL1:=@JVM_VARIANT_MINIMAL1@ 3.14 JVM_VARIANT_KERNEL:=@JVM_VARIANT_KERNEL@ 3.15 JVM_VARIANT_ZERO:=@JVM_VARIANT_ZERO@ 3.16 JVM_VARIANT_ZEROSHARK:=@JVM_VARIANT_ZEROSHARK@
4.1 --- a/common/autoconf/toolchain.m4 Wed Dec 19 13:36:21 2012 -0800 4.2 +++ b/common/autoconf/toolchain.m4 Thu Dec 20 01:44:02 2012 -0500 4.3 @@ -954,11 +954,14 @@ 4.4 4.5 # On some platforms (mac) the linker warns about non existing -L dirs. 4.6 # Add server first if available. Linking aginst client does not always produce the same results. 4.7 - # Only add client dir if client is being built. Default to server for other variants. 4.8 + # Only add client dir if client is being built. Add minimal (note not minimal1) if only building minimal1. 4.9 + # Default to server for other variants. 4.10 if test "x$JVM_VARIANT_SERVER" = xtrue; then 4.11 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" 4.12 elif test "x$JVM_VARIANT_CLIENT" = xtrue; then 4.13 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/client" 4.14 + elif test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 4.15 + LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/minimal" 4.16 else 4.17 LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L${JDK_OUTPUTDIR}/lib${OPENJDK_TARGET_CPU_LIBDIR}/server" 4.18 fi
