Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Fri, 22 Feb 2013 13:09:37 -0400
- author
- jlaskey
- date
- Fri, 22 Feb 2013 13:09:37 -0400
- changeset 883
- e877cb3eb4d6
- parent 882
- 887fde71977e
- parent 644
- b70196e01c53
- child 884
- 528a9984198f
Merge
1.1 --- a/.hgtags Thu Feb 21 15:25:31 2013 -0400 1.2 +++ b/.hgtags Fri Feb 22 13:09:37 2013 -0400 1.3 @@ -196,3 +196,6 @@ 1.4 c1be681d80a1f1c848dc671d664fccb19e046a12 jdk8-b72 1.5 93b9664f97eeb6f89397a8842318ebacaac9feb9 jdk8-b73 1.6 b43aa5bd8ca5c8121336495382d35ecfa7a71536 jdk8-b74 1.7 +2a713921952cbd77a1e699626976cb6cdfe3e57e jdk8-b75 1.8 +278af9fc67e7eba2884936b49ec07345f423aabb jdk8-b76 1.9 +3933eebc659d58c597aa8cb4b3e58f2250ce3e1a jdk8-b77
2.1 --- a/NewMakefile.gmk Thu Feb 21 15:25:31 2013 -0400 2.2 +++ b/NewMakefile.gmk Fri Feb 22 13:09:37 2013 -0400 2.3 @@ -96,6 +96,7 @@ 2.4 $(info . make all # Compile everything, all repos and images) 2.5 $(info . make images # Create complete j2sdk and j2re images) 2.6 $(info . make overlay-images # Create limited images for sparc 64 bit platforms) 2.7 + $(info . make profiles # Create complete j2re compact profile images) 2.8 $(info . make bootcycle-images # Build images twice, second time with newly build JDK) 2.9 $(info . make install # Install the generated images locally) 2.10 $(info . make clean # Remove all files generated by make, but not those)
3.1 --- a/common/autoconf/generated-configure.sh Thu Feb 21 15:25:31 2013 -0400 3.2 +++ b/common/autoconf/generated-configure.sh Fri Feb 22 13:09:37 2013 -0400 3.3 @@ -1,6 +1,6 @@ 3.4 #! /bin/sh 3.5 # Guess values for system-dependent variables and create Makefiles. 3.6 -# Generated by GNU Autoconf 2.67 for OpenJDK jdk8. 3.7 +# Generated by GNU Autoconf 2.68 for OpenJDK jdk8. 3.8 # 3.9 # Report bugs to <build-dev@openjdk.java.net>. 3.10 # 3.11 @@ -91,6 +91,7 @@ 3.12 IFS=" "" $as_nl" 3.13 3.14 # Find who we are. Look in the path if we contain no directory separator. 3.15 +as_myself= 3.16 case $0 in #(( 3.17 *[\\/]* ) as_myself=$0 ;; 3.18 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.19 @@ -216,11 +217,18 @@ 3.20 # We cannot yet assume a decent shell, so we have to provide a 3.21 # neutralization value for shells without unset; and this also 3.22 # works around shells that cannot unset nonexistent variables. 3.23 + # Preserve -v and -x to the replacement shell. 3.24 BASH_ENV=/dev/null 3.25 ENV=/dev/null 3.26 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 3.27 export CONFIG_SHELL 3.28 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 3.29 + case $- in # (((( 3.30 + *v*x* | *x*v* ) as_opts=-vx ;; 3.31 + *v* ) as_opts=-v ;; 3.32 + *x* ) as_opts=-x ;; 3.33 + * ) as_opts= ;; 3.34 + esac 3.35 + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 3.36 fi 3.37 3.38 if test x$as_have_required = xno; then : 3.39 @@ -641,6 +649,7 @@ 3.40 CXXFLAGS_JDKLIB 3.41 CFLAGS_JDKEXE 3.42 CFLAGS_JDKLIB 3.43 +MACOSX_REQUIRED_VERSION 3.44 PACKAGE_PATH 3.45 LEGACY_EXTRA_LDFLAGS 3.46 LEGACY_EXTRA_CXXFLAGS 3.47 @@ -1434,7 +1443,7 @@ 3.48 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 3.49 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 3.50 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 3.51 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 3.52 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 3.53 ;; 3.54 3.55 esac 3.56 @@ -1859,7 +1868,7 @@ 3.57 if $ac_init_version; then 3.58 cat <<\_ACEOF 3.59 OpenJDK configure jdk8 3.60 -generated by GNU Autoconf 2.67 3.61 +generated by GNU Autoconf 2.68 3.62 3.63 Copyright (C) 2010 Free Software Foundation, Inc. 3.64 This configure script is free software; the Free Software Foundation 3.65 @@ -1905,7 +1914,7 @@ 3.66 3.67 ac_retval=1 3.68 fi 3.69 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.70 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.71 as_fn_set_status $ac_retval 3.72 3.73 } # ac_fn_c_try_compile 3.74 @@ -1943,7 +1952,7 @@ 3.75 3.76 ac_retval=1 3.77 fi 3.78 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.79 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.80 as_fn_set_status $ac_retval 3.81 3.82 } # ac_fn_cxx_try_compile 3.83 @@ -1981,7 +1990,7 @@ 3.84 3.85 ac_retval=1 3.86 fi 3.87 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.88 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.89 as_fn_set_status $ac_retval 3.90 3.91 } # ac_fn_objc_try_compile 3.92 @@ -2018,7 +2027,7 @@ 3.93 3.94 ac_retval=1 3.95 fi 3.96 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.97 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.98 as_fn_set_status $ac_retval 3.99 3.100 } # ac_fn_c_try_cpp 3.101 @@ -2055,7 +2064,7 @@ 3.102 3.103 ac_retval=1 3.104 fi 3.105 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.106 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.107 as_fn_set_status $ac_retval 3.108 3.109 } # ac_fn_cxx_try_cpp 3.110 @@ -2068,10 +2077,10 @@ 3.111 ac_fn_cxx_check_header_mongrel () 3.112 { 3.113 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 3.114 - if eval "test \"\${$3+set}\"" = set; then : 3.115 + if eval \${$3+:} false; then : 3.116 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 3.117 $as_echo_n "checking for $2... " >&6; } 3.118 -if eval "test \"\${$3+set}\"" = set; then : 3.119 +if eval \${$3+:} false; then : 3.120 $as_echo_n "(cached) " >&6 3.121 fi 3.122 eval ac_res=\$$3 3.123 @@ -2138,7 +2147,7 @@ 3.124 esac 3.125 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 3.126 $as_echo_n "checking for $2... " >&6; } 3.127 -if eval "test \"\${$3+set}\"" = set; then : 3.128 +if eval \${$3+:} false; then : 3.129 $as_echo_n "(cached) " >&6 3.130 else 3.131 eval "$3=\$ac_header_compiler" 3.132 @@ -2147,7 +2156,7 @@ 3.133 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 3.134 $as_echo "$ac_res" >&6; } 3.135 fi 3.136 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.137 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.138 3.139 } # ac_fn_cxx_check_header_mongrel 3.140 3.141 @@ -2188,7 +2197,7 @@ 3.142 ac_retval=$ac_status 3.143 fi 3.144 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 3.145 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.146 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.147 as_fn_set_status $ac_retval 3.148 3.149 } # ac_fn_cxx_try_run 3.150 @@ -2202,7 +2211,7 @@ 3.151 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 3.152 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 3.153 $as_echo_n "checking for $2... " >&6; } 3.154 -if eval "test \"\${$3+set}\"" = set; then : 3.155 +if eval \${$3+:} false; then : 3.156 $as_echo_n "(cached) " >&6 3.157 else 3.158 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.159 @@ -2220,7 +2229,7 @@ 3.160 eval ac_res=\$$3 3.161 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 3.162 $as_echo "$ac_res" >&6; } 3.163 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.164 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.165 3.166 } # ac_fn_cxx_check_header_compile 3.167 3.168 @@ -2397,7 +2406,7 @@ 3.169 rm -f conftest.val 3.170 3.171 fi 3.172 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.173 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.174 as_fn_set_status $ac_retval 3.175 3.176 } # ac_fn_cxx_compute_int 3.177 @@ -2443,7 +2452,7 @@ 3.178 # interfere with the next link command; also delete a directory that is 3.179 # left behind by Apple's compiler. We do this before executing the actions. 3.180 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 3.181 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.182 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.183 as_fn_set_status $ac_retval 3.184 3.185 } # ac_fn_cxx_try_link 3.186 @@ -2456,7 +2465,7 @@ 3.187 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 3.188 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 3.189 $as_echo_n "checking for $2... " >&6; } 3.190 -if eval "test \"\${$3+set}\"" = set; then : 3.191 +if eval \${$3+:} false; then : 3.192 $as_echo_n "(cached) " >&6 3.193 else 3.194 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.195 @@ -2511,7 +2520,7 @@ 3.196 eval ac_res=\$$3 3.197 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 3.198 $as_echo "$ac_res" >&6; } 3.199 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.200 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.201 3.202 } # ac_fn_cxx_check_func 3.203 3.204 @@ -2524,7 +2533,7 @@ 3.205 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 3.206 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 3.207 $as_echo_n "checking for $2... " >&6; } 3.208 -if eval "test \"\${$3+set}\"" = set; then : 3.209 +if eval \${$3+:} false; then : 3.210 $as_echo_n "(cached) " >&6 3.211 else 3.212 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.213 @@ -2542,7 +2551,7 @@ 3.214 eval ac_res=\$$3 3.215 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 3.216 $as_echo "$ac_res" >&6; } 3.217 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 3.218 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 3.219 3.220 } # ac_fn_c_check_header_compile 3.221 cat >config.log <<_ACEOF 3.222 @@ -2550,7 +2559,7 @@ 3.223 running configure, to aid debugging if configure makes a mistake. 3.224 3.225 It was created by OpenJDK $as_me jdk8, which was 3.226 -generated by GNU Autoconf 2.67. Invocation command line was 3.227 +generated by GNU Autoconf 2.68. Invocation command line was 3.228 3.229 $ $0 $@ 3.230 3.231 @@ -2808,7 +2817,7 @@ 3.232 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.233 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.234 as_fn_error $? "failed to load site script $ac_site_file 3.235 -See \`config.log' for more details" "$LINENO" 5 ; } 3.236 +See \`config.log' for more details" "$LINENO" 5; } 3.237 fi 3.238 done 3.239 3.240 @@ -3724,7 +3733,7 @@ 3.241 #CUSTOM_AUTOCONF_INCLUDE 3.242 3.243 # Do not change or remove the following line, it is needed for consistency checks: 3.244 -DATE_WHEN_GENERATED=1359376859 3.245 +DATE_WHEN_GENERATED=1361218904 3.246 3.247 ############################################################################### 3.248 # 3.249 @@ -3762,7 +3771,7 @@ 3.250 set dummy $ac_prog; ac_word=$2 3.251 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.252 $as_echo_n "checking for $ac_word... " >&6; } 3.253 -if test "${ac_cv_path_BASENAME+set}" = set; then : 3.254 +if ${ac_cv_path_BASENAME+:} false; then : 3.255 $as_echo_n "(cached) " >&6 3.256 else 3.257 case $BASENAME in 3.258 @@ -3821,7 +3830,7 @@ 3.259 set dummy $ac_prog; ac_word=$2 3.260 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.261 $as_echo_n "checking for $ac_word... " >&6; } 3.262 -if test "${ac_cv_path_BASH+set}" = set; then : 3.263 +if ${ac_cv_path_BASH+:} false; then : 3.264 $as_echo_n "(cached) " >&6 3.265 else 3.266 case $BASH in 3.267 @@ -3880,7 +3889,7 @@ 3.268 set dummy $ac_prog; ac_word=$2 3.269 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.270 $as_echo_n "checking for $ac_word... " >&6; } 3.271 -if test "${ac_cv_path_CAT+set}" = set; then : 3.272 +if ${ac_cv_path_CAT+:} false; then : 3.273 $as_echo_n "(cached) " >&6 3.274 else 3.275 case $CAT in 3.276 @@ -3939,7 +3948,7 @@ 3.277 set dummy $ac_prog; ac_word=$2 3.278 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.279 $as_echo_n "checking for $ac_word... " >&6; } 3.280 -if test "${ac_cv_path_CHMOD+set}" = set; then : 3.281 +if ${ac_cv_path_CHMOD+:} false; then : 3.282 $as_echo_n "(cached) " >&6 3.283 else 3.284 case $CHMOD in 3.285 @@ -3998,7 +4007,7 @@ 3.286 set dummy $ac_prog; ac_word=$2 3.287 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.288 $as_echo_n "checking for $ac_word... " >&6; } 3.289 -if test "${ac_cv_path_CMP+set}" = set; then : 3.290 +if ${ac_cv_path_CMP+:} false; then : 3.291 $as_echo_n "(cached) " >&6 3.292 else 3.293 case $CMP in 3.294 @@ -4057,7 +4066,7 @@ 3.295 set dummy $ac_prog; ac_word=$2 3.296 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.297 $as_echo_n "checking for $ac_word... " >&6; } 3.298 -if test "${ac_cv_path_COMM+set}" = set; then : 3.299 +if ${ac_cv_path_COMM+:} false; then : 3.300 $as_echo_n "(cached) " >&6 3.301 else 3.302 case $COMM in 3.303 @@ -4116,7 +4125,7 @@ 3.304 set dummy $ac_prog; ac_word=$2 3.305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.306 $as_echo_n "checking for $ac_word... " >&6; } 3.307 -if test "${ac_cv_path_CP+set}" = set; then : 3.308 +if ${ac_cv_path_CP+:} false; then : 3.309 $as_echo_n "(cached) " >&6 3.310 else 3.311 case $CP in 3.312 @@ -4175,7 +4184,7 @@ 3.313 set dummy $ac_prog; ac_word=$2 3.314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.315 $as_echo_n "checking for $ac_word... " >&6; } 3.316 -if test "${ac_cv_path_CPIO+set}" = set; then : 3.317 +if ${ac_cv_path_CPIO+:} false; then : 3.318 $as_echo_n "(cached) " >&6 3.319 else 3.320 case $CPIO in 3.321 @@ -4234,7 +4243,7 @@ 3.322 set dummy $ac_prog; ac_word=$2 3.323 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.324 $as_echo_n "checking for $ac_word... " >&6; } 3.325 -if test "${ac_cv_path_CUT+set}" = set; then : 3.326 +if ${ac_cv_path_CUT+:} false; then : 3.327 $as_echo_n "(cached) " >&6 3.328 else 3.329 case $CUT in 3.330 @@ -4293,7 +4302,7 @@ 3.331 set dummy $ac_prog; ac_word=$2 3.332 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.333 $as_echo_n "checking for $ac_word... " >&6; } 3.334 -if test "${ac_cv_path_DATE+set}" = set; then : 3.335 +if ${ac_cv_path_DATE+:} false; then : 3.336 $as_echo_n "(cached) " >&6 3.337 else 3.338 case $DATE in 3.339 @@ -4352,7 +4361,7 @@ 3.340 set dummy $ac_prog; ac_word=$2 3.341 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.342 $as_echo_n "checking for $ac_word... " >&6; } 3.343 -if test "${ac_cv_path_DIFF+set}" = set; then : 3.344 +if ${ac_cv_path_DIFF+:} false; then : 3.345 $as_echo_n "(cached) " >&6 3.346 else 3.347 case $DIFF in 3.348 @@ -4411,7 +4420,7 @@ 3.349 set dummy $ac_prog; ac_word=$2 3.350 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.351 $as_echo_n "checking for $ac_word... " >&6; } 3.352 -if test "${ac_cv_path_DIRNAME+set}" = set; then : 3.353 +if ${ac_cv_path_DIRNAME+:} false; then : 3.354 $as_echo_n "(cached) " >&6 3.355 else 3.356 case $DIRNAME in 3.357 @@ -4470,7 +4479,7 @@ 3.358 set dummy $ac_prog; ac_word=$2 3.359 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.360 $as_echo_n "checking for $ac_word... " >&6; } 3.361 -if test "${ac_cv_path_ECHO+set}" = set; then : 3.362 +if ${ac_cv_path_ECHO+:} false; then : 3.363 $as_echo_n "(cached) " >&6 3.364 else 3.365 case $ECHO in 3.366 @@ -4529,7 +4538,7 @@ 3.367 set dummy $ac_prog; ac_word=$2 3.368 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.369 $as_echo_n "checking for $ac_word... " >&6; } 3.370 -if test "${ac_cv_path_EXPR+set}" = set; then : 3.371 +if ${ac_cv_path_EXPR+:} false; then : 3.372 $as_echo_n "(cached) " >&6 3.373 else 3.374 case $EXPR in 3.375 @@ -4588,7 +4597,7 @@ 3.376 set dummy $ac_prog; ac_word=$2 3.377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.378 $as_echo_n "checking for $ac_word... " >&6; } 3.379 -if test "${ac_cv_path_FILE+set}" = set; then : 3.380 +if ${ac_cv_path_FILE+:} false; then : 3.381 $as_echo_n "(cached) " >&6 3.382 else 3.383 case $FILE in 3.384 @@ -4647,7 +4656,7 @@ 3.385 set dummy $ac_prog; ac_word=$2 3.386 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.387 $as_echo_n "checking for $ac_word... " >&6; } 3.388 -if test "${ac_cv_path_FIND+set}" = set; then : 3.389 +if ${ac_cv_path_FIND+:} false; then : 3.390 $as_echo_n "(cached) " >&6 3.391 else 3.392 case $FIND in 3.393 @@ -4706,7 +4715,7 @@ 3.394 set dummy $ac_prog; ac_word=$2 3.395 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.396 $as_echo_n "checking for $ac_word... " >&6; } 3.397 -if test "${ac_cv_path_HEAD+set}" = set; then : 3.398 +if ${ac_cv_path_HEAD+:} false; then : 3.399 $as_echo_n "(cached) " >&6 3.400 else 3.401 case $HEAD in 3.402 @@ -4765,7 +4774,7 @@ 3.403 set dummy $ac_prog; ac_word=$2 3.404 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.405 $as_echo_n "checking for $ac_word... " >&6; } 3.406 -if test "${ac_cv_path_LN+set}" = set; then : 3.407 +if ${ac_cv_path_LN+:} false; then : 3.408 $as_echo_n "(cached) " >&6 3.409 else 3.410 case $LN in 3.411 @@ -4824,7 +4833,7 @@ 3.412 set dummy $ac_prog; ac_word=$2 3.413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.414 $as_echo_n "checking for $ac_word... " >&6; } 3.415 -if test "${ac_cv_path_LS+set}" = set; then : 3.416 +if ${ac_cv_path_LS+:} false; then : 3.417 $as_echo_n "(cached) " >&6 3.418 else 3.419 case $LS in 3.420 @@ -4883,7 +4892,7 @@ 3.421 set dummy $ac_prog; ac_word=$2 3.422 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.423 $as_echo_n "checking for $ac_word... " >&6; } 3.424 -if test "${ac_cv_path_MKDIR+set}" = set; then : 3.425 +if ${ac_cv_path_MKDIR+:} false; then : 3.426 $as_echo_n "(cached) " >&6 3.427 else 3.428 case $MKDIR in 3.429 @@ -4942,7 +4951,7 @@ 3.430 set dummy $ac_prog; ac_word=$2 3.431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.432 $as_echo_n "checking for $ac_word... " >&6; } 3.433 -if test "${ac_cv_path_MKTEMP+set}" = set; then : 3.434 +if ${ac_cv_path_MKTEMP+:} false; then : 3.435 $as_echo_n "(cached) " >&6 3.436 else 3.437 case $MKTEMP in 3.438 @@ -5001,7 +5010,7 @@ 3.439 set dummy $ac_prog; ac_word=$2 3.440 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.441 $as_echo_n "checking for $ac_word... " >&6; } 3.442 -if test "${ac_cv_path_MV+set}" = set; then : 3.443 +if ${ac_cv_path_MV+:} false; then : 3.444 $as_echo_n "(cached) " >&6 3.445 else 3.446 case $MV in 3.447 @@ -5060,7 +5069,7 @@ 3.448 set dummy $ac_prog; ac_word=$2 3.449 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.450 $as_echo_n "checking for $ac_word... " >&6; } 3.451 -if test "${ac_cv_path_PRINTF+set}" = set; then : 3.452 +if ${ac_cv_path_PRINTF+:} false; then : 3.453 $as_echo_n "(cached) " >&6 3.454 else 3.455 case $PRINTF in 3.456 @@ -5119,7 +5128,7 @@ 3.457 set dummy $ac_prog; ac_word=$2 3.458 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.459 $as_echo_n "checking for $ac_word... " >&6; } 3.460 -if test "${ac_cv_path_THEPWDCMD+set}" = set; then : 3.461 +if ${ac_cv_path_THEPWDCMD+:} false; then : 3.462 $as_echo_n "(cached) " >&6 3.463 else 3.464 case $THEPWDCMD in 3.465 @@ -5178,7 +5187,7 @@ 3.466 set dummy $ac_prog; ac_word=$2 3.467 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.468 $as_echo_n "checking for $ac_word... " >&6; } 3.469 -if test "${ac_cv_path_RM+set}" = set; then : 3.470 +if ${ac_cv_path_RM+:} false; then : 3.471 $as_echo_n "(cached) " >&6 3.472 else 3.473 case $RM in 3.474 @@ -5237,7 +5246,7 @@ 3.475 set dummy $ac_prog; ac_word=$2 3.476 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.477 $as_echo_n "checking for $ac_word... " >&6; } 3.478 -if test "${ac_cv_path_SH+set}" = set; then : 3.479 +if ${ac_cv_path_SH+:} false; then : 3.480 $as_echo_n "(cached) " >&6 3.481 else 3.482 case $SH in 3.483 @@ -5296,7 +5305,7 @@ 3.484 set dummy $ac_prog; ac_word=$2 3.485 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.486 $as_echo_n "checking for $ac_word... " >&6; } 3.487 -if test "${ac_cv_path_SORT+set}" = set; then : 3.488 +if ${ac_cv_path_SORT+:} false; then : 3.489 $as_echo_n "(cached) " >&6 3.490 else 3.491 case $SORT in 3.492 @@ -5355,7 +5364,7 @@ 3.493 set dummy $ac_prog; ac_word=$2 3.494 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.495 $as_echo_n "checking for $ac_word... " >&6; } 3.496 -if test "${ac_cv_path_TAIL+set}" = set; then : 3.497 +if ${ac_cv_path_TAIL+:} false; then : 3.498 $as_echo_n "(cached) " >&6 3.499 else 3.500 case $TAIL in 3.501 @@ -5414,7 +5423,7 @@ 3.502 set dummy $ac_prog; ac_word=$2 3.503 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.504 $as_echo_n "checking for $ac_word... " >&6; } 3.505 -if test "${ac_cv_path_TAR+set}" = set; then : 3.506 +if ${ac_cv_path_TAR+:} false; then : 3.507 $as_echo_n "(cached) " >&6 3.508 else 3.509 case $TAR in 3.510 @@ -5473,7 +5482,7 @@ 3.511 set dummy $ac_prog; ac_word=$2 3.512 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.513 $as_echo_n "checking for $ac_word... " >&6; } 3.514 -if test "${ac_cv_path_TEE+set}" = set; then : 3.515 +if ${ac_cv_path_TEE+:} false; then : 3.516 $as_echo_n "(cached) " >&6 3.517 else 3.518 case $TEE in 3.519 @@ -5532,7 +5541,7 @@ 3.520 set dummy $ac_prog; ac_word=$2 3.521 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.522 $as_echo_n "checking for $ac_word... " >&6; } 3.523 -if test "${ac_cv_path_TOUCH+set}" = set; then : 3.524 +if ${ac_cv_path_TOUCH+:} false; then : 3.525 $as_echo_n "(cached) " >&6 3.526 else 3.527 case $TOUCH in 3.528 @@ -5591,7 +5600,7 @@ 3.529 set dummy $ac_prog; ac_word=$2 3.530 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.531 $as_echo_n "checking for $ac_word... " >&6; } 3.532 -if test "${ac_cv_path_TR+set}" = set; then : 3.533 +if ${ac_cv_path_TR+:} false; then : 3.534 $as_echo_n "(cached) " >&6 3.535 else 3.536 case $TR in 3.537 @@ -5650,7 +5659,7 @@ 3.538 set dummy $ac_prog; ac_word=$2 3.539 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.540 $as_echo_n "checking for $ac_word... " >&6; } 3.541 -if test "${ac_cv_path_UNAME+set}" = set; then : 3.542 +if ${ac_cv_path_UNAME+:} false; then : 3.543 $as_echo_n "(cached) " >&6 3.544 else 3.545 case $UNAME in 3.546 @@ -5709,7 +5718,7 @@ 3.547 set dummy $ac_prog; ac_word=$2 3.548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.549 $as_echo_n "checking for $ac_word... " >&6; } 3.550 -if test "${ac_cv_path_UNIQ+set}" = set; then : 3.551 +if ${ac_cv_path_UNIQ+:} false; then : 3.552 $as_echo_n "(cached) " >&6 3.553 else 3.554 case $UNIQ in 3.555 @@ -5768,7 +5777,7 @@ 3.556 set dummy $ac_prog; ac_word=$2 3.557 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.558 $as_echo_n "checking for $ac_word... " >&6; } 3.559 -if test "${ac_cv_path_WC+set}" = set; then : 3.560 +if ${ac_cv_path_WC+:} false; then : 3.561 $as_echo_n "(cached) " >&6 3.562 else 3.563 case $WC in 3.564 @@ -5827,7 +5836,7 @@ 3.565 set dummy $ac_prog; ac_word=$2 3.566 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.567 $as_echo_n "checking for $ac_word... " >&6; } 3.568 -if test "${ac_cv_path_WHICH+set}" = set; then : 3.569 +if ${ac_cv_path_WHICH+:} false; then : 3.570 $as_echo_n "(cached) " >&6 3.571 else 3.572 case $WHICH in 3.573 @@ -5886,7 +5895,7 @@ 3.574 set dummy $ac_prog; ac_word=$2 3.575 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.576 $as_echo_n "checking for $ac_word... " >&6; } 3.577 -if test "${ac_cv_path_XARGS+set}" = set; then : 3.578 +if ${ac_cv_path_XARGS+:} false; then : 3.579 $as_echo_n "(cached) " >&6 3.580 else 3.581 case $XARGS in 3.582 @@ -5946,7 +5955,7 @@ 3.583 set dummy $ac_prog; ac_word=$2 3.584 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.585 $as_echo_n "checking for $ac_word... " >&6; } 3.586 -if test "${ac_cv_prog_AWK+set}" = set; then : 3.587 +if ${ac_cv_prog_AWK+:} false; then : 3.588 $as_echo_n "(cached) " >&6 3.589 else 3.590 if test -n "$AWK"; then 3.591 @@ -5996,7 +6005,7 @@ 3.592 3.593 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 3.594 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 3.595 -if test "${ac_cv_path_GREP+set}" = set; then : 3.596 +if ${ac_cv_path_GREP+:} false; then : 3.597 $as_echo_n "(cached) " >&6 3.598 else 3.599 if test -z "$GREP"; then 3.600 @@ -6071,7 +6080,7 @@ 3.601 3.602 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 3.603 $as_echo_n "checking for egrep... " >&6; } 3.604 -if test "${ac_cv_path_EGREP+set}" = set; then : 3.605 +if ${ac_cv_path_EGREP+:} false; then : 3.606 $as_echo_n "(cached) " >&6 3.607 else 3.608 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 3.609 @@ -6150,7 +6159,7 @@ 3.610 3.611 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 3.612 $as_echo_n "checking for fgrep... " >&6; } 3.613 -if test "${ac_cv_path_FGREP+set}" = set; then : 3.614 +if ${ac_cv_path_FGREP+:} false; then : 3.615 $as_echo_n "(cached) " >&6 3.616 else 3.617 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 3.618 @@ -6229,7 +6238,7 @@ 3.619 3.620 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 3.621 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 3.622 -if test "${ac_cv_path_SED+set}" = set; then : 3.623 +if ${ac_cv_path_SED+:} false; then : 3.624 $as_echo_n "(cached) " >&6 3.625 else 3.626 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ 3.627 @@ -6315,7 +6324,7 @@ 3.628 set dummy $ac_prog; ac_word=$2 3.629 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.630 $as_echo_n "checking for $ac_word... " >&6; } 3.631 -if test "${ac_cv_path_NAWK+set}" = set; then : 3.632 +if ${ac_cv_path_NAWK+:} false; then : 3.633 $as_echo_n "(cached) " >&6 3.634 else 3.635 case $NAWK in 3.636 @@ -6375,7 +6384,7 @@ 3.637 set dummy cygpath; ac_word=$2 3.638 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.639 $as_echo_n "checking for $ac_word... " >&6; } 3.640 -if test "${ac_cv_path_CYGPATH+set}" = set; then : 3.641 +if ${ac_cv_path_CYGPATH+:} false; then : 3.642 $as_echo_n "(cached) " >&6 3.643 else 3.644 case $CYGPATH in 3.645 @@ -6415,7 +6424,7 @@ 3.646 set dummy readlink; ac_word=$2 3.647 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.648 $as_echo_n "checking for $ac_word... " >&6; } 3.649 -if test "${ac_cv_path_READLINK+set}" = set; then : 3.650 +if ${ac_cv_path_READLINK+:} false; then : 3.651 $as_echo_n "(cached) " >&6 3.652 else 3.653 case $READLINK in 3.654 @@ -6455,7 +6464,7 @@ 3.655 set dummy df; ac_word=$2 3.656 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.657 $as_echo_n "checking for $ac_word... " >&6; } 3.658 -if test "${ac_cv_path_DF+set}" = set; then : 3.659 +if ${ac_cv_path_DF+:} false; then : 3.660 $as_echo_n "(cached) " >&6 3.661 else 3.662 case $DF in 3.663 @@ -6495,7 +6504,7 @@ 3.664 set dummy SetFile; ac_word=$2 3.665 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.666 $as_echo_n "checking for $ac_word... " >&6; } 3.667 -if test "${ac_cv_path_SETFILE+set}" = set; then : 3.668 +if ${ac_cv_path_SETFILE+:} false; then : 3.669 $as_echo_n "(cached) " >&6 3.670 else 3.671 case $SETFILE in 3.672 @@ -6541,7 +6550,7 @@ 3.673 3.674 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 3.675 $as_echo_n "checking build system type... " >&6; } 3.676 -if test "${ac_cv_build+set}" = set; then : 3.677 +if ${ac_cv_build+:} false; then : 3.678 $as_echo_n "(cached) " >&6 3.679 else 3.680 ac_build_alias=$build_alias 3.681 @@ -6557,7 +6566,7 @@ 3.682 $as_echo "$ac_cv_build" >&6; } 3.683 case $ac_cv_build in 3.684 *-*-*) ;; 3.685 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 3.686 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 3.687 esac 3.688 build=$ac_cv_build 3.689 ac_save_IFS=$IFS; IFS='-' 3.690 @@ -6575,7 +6584,7 @@ 3.691 3.692 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 3.693 $as_echo_n "checking host system type... " >&6; } 3.694 -if test "${ac_cv_host+set}" = set; then : 3.695 +if ${ac_cv_host+:} false; then : 3.696 $as_echo_n "(cached) " >&6 3.697 else 3.698 if test "x$host_alias" = x; then 3.699 @@ -6590,7 +6599,7 @@ 3.700 $as_echo "$ac_cv_host" >&6; } 3.701 case $ac_cv_host in 3.702 *-*-*) ;; 3.703 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 3.704 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 3.705 esac 3.706 host=$ac_cv_host 3.707 ac_save_IFS=$IFS; IFS='-' 3.708 @@ -6608,7 +6617,7 @@ 3.709 3.710 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 3.711 $as_echo_n "checking target system type... " >&6; } 3.712 -if test "${ac_cv_target+set}" = set; then : 3.713 +if ${ac_cv_target+:} false; then : 3.714 $as_echo_n "(cached) " >&6 3.715 else 3.716 if test "x$target_alias" = x; then 3.717 @@ -6623,7 +6632,7 @@ 3.718 $as_echo "$ac_cv_target" >&6; } 3.719 case $ac_cv_target in 3.720 *-*-*) ;; 3.721 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 3.722 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 3.723 esac 3.724 target=$ac_cv_target 3.725 ac_save_IFS=$IFS; IFS='-' 3.726 @@ -8089,7 +8098,7 @@ 3.727 set dummy $ac_prog; ac_word=$2 3.728 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.729 $as_echo_n "checking for $ac_word... " >&6; } 3.730 -if test "${ac_cv_prog_PKGHANDLER+set}" = set; then : 3.731 +if ${ac_cv_prog_PKGHANDLER+:} false; then : 3.732 $as_echo_n "(cached) " >&6 3.733 else 3.734 if test -n "$PKGHANDLER"; then 3.735 @@ -8454,7 +8463,7 @@ 3.736 set dummy $ac_prog; ac_word=$2 3.737 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.738 $as_echo_n "checking for $ac_word... " >&6; } 3.739 -if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then : 3.740 +if ${ac_cv_path_CHECK_GMAKE+:} false; then : 3.741 $as_echo_n "(cached) " >&6 3.742 else 3.743 case $CHECK_GMAKE in 3.744 @@ -8808,7 +8817,7 @@ 3.745 set dummy $ac_prog; ac_word=$2 3.746 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.747 $as_echo_n "checking for $ac_word... " >&6; } 3.748 -if test "${ac_cv_path_CHECK_MAKE+set}" = set; then : 3.749 +if ${ac_cv_path_CHECK_MAKE+:} false; then : 3.750 $as_echo_n "(cached) " >&6 3.751 else 3.752 case $CHECK_MAKE in 3.753 @@ -9167,7 +9176,7 @@ 3.754 set dummy $ac_prog; ac_word=$2 3.755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.756 $as_echo_n "checking for $ac_word... " >&6; } 3.757 -if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then : 3.758 +if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then : 3.759 $as_echo_n "(cached) " >&6 3.760 else 3.761 case $CHECK_TOOLSDIR_GMAKE in 3.762 @@ -9520,7 +9529,7 @@ 3.763 set dummy $ac_prog; ac_word=$2 3.764 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.765 $as_echo_n "checking for $ac_word... " >&6; } 3.766 -if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then : 3.767 +if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then : 3.768 $as_echo_n "(cached) " >&6 3.769 else 3.770 case $CHECK_TOOLSDIR_MAKE in 3.771 @@ -9916,7 +9925,7 @@ 3.772 set dummy $ac_prog; ac_word=$2 3.773 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.774 $as_echo_n "checking for $ac_word... " >&6; } 3.775 -if test "${ac_cv_path_UNZIP+set}" = set; then : 3.776 +if ${ac_cv_path_UNZIP+:} false; then : 3.777 $as_echo_n "(cached) " >&6 3.778 else 3.779 case $UNZIP in 3.780 @@ -9975,7 +9984,7 @@ 3.781 set dummy $ac_prog; ac_word=$2 3.782 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.783 $as_echo_n "checking for $ac_word... " >&6; } 3.784 -if test "${ac_cv_path_ZIP+set}" = set; then : 3.785 +if ${ac_cv_path_ZIP+:} false; then : 3.786 $as_echo_n "(cached) " >&6 3.787 else 3.788 case $ZIP in 3.789 @@ -10034,7 +10043,7 @@ 3.790 set dummy ldd; ac_word=$2 3.791 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.792 $as_echo_n "checking for $ac_word... " >&6; } 3.793 -if test "${ac_cv_path_LDD+set}" = set; then : 3.794 +if ${ac_cv_path_LDD+:} false; then : 3.795 $as_echo_n "(cached) " >&6 3.796 else 3.797 case $LDD in 3.798 @@ -10080,7 +10089,7 @@ 3.799 set dummy otool; ac_word=$2 3.800 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.801 $as_echo_n "checking for $ac_word... " >&6; } 3.802 -if test "${ac_cv_path_OTOOL+set}" = set; then : 3.803 +if ${ac_cv_path_OTOOL+:} false; then : 3.804 $as_echo_n "(cached) " >&6 3.805 else 3.806 case $OTOOL in 3.807 @@ -10125,7 +10134,7 @@ 3.808 set dummy $ac_prog; ac_word=$2 3.809 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.810 $as_echo_n "checking for $ac_word... " >&6; } 3.811 -if test "${ac_cv_path_READELF+set}" = set; then : 3.812 +if ${ac_cv_path_READELF+:} false; then : 3.813 $as_echo_n "(cached) " >&6 3.814 else 3.815 case $READELF in 3.816 @@ -10168,7 +10177,7 @@ 3.817 set dummy hg; ac_word=$2 3.818 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.819 $as_echo_n "checking for $ac_word... " >&6; } 3.820 -if test "${ac_cv_path_HG+set}" = set; then : 3.821 +if ${ac_cv_path_HG+:} false; then : 3.822 $as_echo_n "(cached) " >&6 3.823 else 3.824 case $HG in 3.825 @@ -10208,7 +10217,7 @@ 3.826 set dummy stat; ac_word=$2 3.827 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.828 $as_echo_n "checking for $ac_word... " >&6; } 3.829 -if test "${ac_cv_path_STAT+set}" = set; then : 3.830 +if ${ac_cv_path_STAT+:} false; then : 3.831 $as_echo_n "(cached) " >&6 3.832 else 3.833 case $STAT in 3.834 @@ -10248,7 +10257,7 @@ 3.835 set dummy time; ac_word=$2 3.836 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.837 $as_echo_n "checking for $ac_word... " >&6; } 3.838 -if test "${ac_cv_path_TIME+set}" = set; then : 3.839 +if ${ac_cv_path_TIME+:} false; then : 3.840 $as_echo_n "(cached) " >&6 3.841 else 3.842 case $TIME in 3.843 @@ -10293,7 +10302,7 @@ 3.844 set dummy $ac_prog; ac_word=$2 3.845 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.846 $as_echo_n "checking for $ac_word... " >&6; } 3.847 -if test "${ac_cv_path_COMM+set}" = set; then : 3.848 +if ${ac_cv_path_COMM+:} false; then : 3.849 $as_echo_n "(cached) " >&6 3.850 else 3.851 case $COMM in 3.852 @@ -10357,7 +10366,7 @@ 3.853 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 3.854 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.855 $as_echo_n "checking for $ac_word... " >&6; } 3.856 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 3.857 +if ${ac_cv_path_PKG_CONFIG+:} false; then : 3.858 $as_echo_n "(cached) " >&6 3.859 else 3.860 case $PKG_CONFIG in 3.861 @@ -10400,7 +10409,7 @@ 3.862 set dummy pkg-config; ac_word=$2 3.863 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.864 $as_echo_n "checking for $ac_word... " >&6; } 3.865 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : 3.866 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : 3.867 $as_echo_n "(cached) " >&6 3.868 else 3.869 case $ac_pt_PKG_CONFIG in 3.870 @@ -10573,7 +10582,7 @@ 3.871 set dummy $ac_prog; ac_word=$2 3.872 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.873 $as_echo_n "checking for $ac_word... " >&6; } 3.874 -if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then : 3.875 +if ${ac_cv_prog_BDEPS_UNZIP+:} false; then : 3.876 $as_echo_n "(cached) " >&6 3.877 else 3.878 if test -n "$BDEPS_UNZIP"; then 3.879 @@ -10619,7 +10628,7 @@ 3.880 set dummy $ac_prog; ac_word=$2 3.881 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.882 $as_echo_n "checking for $ac_word... " >&6; } 3.883 -if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then : 3.884 +if ${ac_cv_prog_BDEPS_FTP+:} false; then : 3.885 $as_echo_n "(cached) " >&6 3.886 else 3.887 if test -n "$BDEPS_FTP"; then 3.888 @@ -10779,7 +10788,8 @@ 3.889 as_fn_error $? "Milestone must have a value" "$LINENO" 5 3.890 elif test "x$with_milestone" != x; then 3.891 MILESTONE="$with_milestone" 3.892 -else 3.893 +fi 3.894 +if test "x$MILESTONE" = x; then 3.895 MILESTONE=internal 3.896 fi 3.897 3.898 @@ -11885,7 +11895,7 @@ 3.899 set dummy javac; ac_word=$2 3.900 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.901 $as_echo_n "checking for $ac_word... " >&6; } 3.902 -if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then : 3.903 +if ${ac_cv_path_JAVAC_CHECK+:} false; then : 3.904 $as_echo_n "(cached) " >&6 3.905 else 3.906 case $JAVAC_CHECK in 3.907 @@ -11925,7 +11935,7 @@ 3.908 set dummy java; ac_word=$2 3.909 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.910 $as_echo_n "checking for $ac_word... " >&6; } 3.911 -if test "${ac_cv_path_JAVA_CHECK+set}" = set; then : 3.912 +if ${ac_cv_path_JAVA_CHECK+:} false; then : 3.913 $as_echo_n "(cached) " >&6 3.914 else 3.915 case $JAVA_CHECK in 3.916 @@ -15999,7 +16009,7 @@ 3.917 set dummy link; ac_word=$2 3.918 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.919 $as_echo_n "checking for $ac_word... " >&6; } 3.920 -if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then : 3.921 +if ${ac_cv_path_CYGWIN_LINK+:} false; then : 3.922 $as_echo_n "(cached) " >&6 3.923 else 3.924 case $CYGWIN_LINK in 3.925 @@ -16988,7 +16998,7 @@ 3.926 set dummy $ac_prog; ac_word=$2 3.927 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.928 $as_echo_n "checking for $ac_word... " >&6; } 3.929 -if test "${ac_cv_path_BUILD_CC+set}" = set; then : 3.930 +if ${ac_cv_path_BUILD_CC+:} false; then : 3.931 $as_echo_n "(cached) " >&6 3.932 else 3.933 case $BUILD_CC in 3.934 @@ -17299,7 +17309,7 @@ 3.935 set dummy $ac_prog; ac_word=$2 3.936 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.937 $as_echo_n "checking for $ac_word... " >&6; } 3.938 -if test "${ac_cv_path_BUILD_CXX+set}" = set; then : 3.939 +if ${ac_cv_path_BUILD_CXX+:} false; then : 3.940 $as_echo_n "(cached) " >&6 3.941 else 3.942 case $BUILD_CXX in 3.943 @@ -17608,7 +17618,7 @@ 3.944 set dummy ld; ac_word=$2 3.945 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.946 $as_echo_n "checking for $ac_word... " >&6; } 3.947 -if test "${ac_cv_path_BUILD_LD+set}" = set; then : 3.948 +if ${ac_cv_path_BUILD_LD+:} false; then : 3.949 $as_echo_n "(cached) " >&6 3.950 else 3.951 case $BUILD_LD in 3.952 @@ -18120,7 +18130,7 @@ 3.953 set dummy $ac_prog; ac_word=$2 3.954 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.955 $as_echo_n "checking for $ac_word... " >&6; } 3.956 -if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then : 3.957 +if ${ac_cv_path_TOOLS_DIR_CC+:} false; then : 3.958 $as_echo_n "(cached) " >&6 3.959 else 3.960 case $TOOLS_DIR_CC in 3.961 @@ -18172,7 +18182,7 @@ 3.962 set dummy $ac_prog; ac_word=$2 3.963 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.964 $as_echo_n "checking for $ac_word... " >&6; } 3.965 -if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then : 3.966 +if ${ac_cv_path_POTENTIAL_CC+:} false; then : 3.967 $as_echo_n "(cached) " >&6 3.968 else 3.969 case $POTENTIAL_CC in 3.970 @@ -18585,7 +18595,7 @@ 3.971 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.972 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.973 $as_echo_n "checking for $ac_word... " >&6; } 3.974 -if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then : 3.975 +if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then : 3.976 $as_echo_n "(cached) " >&6 3.977 else 3.978 if test -n "$PROPER_COMPILER_CC"; then 3.979 @@ -18629,7 +18639,7 @@ 3.980 set dummy $ac_prog; ac_word=$2 3.981 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.982 $as_echo_n "checking for $ac_word... " >&6; } 3.983 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then : 3.984 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then : 3.985 $as_echo_n "(cached) " >&6 3.986 else 3.987 if test -n "$ac_ct_PROPER_COMPILER_CC"; then 3.988 @@ -19079,7 +19089,7 @@ 3.989 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.990 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.991 $as_echo_n "checking for $ac_word... " >&6; } 3.992 -if test "${ac_cv_prog_CC+set}" = set; then : 3.993 +if ${ac_cv_prog_CC+:} false; then : 3.994 $as_echo_n "(cached) " >&6 3.995 else 3.996 if test -n "$CC"; then 3.997 @@ -19123,7 +19133,7 @@ 3.998 set dummy $ac_prog; ac_word=$2 3.999 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1000 $as_echo_n "checking for $ac_word... " >&6; } 3.1001 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 3.1002 +if ${ac_cv_prog_ac_ct_CC+:} false; then : 3.1003 $as_echo_n "(cached) " >&6 3.1004 else 3.1005 if test -n "$ac_ct_CC"; then 3.1006 @@ -19176,7 +19186,7 @@ 3.1007 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.1008 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1009 as_fn_error $? "no acceptable C compiler found in \$PATH 3.1010 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1011 +See \`config.log' for more details" "$LINENO" 5; } 3.1012 3.1013 # Provide some information about the compiler. 3.1014 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 3.1015 @@ -19291,7 +19301,7 @@ 3.1016 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.1017 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1018 as_fn_error 77 "C compiler cannot create executables 3.1019 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1020 +See \`config.log' for more details" "$LINENO" 5; } 3.1021 else 3.1022 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 3.1023 $as_echo "yes" >&6; } 3.1024 @@ -19334,7 +19344,7 @@ 3.1025 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.1026 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1027 as_fn_error $? "cannot compute suffix of executables: cannot compile and link 3.1028 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1029 +See \`config.log' for more details" "$LINENO" 5; } 3.1030 fi 3.1031 rm -f conftest conftest$ac_cv_exeext 3.1032 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 3.1033 @@ -19393,7 +19403,7 @@ 3.1034 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1035 as_fn_error $? "cannot run C compiled programs. 3.1036 If you meant to cross compile, use \`--host'. 3.1037 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1038 +See \`config.log' for more details" "$LINENO" 5; } 3.1039 fi 3.1040 fi 3.1041 fi 3.1042 @@ -19404,7 +19414,7 @@ 3.1043 ac_clean_files=$ac_clean_files_save 3.1044 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 3.1045 $as_echo_n "checking for suffix of object files... " >&6; } 3.1046 -if test "${ac_cv_objext+set}" = set; then : 3.1047 +if ${ac_cv_objext+:} false; then : 3.1048 $as_echo_n "(cached) " >&6 3.1049 else 3.1050 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.1051 @@ -19445,7 +19455,7 @@ 3.1052 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.1053 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1054 as_fn_error $? "cannot compute suffix of object files: cannot compile 3.1055 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1056 +See \`config.log' for more details" "$LINENO" 5; } 3.1057 fi 3.1058 rm -f conftest.$ac_cv_objext conftest.$ac_ext 3.1059 fi 3.1060 @@ -19455,7 +19465,7 @@ 3.1061 ac_objext=$OBJEXT 3.1062 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 3.1063 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 3.1064 -if test "${ac_cv_c_compiler_gnu+set}" = set; then : 3.1065 +if ${ac_cv_c_compiler_gnu+:} false; then : 3.1066 $as_echo_n "(cached) " >&6 3.1067 else 3.1068 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.1069 @@ -19492,7 +19502,7 @@ 3.1070 ac_save_CFLAGS=$CFLAGS 3.1071 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 3.1072 $as_echo_n "checking whether $CC accepts -g... " >&6; } 3.1073 -if test "${ac_cv_prog_cc_g+set}" = set; then : 3.1074 +if ${ac_cv_prog_cc_g+:} false; then : 3.1075 $as_echo_n "(cached) " >&6 3.1076 else 3.1077 ac_save_c_werror_flag=$ac_c_werror_flag 3.1078 @@ -19570,7 +19580,7 @@ 3.1079 fi 3.1080 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 3.1081 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 3.1082 -if test "${ac_cv_prog_cc_c89+set}" = set; then : 3.1083 +if ${ac_cv_prog_cc_c89+:} false; then : 3.1084 $as_echo_n "(cached) " >&6 3.1085 else 3.1086 ac_cv_prog_cc_c89=no 3.1087 @@ -19689,7 +19699,7 @@ 3.1088 set dummy $ac_prog; ac_word=$2 3.1089 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1090 $as_echo_n "checking for $ac_word... " >&6; } 3.1091 -if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then : 3.1092 +if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then : 3.1093 $as_echo_n "(cached) " >&6 3.1094 else 3.1095 case $TOOLS_DIR_CXX in 3.1096 @@ -19741,7 +19751,7 @@ 3.1097 set dummy $ac_prog; ac_word=$2 3.1098 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1099 $as_echo_n "checking for $ac_word... " >&6; } 3.1100 -if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then : 3.1101 +if ${ac_cv_path_POTENTIAL_CXX+:} false; then : 3.1102 $as_echo_n "(cached) " >&6 3.1103 else 3.1104 case $POTENTIAL_CXX in 3.1105 @@ -20154,7 +20164,7 @@ 3.1106 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.1107 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1108 $as_echo_n "checking for $ac_word... " >&6; } 3.1109 -if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then : 3.1110 +if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then : 3.1111 $as_echo_n "(cached) " >&6 3.1112 else 3.1113 if test -n "$PROPER_COMPILER_CXX"; then 3.1114 @@ -20198,7 +20208,7 @@ 3.1115 set dummy $ac_prog; ac_word=$2 3.1116 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1117 $as_echo_n "checking for $ac_word... " >&6; } 3.1118 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then : 3.1119 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then : 3.1120 $as_echo_n "(cached) " >&6 3.1121 else 3.1122 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then 3.1123 @@ -20652,7 +20662,7 @@ 3.1124 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.1125 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1126 $as_echo_n "checking for $ac_word... " >&6; } 3.1127 -if test "${ac_cv_prog_CXX+set}" = set; then : 3.1128 +if ${ac_cv_prog_CXX+:} false; then : 3.1129 $as_echo_n "(cached) " >&6 3.1130 else 3.1131 if test -n "$CXX"; then 3.1132 @@ -20696,7 +20706,7 @@ 3.1133 set dummy $ac_prog; ac_word=$2 3.1134 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1135 $as_echo_n "checking for $ac_word... " >&6; } 3.1136 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : 3.1137 +if ${ac_cv_prog_ac_ct_CXX+:} false; then : 3.1138 $as_echo_n "(cached) " >&6 3.1139 else 3.1140 if test -n "$ac_ct_CXX"; then 3.1141 @@ -20774,7 +20784,7 @@ 3.1142 3.1143 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 3.1144 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } 3.1145 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : 3.1146 +if ${ac_cv_cxx_compiler_gnu+:} false; then : 3.1147 $as_echo_n "(cached) " >&6 3.1148 else 3.1149 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.1150 @@ -20811,7 +20821,7 @@ 3.1151 ac_save_CXXFLAGS=$CXXFLAGS 3.1152 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 3.1153 $as_echo_n "checking whether $CXX accepts -g... " >&6; } 3.1154 -if test "${ac_cv_prog_cxx_g+set}" = set; then : 3.1155 +if ${ac_cv_prog_cxx_g+:} false; then : 3.1156 $as_echo_n "(cached) " >&6 3.1157 else 3.1158 ac_save_cxx_werror_flag=$ac_cxx_werror_flag 3.1159 @@ -20909,7 +20919,7 @@ 3.1160 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.1161 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1162 $as_echo_n "checking for $ac_word... " >&6; } 3.1163 -if test "${ac_cv_prog_OBJC+set}" = set; then : 3.1164 +if ${ac_cv_prog_OBJC+:} false; then : 3.1165 $as_echo_n "(cached) " >&6 3.1166 else 3.1167 if test -n "$OBJC"; then 3.1168 @@ -20953,7 +20963,7 @@ 3.1169 set dummy $ac_prog; ac_word=$2 3.1170 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1171 $as_echo_n "checking for $ac_word... " >&6; } 3.1172 -if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then : 3.1173 +if ${ac_cv_prog_ac_ct_OBJC+:} false; then : 3.1174 $as_echo_n "(cached) " >&6 3.1175 else 3.1176 if test -n "$ac_ct_OBJC"; then 3.1177 @@ -21029,7 +21039,7 @@ 3.1178 3.1179 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 3.1180 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } 3.1181 -if test "${ac_cv_objc_compiler_gnu+set}" = set; then : 3.1182 +if ${ac_cv_objc_compiler_gnu+:} false; then : 3.1183 $as_echo_n "(cached) " >&6 3.1184 else 3.1185 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.1186 @@ -21066,7 +21076,7 @@ 3.1187 ac_save_OBJCFLAGS=$OBJCFLAGS 3.1188 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 3.1189 $as_echo_n "checking whether $OBJC accepts -g... " >&6; } 3.1190 -if test "${ac_cv_prog_objc_g+set}" = set; then : 3.1191 +if ${ac_cv_prog_objc_g+:} false; then : 3.1192 $as_echo_n "(cached) " >&6 3.1193 else 3.1194 ac_save_objc_werror_flag=$ac_objc_werror_flag 3.1195 @@ -21442,7 +21452,7 @@ 3.1196 set dummy ${ac_tool_prefix}ar; ac_word=$2 3.1197 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1198 $as_echo_n "checking for $ac_word... " >&6; } 3.1199 -if test "${ac_cv_prog_AR+set}" = set; then : 3.1200 +if ${ac_cv_prog_AR+:} false; then : 3.1201 $as_echo_n "(cached) " >&6 3.1202 else 3.1203 if test -n "$AR"; then 3.1204 @@ -21482,7 +21492,7 @@ 3.1205 set dummy ar; ac_word=$2 3.1206 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1207 $as_echo_n "checking for $ac_word... " >&6; } 3.1208 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 3.1209 +if ${ac_cv_prog_ac_ct_AR+:} false; then : 3.1210 $as_echo_n "(cached) " >&6 3.1211 else 3.1212 if test -n "$ac_ct_AR"; then 3.1213 @@ -21824,7 +21834,7 @@ 3.1214 set dummy link; ac_word=$2 3.1215 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1216 $as_echo_n "checking for $ac_word... " >&6; } 3.1217 -if test "${ac_cv_prog_WINLD+set}" = set; then : 3.1218 +if ${ac_cv_prog_WINLD+:} false; then : 3.1219 $as_echo_n "(cached) " >&6 3.1220 else 3.1221 if test -n "$WINLD"; then 3.1222 @@ -22163,7 +22173,7 @@ 3.1223 set dummy mt; ac_word=$2 3.1224 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1225 $as_echo_n "checking for $ac_word... " >&6; } 3.1226 -if test "${ac_cv_prog_MT+set}" = set; then : 3.1227 +if ${ac_cv_prog_MT+:} false; then : 3.1228 $as_echo_n "(cached) " >&6 3.1229 else 3.1230 if test -n "$MT"; then 3.1231 @@ -22484,7 +22494,7 @@ 3.1232 set dummy rc; ac_word=$2 3.1233 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1234 $as_echo_n "checking for $ac_word... " >&6; } 3.1235 -if test "${ac_cv_prog_RC+set}" = set; then : 3.1236 +if ${ac_cv_prog_RC+:} false; then : 3.1237 $as_echo_n "(cached) " >&6 3.1238 else 3.1239 if test -n "$RC"; then 3.1240 @@ -22875,7 +22885,7 @@ 3.1241 set dummy lib; ac_word=$2 3.1242 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1243 $as_echo_n "checking for $ac_word... " >&6; } 3.1244 -if test "${ac_cv_prog_WINAR+set}" = set; then : 3.1245 +if ${ac_cv_prog_WINAR+:} false; then : 3.1246 $as_echo_n "(cached) " >&6 3.1247 else 3.1248 if test -n "$WINAR"; then 3.1249 @@ -23181,7 +23191,7 @@ 3.1250 set dummy dumpbin; ac_word=$2 3.1251 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1252 $as_echo_n "checking for $ac_word... " >&6; } 3.1253 -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : 3.1254 +if ${ac_cv_prog_DUMPBIN+:} false; then : 3.1255 $as_echo_n "(cached) " >&6 3.1256 else 3.1257 if test -n "$DUMPBIN"; then 3.1258 @@ -23500,7 +23510,7 @@ 3.1259 CPP= 3.1260 fi 3.1261 if test -z "$CPP"; then 3.1262 - if test "${ac_cv_prog_CPP+set}" = set; then : 3.1263 + if ${ac_cv_prog_CPP+:} false; then : 3.1264 $as_echo_n "(cached) " >&6 3.1265 else 3.1266 # Double quotes because CPP needs to be expanded 3.1267 @@ -23616,7 +23626,7 @@ 3.1268 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.1269 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1270 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 3.1271 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1272 +See \`config.log' for more details" "$LINENO" 5; } 3.1273 fi 3.1274 3.1275 ac_ext=cpp 3.1276 @@ -23900,7 +23910,7 @@ 3.1277 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 3.1278 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } 3.1279 if test -z "$CXXCPP"; then 3.1280 - if test "${ac_cv_prog_CXXCPP+set}" = set; then : 3.1281 + if ${ac_cv_prog_CXXCPP+:} false; then : 3.1282 $as_echo_n "(cached) " >&6 3.1283 else 3.1284 # Double quotes because CXXCPP needs to be expanded 3.1285 @@ -24016,7 +24026,7 @@ 3.1286 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.1287 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1288 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check 3.1289 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1290 +See \`config.log' for more details" "$LINENO" 5; } 3.1291 fi 3.1292 3.1293 ac_ext=cpp 3.1294 @@ -24318,7 +24328,7 @@ 3.1295 set dummy as; ac_word=$2 3.1296 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1297 $as_echo_n "checking for $ac_word... " >&6; } 3.1298 -if test "${ac_cv_path_AS+set}" = set; then : 3.1299 +if ${ac_cv_path_AS+:} false; then : 3.1300 $as_echo_n "(cached) " >&6 3.1301 else 3.1302 case $AS in 3.1303 @@ -24632,7 +24642,7 @@ 3.1304 set dummy $ac_prog; ac_word=$2 3.1305 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1306 $as_echo_n "checking for $ac_word... " >&6; } 3.1307 -if test "${ac_cv_path_NM+set}" = set; then : 3.1308 +if ${ac_cv_path_NM+:} false; then : 3.1309 $as_echo_n "(cached) " >&6 3.1310 else 3.1311 case $NM in 3.1312 @@ -24941,7 +24951,7 @@ 3.1313 set dummy strip; ac_word=$2 3.1314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1315 $as_echo_n "checking for $ac_word... " >&6; } 3.1316 -if test "${ac_cv_path_STRIP+set}" = set; then : 3.1317 +if ${ac_cv_path_STRIP+:} false; then : 3.1318 $as_echo_n "(cached) " >&6 3.1319 else 3.1320 case $STRIP in 3.1321 @@ -25247,7 +25257,7 @@ 3.1322 set dummy mcs; ac_word=$2 3.1323 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1324 $as_echo_n "checking for $ac_word... " >&6; } 3.1325 -if test "${ac_cv_path_MCS+set}" = set; then : 3.1326 +if ${ac_cv_path_MCS+:} false; then : 3.1327 $as_echo_n "(cached) " >&6 3.1328 else 3.1329 case $MCS in 3.1330 @@ -25555,7 +25565,7 @@ 3.1331 set dummy ${ac_tool_prefix}nm; ac_word=$2 3.1332 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1333 $as_echo_n "checking for $ac_word... " >&6; } 3.1334 -if test "${ac_cv_prog_NM+set}" = set; then : 3.1335 +if ${ac_cv_prog_NM+:} false; then : 3.1336 $as_echo_n "(cached) " >&6 3.1337 else 3.1338 if test -n "$NM"; then 3.1339 @@ -25595,7 +25605,7 @@ 3.1340 set dummy nm; ac_word=$2 3.1341 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1342 $as_echo_n "checking for $ac_word... " >&6; } 3.1343 -if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : 3.1344 +if ${ac_cv_prog_ac_ct_NM+:} false; then : 3.1345 $as_echo_n "(cached) " >&6 3.1346 else 3.1347 if test -n "$ac_ct_NM"; then 3.1348 @@ -25913,7 +25923,7 @@ 3.1349 set dummy ${ac_tool_prefix}strip; ac_word=$2 3.1350 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1351 $as_echo_n "checking for $ac_word... " >&6; } 3.1352 -if test "${ac_cv_prog_STRIP+set}" = set; then : 3.1353 +if ${ac_cv_prog_STRIP+:} false; then : 3.1354 $as_echo_n "(cached) " >&6 3.1355 else 3.1356 if test -n "$STRIP"; then 3.1357 @@ -25953,7 +25963,7 @@ 3.1358 set dummy strip; ac_word=$2 3.1359 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1360 $as_echo_n "checking for $ac_word... " >&6; } 3.1361 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : 3.1362 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : 3.1363 $as_echo_n "(cached) " >&6 3.1364 else 3.1365 if test -n "$ac_ct_STRIP"; then 3.1366 @@ -26278,7 +26288,7 @@ 3.1367 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.1368 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1369 $as_echo_n "checking for $ac_word... " >&6; } 3.1370 -if test "${ac_cv_prog_OBJCOPY+set}" = set; then : 3.1371 +if ${ac_cv_prog_OBJCOPY+:} false; then : 3.1372 $as_echo_n "(cached) " >&6 3.1373 else 3.1374 if test -n "$OBJCOPY"; then 3.1375 @@ -26322,7 +26332,7 @@ 3.1376 set dummy $ac_prog; ac_word=$2 3.1377 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1378 $as_echo_n "checking for $ac_word... " >&6; } 3.1379 -if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then : 3.1380 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then : 3.1381 $as_echo_n "(cached) " >&6 3.1382 else 3.1383 if test -n "$ac_ct_OBJCOPY"; then 3.1384 @@ -26649,7 +26659,7 @@ 3.1385 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 3.1386 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1387 $as_echo_n "checking for $ac_word... " >&6; } 3.1388 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : 3.1389 +if ${ac_cv_prog_OBJDUMP+:} false; then : 3.1390 $as_echo_n "(cached) " >&6 3.1391 else 3.1392 if test -n "$OBJDUMP"; then 3.1393 @@ -26693,7 +26703,7 @@ 3.1394 set dummy $ac_prog; ac_word=$2 3.1395 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1396 $as_echo_n "checking for $ac_word... " >&6; } 3.1397 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : 3.1398 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : 3.1399 $as_echo_n "(cached) " >&6 3.1400 else 3.1401 if test -n "$ac_ct_OBJDUMP"; then 3.1402 @@ -27017,7 +27027,7 @@ 3.1403 set dummy lipo; ac_word=$2 3.1404 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1405 $as_echo_n "checking for $ac_word... " >&6; } 3.1406 -if test "${ac_cv_path_LIPO+set}" = set; then : 3.1407 +if ${ac_cv_path_LIPO+:} false; then : 3.1408 $as_echo_n "(cached) " >&6 3.1409 else 3.1410 case $LIPO in 3.1411 @@ -27332,7 +27342,7 @@ 3.1412 3.1413 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 3.1414 $as_echo_n "checking for ANSI C header files... " >&6; } 3.1415 -if test "${ac_cv_header_stdc+set}" = set; then : 3.1416 +if ${ac_cv_header_stdc+:} false; then : 3.1417 $as_echo_n "(cached) " >&6 3.1418 else 3.1419 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 3.1420 @@ -27508,7 +27518,7 @@ 3.1421 for ac_header in stdio.h 3.1422 do : 3.1423 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" 3.1424 -if test "x$ac_cv_header_stdio_h" = x""yes; then : 3.1425 +if test "x$ac_cv_header_stdio_h" = xyes; then : 3.1426 cat >>confdefs.h <<_ACEOF 3.1427 #define HAVE_STDIO_H 1 3.1428 _ACEOF 3.1429 @@ -27537,7 +27547,7 @@ 3.1430 # This bug is HP SR number 8606223364. 3.1431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 3.1432 $as_echo_n "checking size of int *... " >&6; } 3.1433 -if test "${ac_cv_sizeof_int_p+set}" = set; then : 3.1434 +if ${ac_cv_sizeof_int_p+:} false; then : 3.1435 $as_echo_n "(cached) " >&6 3.1436 else 3.1437 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : 3.1438 @@ -27547,7 +27557,7 @@ 3.1439 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 3.1440 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 3.1441 as_fn_error 77 "cannot compute sizeof (int *) 3.1442 -See \`config.log' for more details" "$LINENO" 5 ; } 3.1443 +See \`config.log' for more details" "$LINENO" 5; } 3.1444 else 3.1445 ac_cv_sizeof_int_p=0 3.1446 fi 3.1447 @@ -27594,7 +27604,7 @@ 3.1448 # 3.1449 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 3.1450 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } 3.1451 -if test "${ac_cv_c_bigendian+set}" = set; then : 3.1452 +if ${ac_cv_c_bigendian+:} false; then : 3.1453 $as_echo_n "(cached) " >&6 3.1454 else 3.1455 ac_cv_c_bigendian=unknown 3.1456 @@ -28248,6 +28258,10 @@ 3.1457 fi 3.1458 if test "x$OPENJDK_TARGET_OS" = xmacosx; then 3.1459 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE" 3.1460 + # Adding these macros will make it an error to link to mac APIs newer than OS version 10.7 3.1461 + MACOSX_REQUIRED_VERSION=1070 3.1462 + 3.1463 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)" 3.1464 fi 3.1465 if test "x$OPENJDK_TARGET_OS" = xbsd; then 3.1466 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE" 3.1467 @@ -28594,8 +28608,8 @@ 3.1468 have_x=disabled 3.1469 else 3.1470 case $x_includes,$x_libraries in #( 3.1471 - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( 3.1472 - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : 3.1473 + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( 3.1474 + *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : 3.1475 $as_echo_n "(cached) " >&6 3.1476 else 3.1477 # One or both of the vars are not set, and there is no cached value. 3.1478 @@ -28872,7 +28886,7 @@ 3.1479 else 3.1480 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 3.1481 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } 3.1482 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : 3.1483 +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : 3.1484 $as_echo_n "(cached) " >&6 3.1485 else 3.1486 ac_check_lib_save_LIBS=$LIBS 3.1487 @@ -28906,14 +28920,14 @@ 3.1488 fi 3.1489 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 3.1490 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } 3.1491 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : 3.1492 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : 3.1493 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 3.1494 fi 3.1495 3.1496 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 3.1497 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 3.1498 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } 3.1499 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : 3.1500 +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : 3.1501 $as_echo_n "(cached) " >&6 3.1502 else 3.1503 ac_check_lib_save_LIBS=$LIBS 3.1504 @@ -28947,7 +28961,7 @@ 3.1505 fi 3.1506 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 3.1507 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } 3.1508 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : 3.1509 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : 3.1510 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 3.1511 fi 3.1512 3.1513 @@ -28966,14 +28980,14 @@ 3.1514 # The functions gethostbyname, getservbyname, and inet_addr are 3.1515 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. 3.1516 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" 3.1517 -if test "x$ac_cv_func_gethostbyname" = x""yes; then : 3.1518 +if test "x$ac_cv_func_gethostbyname" = xyes; then : 3.1519 3.1520 fi 3.1521 3.1522 if test $ac_cv_func_gethostbyname = no; then 3.1523 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 3.1524 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } 3.1525 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : 3.1526 +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : 3.1527 $as_echo_n "(cached) " >&6 3.1528 else 3.1529 ac_check_lib_save_LIBS=$LIBS 3.1530 @@ -29007,14 +29021,14 @@ 3.1531 fi 3.1532 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 3.1533 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } 3.1534 -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : 3.1535 +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : 3.1536 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 3.1537 fi 3.1538 3.1539 if test $ac_cv_lib_nsl_gethostbyname = no; then 3.1540 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 3.1541 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } 3.1542 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : 3.1543 +if ${ac_cv_lib_bsd_gethostbyname+:} false; then : 3.1544 $as_echo_n "(cached) " >&6 3.1545 else 3.1546 ac_check_lib_save_LIBS=$LIBS 3.1547 @@ -29048,7 +29062,7 @@ 3.1548 fi 3.1549 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 3.1550 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } 3.1551 -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : 3.1552 +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : 3.1553 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" 3.1554 fi 3.1555 3.1556 @@ -29063,14 +29077,14 @@ 3.1557 # must be given before -lnsl if both are needed. We assume that 3.1558 # if connect needs -lnsl, so does gethostbyname. 3.1559 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect" 3.1560 -if test "x$ac_cv_func_connect" = x""yes; then : 3.1561 +if test "x$ac_cv_func_connect" = xyes; then : 3.1562 3.1563 fi 3.1564 3.1565 if test $ac_cv_func_connect = no; then 3.1566 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 3.1567 $as_echo_n "checking for connect in -lsocket... " >&6; } 3.1568 -if test "${ac_cv_lib_socket_connect+set}" = set; then : 3.1569 +if ${ac_cv_lib_socket_connect+:} false; then : 3.1570 $as_echo_n "(cached) " >&6 3.1571 else 3.1572 ac_check_lib_save_LIBS=$LIBS 3.1573 @@ -29104,7 +29118,7 @@ 3.1574 fi 3.1575 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 3.1576 $as_echo "$ac_cv_lib_socket_connect" >&6; } 3.1577 -if test "x$ac_cv_lib_socket_connect" = x""yes; then : 3.1578 +if test "x$ac_cv_lib_socket_connect" = xyes; then : 3.1579 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 3.1580 fi 3.1581 3.1582 @@ -29112,14 +29126,14 @@ 3.1583 3.1584 # Guillermo Gomez says -lposix is necessary on A/UX. 3.1585 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove" 3.1586 -if test "x$ac_cv_func_remove" = x""yes; then : 3.1587 +if test "x$ac_cv_func_remove" = xyes; then : 3.1588 3.1589 fi 3.1590 3.1591 if test $ac_cv_func_remove = no; then 3.1592 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 3.1593 $as_echo_n "checking for remove in -lposix... " >&6; } 3.1594 -if test "${ac_cv_lib_posix_remove+set}" = set; then : 3.1595 +if ${ac_cv_lib_posix_remove+:} false; then : 3.1596 $as_echo_n "(cached) " >&6 3.1597 else 3.1598 ac_check_lib_save_LIBS=$LIBS 3.1599 @@ -29153,7 +29167,7 @@ 3.1600 fi 3.1601 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 3.1602 $as_echo "$ac_cv_lib_posix_remove" >&6; } 3.1603 -if test "x$ac_cv_lib_posix_remove" = x""yes; then : 3.1604 +if test "x$ac_cv_lib_posix_remove" = xyes; then : 3.1605 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 3.1606 fi 3.1607 3.1608 @@ -29161,14 +29175,14 @@ 3.1609 3.1610 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 3.1611 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat" 3.1612 -if test "x$ac_cv_func_shmat" = x""yes; then : 3.1613 +if test "x$ac_cv_func_shmat" = xyes; then : 3.1614 3.1615 fi 3.1616 3.1617 if test $ac_cv_func_shmat = no; then 3.1618 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 3.1619 $as_echo_n "checking for shmat in -lipc... " >&6; } 3.1620 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then : 3.1621 +if ${ac_cv_lib_ipc_shmat+:} false; then : 3.1622 $as_echo_n "(cached) " >&6 3.1623 else 3.1624 ac_check_lib_save_LIBS=$LIBS 3.1625 @@ -29202,7 +29216,7 @@ 3.1626 fi 3.1627 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 3.1628 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } 3.1629 -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : 3.1630 +if test "x$ac_cv_lib_ipc_shmat" = xyes; then : 3.1631 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 3.1632 fi 3.1633 3.1634 @@ -29220,7 +29234,7 @@ 3.1635 # John Interrante, Karl Berry 3.1636 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 3.1637 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } 3.1638 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : 3.1639 +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : 3.1640 $as_echo_n "(cached) " >&6 3.1641 else 3.1642 ac_check_lib_save_LIBS=$LIBS 3.1643 @@ -29254,7 +29268,7 @@ 3.1644 fi 3.1645 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 3.1646 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } 3.1647 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : 3.1648 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : 3.1649 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 3.1650 fi 3.1651 3.1652 @@ -29263,6 +29277,12 @@ 3.1653 fi 3.1654 3.1655 3.1656 +# AC_PATH_XTRA creates X_LIBS and sometimes adds -R flags. When cross compiling 3.1657 +# this doesn't make sense so we remove it. 3.1658 +if test "x$COMPILE_TYPE" = xcross; then 3.1659 + X_LIBS=`$ECHO $X_LIBS | $SED 's/-R \{0,1\}[^ ]*//g'` 3.1660 +fi 3.1661 + 3.1662 if test "x$no_x" = xyes && test "x$X11_NOT_NEEDED" != xyes; then 3.1663 3.1664 # Print a helpful message on how to acquire the necessary build dependency. 3.1665 @@ -30261,7 +30281,7 @@ 3.1666 LDFLAGS="$FREETYPE2_LIBS" 3.1667 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 3.1668 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } 3.1669 -if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then : 3.1670 +if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then : 3.1671 $as_echo_n "(cached) " >&6 3.1672 else 3.1673 ac_check_lib_save_LIBS=$LIBS 3.1674 @@ -30295,7 +30315,7 @@ 3.1675 fi 3.1676 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 3.1677 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } 3.1678 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then : 3.1679 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : 3.1680 FREETYPE2_FOUND=true 3.1681 else 3.1682 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 3.1683 @@ -30583,7 +30603,7 @@ 3.1684 for ac_header in alsa/asoundlib.h 3.1685 do : 3.1686 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" 3.1687 -if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then : 3.1688 +if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then : 3.1689 cat >>confdefs.h <<_ACEOF 3.1690 #define HAVE_ALSA_ASOUNDLIB_H 1 3.1691 _ACEOF 3.1692 @@ -30642,7 +30662,7 @@ 3.1693 USE_EXTERNAL_LIBJPEG=true 3.1694 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5 3.1695 $as_echo_n "checking for main in -ljpeg... " >&6; } 3.1696 -if test "${ac_cv_lib_jpeg_main+set}" = set; then : 3.1697 +if ${ac_cv_lib_jpeg_main+:} false; then : 3.1698 $as_echo_n "(cached) " >&6 3.1699 else 3.1700 ac_check_lib_save_LIBS=$LIBS 3.1701 @@ -30670,7 +30690,7 @@ 3.1702 fi 3.1703 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5 3.1704 $as_echo "$ac_cv_lib_jpeg_main" >&6; } 3.1705 -if test "x$ac_cv_lib_jpeg_main" = x""yes; then : 3.1706 +if test "x$ac_cv_lib_jpeg_main" = xyes; then : 3.1707 cat >>confdefs.h <<_ACEOF 3.1708 #define HAVE_LIBJPEG 1 3.1709 _ACEOF 3.1710 @@ -30694,7 +30714,7 @@ 3.1711 USE_EXTERNAL_LIBJPEG=true 3.1712 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5 3.1713 $as_echo_n "checking for main in -lgif... " >&6; } 3.1714 -if test "${ac_cv_lib_gif_main+set}" = set; then : 3.1715 +if ${ac_cv_lib_gif_main+:} false; then : 3.1716 $as_echo_n "(cached) " >&6 3.1717 else 3.1718 ac_check_lib_save_LIBS=$LIBS 3.1719 @@ -30722,7 +30742,7 @@ 3.1720 fi 3.1721 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5 3.1722 $as_echo "$ac_cv_lib_gif_main" >&6; } 3.1723 -if test "x$ac_cv_lib_gif_main" = x""yes; then : 3.1724 +if test "x$ac_cv_lib_gif_main" = xyes; then : 3.1725 cat >>confdefs.h <<_ACEOF 3.1726 #define HAVE_LIBGIF 1 3.1727 _ACEOF 3.1728 @@ -30752,7 +30772,7 @@ 3.1729 3.1730 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 3.1731 $as_echo_n "checking for compress in -lz... " >&6; } 3.1732 -if test "${ac_cv_lib_z_compress+set}" = set; then : 3.1733 +if ${ac_cv_lib_z_compress+:} false; then : 3.1734 $as_echo_n "(cached) " >&6 3.1735 else 3.1736 ac_check_lib_save_LIBS=$LIBS 3.1737 @@ -30786,7 +30806,7 @@ 3.1738 fi 3.1739 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 3.1740 $as_echo "$ac_cv_lib_z_compress" >&6; } 3.1741 -if test "x$ac_cv_lib_z_compress" = x""yes; then : 3.1742 +if test "x$ac_cv_lib_z_compress" = xyes; then : 3.1743 ZLIB_FOUND=yes 3.1744 else 3.1745 ZLIB_FOUND=no 3.1746 @@ -30879,7 +30899,7 @@ 3.1747 3.1748 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 3.1749 $as_echo_n "checking for cos in -lm... " >&6; } 3.1750 -if test "${ac_cv_lib_m_cos+set}" = set; then : 3.1751 +if ${ac_cv_lib_m_cos+:} false; then : 3.1752 $as_echo_n "(cached) " >&6 3.1753 else 3.1754 ac_check_lib_save_LIBS=$LIBS 3.1755 @@ -30913,7 +30933,7 @@ 3.1756 fi 3.1757 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 3.1758 $as_echo "$ac_cv_lib_m_cos" >&6; } 3.1759 -if test "x$ac_cv_lib_m_cos" = x""yes; then : 3.1760 +if test "x$ac_cv_lib_m_cos" = xyes; then : 3.1761 cat >>confdefs.h <<_ACEOF 3.1762 #define HAVE_LIBM 1 3.1763 _ACEOF 3.1764 @@ -30937,7 +30957,7 @@ 3.1765 LIBS="" 3.1766 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 3.1767 $as_echo_n "checking for dlopen in -ldl... " >&6; } 3.1768 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : 3.1769 +if ${ac_cv_lib_dl_dlopen+:} false; then : 3.1770 $as_echo_n "(cached) " >&6 3.1771 else 3.1772 ac_check_lib_save_LIBS=$LIBS 3.1773 @@ -30971,7 +30991,7 @@ 3.1774 fi 3.1775 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 3.1776 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } 3.1777 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : 3.1778 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : 3.1779 cat >>confdefs.h <<_ACEOF 3.1780 #define HAVE_LIBDL 1 3.1781 _ACEOF 3.1782 @@ -31615,7 +31635,7 @@ 3.1783 set dummy ccache; ac_word=$2 3.1784 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 3.1785 $as_echo_n "checking for $ac_word... " >&6; } 3.1786 -if test "${ac_cv_path_CCACHE+set}" = set; then : 3.1787 +if ${ac_cv_path_CCACHE+:} false; then : 3.1788 $as_echo_n "(cached) " >&6 3.1789 else 3.1790 case $CCACHE in 3.1791 @@ -31876,10 +31896,21 @@ 3.1792 :end' >>confcache 3.1793 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 3.1794 if test -w "$cache_file"; then 3.1795 - test "x$cache_file" != "x/dev/null" && 3.1796 + if test "x$cache_file" != "x/dev/null"; then 3.1797 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 3.1798 $as_echo "$as_me: updating cache $cache_file" >&6;} 3.1799 - cat confcache >$cache_file 3.1800 + if test ! -f "$cache_file" || test -h "$cache_file"; then 3.1801 + cat confcache >"$cache_file" 3.1802 + else 3.1803 + case $cache_file in #( 3.1804 + */* | ?:*) 3.1805 + mv -f confcache "$cache_file"$$ && 3.1806 + mv -f "$cache_file"$$ "$cache_file" ;; #( 3.1807 + *) 3.1808 + mv -f confcache "$cache_file" ;; 3.1809 + esac 3.1810 + fi 3.1811 + fi 3.1812 else 3.1813 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 3.1814 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 3.1815 @@ -31911,7 +31942,7 @@ 3.1816 3.1817 3.1818 3.1819 -: ${CONFIG_STATUS=./config.status} 3.1820 +: "${CONFIG_STATUS=./config.status}" 3.1821 ac_write_fail=0 3.1822 ac_clean_files_save=$ac_clean_files 3.1823 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 3.1824 @@ -32012,6 +32043,7 @@ 3.1825 IFS=" "" $as_nl" 3.1826 3.1827 # Find who we are. Look in the path if we contain no directory separator. 3.1828 +as_myself= 3.1829 case $0 in #(( 3.1830 *[\\/]* ) as_myself=$0 ;; 3.1831 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 3.1832 @@ -32319,7 +32351,7 @@ 3.1833 # values after options handling. 3.1834 ac_log=" 3.1835 This file was extended by OpenJDK $as_me jdk8, which was 3.1836 -generated by GNU Autoconf 2.67. Invocation command line was 3.1837 +generated by GNU Autoconf 2.68. Invocation command line was 3.1838 3.1839 CONFIG_FILES = $CONFIG_FILES 3.1840 CONFIG_HEADERS = $CONFIG_HEADERS 3.1841 @@ -32382,7 +32414,7 @@ 3.1842 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 3.1843 ac_cs_version="\\ 3.1844 OpenJDK config.status jdk8 3.1845 -configured by $0, generated by GNU Autoconf 2.67, 3.1846 +configured by $0, generated by GNU Autoconf 2.68, 3.1847 with options \\"\$ac_cs_config\\" 3.1848 3.1849 Copyright (C) 2010 Free Software Foundation, Inc. 3.1850 @@ -32511,7 +32543,7 @@ 3.1851 "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;; 3.1852 "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;; 3.1853 3.1854 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 3.1855 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 3.1856 esac 3.1857 done 3.1858 3.1859 @@ -32533,9 +32565,10 @@ 3.1860 # after its creation but before its name has been assigned to `$tmp'. 3.1861 $debug || 3.1862 { 3.1863 - tmp= 3.1864 + tmp= ac_tmp= 3.1865 trap 'exit_status=$? 3.1866 - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 3.1867 + : "${ac_tmp:=$tmp}" 3.1868 + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 3.1869 ' 0 3.1870 trap 'as_fn_exit 1' 1 2 13 15 3.1871 } 3.1872 @@ -32543,12 +32576,13 @@ 3.1873 3.1874 { 3.1875 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 3.1876 - test -n "$tmp" && test -d "$tmp" 3.1877 + test -d "$tmp" 3.1878 } || 3.1879 { 3.1880 tmp=./conf$$-$RANDOM 3.1881 (umask 077 && mkdir "$tmp") 3.1882 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 3.1883 +ac_tmp=$tmp 3.1884 3.1885 # Set up the scripts for CONFIG_FILES section. 3.1886 # No need to generate them if there are no CONFIG_FILES. 3.1887 @@ -32570,7 +32604,7 @@ 3.1888 ac_cs_awk_cr=$ac_cr 3.1889 fi 3.1890 3.1891 -echo 'BEGIN {' >"$tmp/subs1.awk" && 3.1892 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 3.1893 _ACEOF 3.1894 3.1895 3.1896 @@ -32598,7 +32632,7 @@ 3.1897 rm -f conf$$subs.sh 3.1898 3.1899 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 3.1900 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 3.1901 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 3.1902 _ACEOF 3.1903 sed -n ' 3.1904 h 3.1905 @@ -32646,7 +32680,7 @@ 3.1906 rm -f conf$$subs.awk 3.1907 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 3.1908 _ACAWK 3.1909 -cat >>"\$tmp/subs1.awk" <<_ACAWK && 3.1910 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 3.1911 for (key in S) S_is_set[key] = 1 3.1912 FS = "" 3.1913 3.1914 @@ -32678,7 +32712,7 @@ 3.1915 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 3.1916 else 3.1917 cat 3.1918 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 3.1919 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 3.1920 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 3.1921 _ACEOF 3.1922 3.1923 @@ -32712,7 +32746,7 @@ 3.1924 # No need to generate them if there are no CONFIG_HEADERS. 3.1925 # This happens for instance with `./config.status Makefile'. 3.1926 if test -n "$CONFIG_HEADERS"; then 3.1927 -cat >"$tmp/defines.awk" <<\_ACAWK || 3.1928 +cat >"$ac_tmp/defines.awk" <<\_ACAWK || 3.1929 BEGIN { 3.1930 _ACEOF 3.1931 3.1932 @@ -32724,8 +32758,8 @@ 3.1933 # handling of long lines. 3.1934 ac_delim='%!_!# ' 3.1935 for ac_last_try in false false :; do 3.1936 - ac_t=`sed -n "/$ac_delim/p" confdefs.h` 3.1937 - if test -z "$ac_t"; then 3.1938 + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 3.1939 + if test -z "$ac_tt"; then 3.1940 break 3.1941 elif $ac_last_try; then 3.1942 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 3.1943 @@ -32826,7 +32860,7 @@ 3.1944 esac 3.1945 case $ac_mode$ac_tag in 3.1946 :[FHL]*:*);; 3.1947 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 3.1948 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 3.1949 :[FH]-) ac_tag=-:-;; 3.1950 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 3.1951 esac 3.1952 @@ -32845,7 +32879,7 @@ 3.1953 for ac_f 3.1954 do 3.1955 case $ac_f in 3.1956 - -) ac_f="$tmp/stdin";; 3.1957 + -) ac_f="$ac_tmp/stdin";; 3.1958 *) # Look for the file first in the build tree, then in the source tree 3.1959 # (if the path is not absolute). The absolute path cannot be DOS-style, 3.1960 # because $ac_f cannot contain `:'. 3.1961 @@ -32854,7 +32888,7 @@ 3.1962 [\\/$]*) false;; 3.1963 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 3.1964 esac || 3.1965 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 3.1966 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 3.1967 esac 3.1968 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 3.1969 as_fn_append ac_file_inputs " '$ac_f'" 3.1970 @@ -32880,8 +32914,8 @@ 3.1971 esac 3.1972 3.1973 case $ac_tag in 3.1974 - *:-:* | *:-) cat >"$tmp/stdin" \ 3.1975 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 3.1976 + *:-:* | *:-) cat >"$ac_tmp/stdin" \ 3.1977 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 3.1978 esac 3.1979 ;; 3.1980 esac 3.1981 @@ -33006,21 +33040,22 @@ 3.1982 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t 3.1983 $ac_datarootdir_hack 3.1984 " 3.1985 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 3.1986 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 3.1987 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ 3.1988 + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 3.1989 3.1990 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 3.1991 - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 3.1992 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 3.1993 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 3.1994 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 3.1995 + "$ac_tmp/out"`; test -z "$ac_out"; } && 3.1996 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 3.1997 which seems to be undefined. Please make sure it is defined" >&5 3.1998 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 3.1999 which seems to be undefined. Please make sure it is defined" >&2;} 3.2000 3.2001 - rm -f "$tmp/stdin" 3.2002 + rm -f "$ac_tmp/stdin" 3.2003 case $ac_file in 3.2004 - -) cat "$tmp/out" && rm -f "$tmp/out";; 3.2005 - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 3.2006 + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 3.2007 + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 3.2008 esac \ 3.2009 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 3.2010 ;; 3.2011 @@ -33031,20 +33066,20 @@ 3.2012 if test x"$ac_file" != x-; then 3.2013 { 3.2014 $as_echo "/* $configure_input */" \ 3.2015 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 3.2016 - } >"$tmp/config.h" \ 3.2017 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 3.2018 + } >"$ac_tmp/config.h" \ 3.2019 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 3.2020 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 3.2021 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 3.2022 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 3.2023 $as_echo "$as_me: $ac_file is unchanged" >&6;} 3.2024 else 3.2025 rm -f "$ac_file" 3.2026 - mv "$tmp/config.h" "$ac_file" \ 3.2027 + mv "$ac_tmp/config.h" "$ac_file" \ 3.2028 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 3.2029 fi 3.2030 else 3.2031 $as_echo "/* $configure_input */" \ 3.2032 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 3.2033 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 3.2034 || as_fn_error $? "could not create -" "$LINENO" 5 3.2035 fi 3.2036 ;;
4.1 --- a/common/autoconf/spec.gmk.in Thu Feb 21 15:25:31 2013 -0400 4.2 +++ b/common/autoconf/spec.gmk.in Fri Feb 22 13:09:37 2013 -0400 4.3 @@ -285,6 +285,9 @@ 4.4 X_LIBS:=@X_LIBS@ 4.5 OPENWIN_HOME:=@OPENWIN_HOME@ 4.6 4.7 +# The lowest required version of macosx to enforce compatiblity for 4.8 +MACOSX_REQUIRED_VERSION=@MACOSX_REQUIRED_VERSION@ 4.9 + 4.10 # There are two types: CC or CL 4.11 # CC is gcc and others behaving reasonably similar. 4.12 # CL is cl.exe only. 4.13 @@ -437,6 +440,12 @@ 4.14 4.15 JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner 4.16 4.17 +# You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ... 4.18 +BOOTSTRAP_JAVAC_JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 4.19 +BOOTSTRAP_JAVAC_ARGS:="-Xbootclasspath/p:$(BOOTSTRAP_JAVAC_JAR)" -cp $(BOOTSTRAP_JAVAC_JAR) 4.20 +NEW_JAVAC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javac.Main 4.21 +NEW_JAVADOC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javadoc.Main 4.22 + 4.23 # Base flags for RC 4.24 # Guarding this against resetting value. Legacy make files include spec multiple 4.25 # times.
5.1 --- a/common/autoconf/toolchain.m4 Thu Feb 21 15:25:31 2013 -0400 5.2 +++ b/common/autoconf/toolchain.m4 Fri Feb 22 13:09:37 2013 -0400 5.3 @@ -876,6 +876,10 @@ 5.4 fi 5.5 if test "x$OPENJDK_TARGET_OS" = xmacosx; then 5.6 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMACOSX -D_ALLBSD_SOURCE" 5.7 + # Adding these macros will make it an error to link to mac APIs newer than OS version 10.7 5.8 + MACOSX_REQUIRED_VERSION=1070 5.9 + AC_SUBST(MACOSX_REQUIRED_VERSION) 5.10 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DMAC_OS_X_VERSION_MAX_ALLOWED=\$(MACOSX_REQUIRED_VERSION) -DMAC_OS_X_VERSION_MIN_REQUIRED=\$(MACOSX_REQUIRED_VERSION)" 5.11 fi 5.12 if test "x$OPENJDK_TARGET_OS" = xbsd; then 5.13 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DBSD -D_ALLBSD_SOURCE"
6.1 --- a/common/bin/hgforest.sh Thu Feb 21 15:25:31 2013 -0400 6.2 +++ b/common/bin/hgforest.sh Fri Feb 22 13:09:37 2013 -0400 6.3 @@ -64,33 +64,33 @@ 6.4 mkdir -p ${tmp} 6.5 6.6 safe_interrupt () { 6.7 - if [ -d ${tmp} ]; then 6.8 - if [ "`ls ${tmp}`" != "" ]; then 6.9 - echo "Waiting for processes ( `cat ${tmp}/* | tr '\n' ' '`) to terminate nicely!" 6.10 + if [ -d ${tmp} ]; then 6.11 + if [ "`ls ${tmp}/*.pid`" != "" ]; then 6.12 + echo "Waiting for processes ( `cat ${tmp}/*.pid | tr '\n' ' '`) to terminate nicely!" 6.13 sleep 1 6.14 # Pipe stderr to dev/null to silence kill, that complains when trying to kill 6.15 # a subprocess that has already exited. 6.16 - kill -TERM `cat ${tmp}/* | tr '\n' ' '` 2> /dev/null 6.17 - wait 6.18 - echo Interrupt complete! 6.19 - fi 6.20 + kill -TERM `cat ${tmp}/*.pid | tr '\n' ' '` 2> /dev/null 6.21 + wait 6.22 + echo Interrupt complete! 6.23 + fi 6.24 fi 6.25 rm -f -r ${tmp} 6.26 exit 1 6.27 } 6.28 6.29 nice_exit () { 6.30 - if [ -d ${tmp} ]; then 6.31 - if [ "`ls ${tmp}`" != "" ]; then 6.32 - wait 6.33 - fi 6.34 + if [ -d ${tmp} ]; then 6.35 + if [ "`ls ${tmp}`" != "" ]; then 6.36 + wait 6.37 + fi 6.38 fi 6.39 rm -f -r ${tmp} 6.40 } 6.41 6.42 trap 'safe_interrupt' INT QUIT 6.43 trap 'nice_exit' EXIT 6.44 - 6.45 + 6.46 # Only look in specific locations for possible forests (avoids long searches) 6.47 pull_default="" 6.48 repos="" 6.49 @@ -172,14 +172,26 @@ 6.50 if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then 6.51 pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`" 6.52 echo ${hg} clone ${pull_newrepo} ${i} 6.53 - ${hg} clone ${pull_newrepo} ${i} & 6.54 + path="`dirname ${i}`" 6.55 + if [ "${path}" != "." ] ; then 6.56 + times=0 6.57 + while [ ! -d "${path}" ] ## nested repo, ensure containing dir exists 6.58 + do 6.59 + times=`expr ${times} '+' 1` 6.60 + if [ `expr ${times} '%' 10` -eq 0 ] ; then 6.61 + echo ${path} still not created, waiting... 6.62 + fi 6.63 + sleep 5 6.64 + done 6.65 + fi 6.66 + (${hg} clone ${pull_newrepo} ${i}; echo "$?" > ${tmp}/${repopidfile}.pid.rc )& 6.67 else 6.68 echo "cd ${i} && ${hg} $*" 6.69 - cd ${i} && ${hg} "$@" & 6.70 - fi 6.71 + cd ${i} && (${hg} "$@"; echo "$?" > ${tmp}/${repopidfile}.pid.rc )& 6.72 + fi 6.73 echo $! > ${tmp}/${repopidfile}.pid 6.74 ) 2>&1 | sed -e "s@^@${reponame}: @") & 6.75 - 6.76 + 6.77 if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then 6.78 sleep 2 6.79 echo Waiting 5 secs before spawning next background command. 6.80 @@ -189,6 +201,15 @@ 6.81 # Wait for all hg commands to complete 6.82 wait 6.83 6.84 -# Terminate with exit 0 all the time (hard to know when to say "failed") 6.85 -exit 0 6.86 - 6.87 +# Terminate with exit 0 only if all subprocesses were successful 6.88 +ec=0 6.89 +if [ -d ${tmp} ]; then 6.90 + for rc in ${tmp}/*.pid.rc ; do 6.91 + exit_code=`cat ${rc} | tr -d ' \n\r'` 6.92 + if [ "${exit_code}" != "0" ] ; then 6.93 + echo "WARNING: ${rc} exited abnormally." 6.94 + ec=1 6.95 + fi 6.96 + done 6.97 +fi 6.98 +exit ${ec}
7.1 --- a/common/makefiles/IdlCompilation.gmk Thu Feb 21 15:25:31 2013 -0400 7.2 +++ b/common/makefiles/IdlCompilation.gmk Fri Feb 22 13:09:37 2013 -0400 7.3 @@ -71,7 +71,7 @@ 7.4 $4 7.5 $(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6) 7.6 $(CP) -rp $3/$$($4_TMPDIR)/* $3 7.7 - ($(CD) $3/$$($4_TMPDIR); find . -type f | sed 's!\./!$3/!g' | awk '{ print $$$$1 ": $4" }' > $5) 7.8 + ($(CD) $3/$$($4_TMPDIR) && $(FIND) . -type f | $(SED) 's!\./!$3/!g' | $(NAWK) '{ print $$$$1 ": $4" }' > $5) 7.9 $(RM) -rf $3/$$($4_TMPDIR) 7.10 endef 7.11
8.1 --- a/common/makefiles/JavaCompilation.gmk Thu Feb 21 15:25:31 2013 -0400 8.2 +++ b/common/makefiles/JavaCompilation.gmk Fri Feb 22 13:09:37 2013 -0400 8.3 @@ -42,8 +42,8 @@ 8.4 FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST 8.5 8.6 define SetupJavaCompiler 8.7 - # param 1 is for example BOOT_JAVAC or NEW_JAVAC 8.8 - # This is the name later used to decide which java compiler to use. 8.9 + # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE 8.10 + # This is the name of the compiler setup. 8.11 # param 2-9 are named args. 8.12 # JVM:=The jvm used to run the javac/javah command 8.13 # JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out 8.14 @@ -143,8 +143,8 @@ 8.15 ifneq (,$2) 8.16 $1_DEPS:=$2 8.17 else 8.18 - $1_DEPS:=$$(filter $$(addprefix %,$$($1_FIND_PATTERNS)),\ 8.19 - $$(call CacheFind $$($1_SRCS))) 8.20 + $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)),\ 8.21 + $$(call CacheFind,$$($1_SRCS))) 8.22 ifneq (,$$($1_GREP_INCLUDE_PATTERNS)) 8.23 $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS)) 8.24 endif 8.25 @@ -487,10 +487,10 @@ 8.26 # Using sjavac to compile. 8.27 $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state 8.28 8.29 - # Create SJAVAC variable, 8.30 - # expects $1_JAVAC to be "bootclasspathprepend -jar ...javac.jar" 8.31 - # and it is rewritten into "bootclasspathprepend com.sun.tools.sjavac.Main" 8.32 - $1_SJAVAC:=$$(word 1,$$($1_JAVAC)) -cp $$(word 3,$$($1_JAVAC)) com.sun.tools.sjavac.Main 8.33 + # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be 8.34 + # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main" 8.35 + # and javac is simply replaced with sjavac. 8.36 + $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC)) 8.37 8.38 # Set the $1_REMOTE to spawn a background javac server. 8.39 $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
9.1 --- a/common/makefiles/Jprt.gmk Thu Feb 21 15:25:31 2013 -0400 9.2 +++ b/common/makefiles/Jprt.gmk Fri Feb 22 13:09:37 2013 -0400 9.3 @@ -179,27 +179,52 @@ 9.4 $(JPRT_ARCHIVE_BUNDLE): bundles 9.5 $(MKDIR) -p $(@D) 9.6 $(RM) $@ 9.7 - $(CP) $(BUILD_OUTPUT)/bundles/j2sdk-image.zip $@ 9.8 + $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@ 9.9 9.10 -# This target must be called in the context of a SPEC file 9.11 -bundles: all 9.12 +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 9.13 + SRC_JDK_IMAGE_DIR := $(JDK_OVERLAY_IMAGE_DIR) 9.14 + SRC_JRE_IMAGE_DIR := $(JRE_OVERLAY_IMAGE_DIR) 9.15 +else 9.16 + SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) 9.17 + SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) 9.18 +endif 9.19 +SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR) 9.20 +SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) 9.21 + 9.22 +# Bundle up the images 9.23 +bundles: all bundles-only 9.24 +bundles-only: start-make 9.25 @$(call TargetEnter) 9.26 $(MKDIR) -p $(BUILD_OUTPUT)/bundles 9.27 -ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 9.28 - $(CD) $(JDK_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . 9.29 - $(CD) $(JRE_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . 9.30 -else 9.31 - $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . 9.32 - $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . 9.33 + $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . 9.34 + $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . 9.35 if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ 9.36 $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ 9.37 fi 9.38 + @$(call TargetExit) 9.39 + 9.40 +# Copy images to one unified location regardless of platform etc. 9.41 +final-images: all final-images-only 9.42 +final-images-only: start-make 9.43 + @$(call TargetEnter) 9.44 + $(RM) -r $(BUILD_OUTPUT)/final-images 9.45 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR) 9.46 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR) 9.47 + $(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/ 9.48 + $(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/ 9.49 +ifeq ($(OPENJDK_TARGET_OS),macosx) 9.50 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR) 9.51 + $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR) 9.52 + $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/ 9.53 + $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/ 9.54 endif 9.55 @$(call TargetExit) 9.56 9.57 + 9.58 # Keep track of phony targets 9.59 PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \ 9.60 - jprt_build_generic bundles jprt_bundle 9.61 + jprt_build_generic bundles jprt_bundle \ 9.62 + final-images final-images-only 9.63 9.64 ########################################################################### 9.65 # Phony targets
10.1 --- a/common/makefiles/Main.gmk Thu Feb 21 15:25:31 2013 -0400 10.2 +++ b/common/makefiles/Main.gmk Fri Feb 22 13:09:37 2013 -0400 10.3 @@ -75,7 +75,14 @@ 10.4 all: overlay-images 10.5 endif 10.6 10.7 -start-make: 10.8 +# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration 10.9 +# is up to date after changes to configure 10.10 +$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*) 10.11 + @$(ECHO) ERROR: $(SPEC) is not up to date 10.12 + @$(ECHO) Please rerun configure! 10.13 + @if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi 10.14 + 10.15 +start-make: $(SPEC) 10.16 @$(call AtMakeStart) 10.17 10.18 langtools: langtools-only 10.19 @@ -128,7 +135,9 @@ 10.20 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos) 10.21 @$(call TargetExit) 10.22 10.23 -images: source-tips demos nashorn images-only 10.24 +# Note: This double-colon rule is intentional, to support 10.25 +# custom make file integration. 10.26 +images:: source-tips demos images-only 10.27 images-only: start-make 10.28 @$(call TargetEnter) 10.29 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images) 10.30 @@ -140,6 +149,17 @@ 10.31 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images) 10.32 @$(call TargetExit) 10.33 10.34 +profiles: profiles-oscheck source-tips jdk hotspot profiles-only 10.35 +profiles-only: start-make 10.36 + @$(call TargetEnter) 10.37 + @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles) 10.38 + @$(call TargetExit) 10.39 + 10.40 +profiles-oscheck: 10.41 +ifneq ($(OPENJDK_TARGET_OS), linux) 10.42 + @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1 10.43 +endif 10.44 + 10.45 install: images install-only 10.46 install-only: start-make 10.47 @$(call TargetEnter) 10.48 @@ -166,7 +186,7 @@ 10.49 10.50 test: start-make 10.51 @$(call TargetEnter) 10.52 - @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) MAKEFLAGS= -j1 PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true 10.53 + @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true 10.54 @$(call TargetExit) 10.55 10.56 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be 10.57 @@ -225,5 +245,6 @@ 10.58 .PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only 10.59 .PHONY: all test clean dist-clean bootcycle-images start-make 10.60 .PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build 10.61 +.PHONY: profiles profiles-only profiles-oscheck 10.62 10.63 FRC: # Force target
11.1 --- a/common/makefiles/javadoc/CORE_PKGS.gmk Thu Feb 21 15:25:31 2013 -0400 11.2 +++ b/common/makefiles/javadoc/CORE_PKGS.gmk Fri Feb 22 13:09:37 2013 -0400 11.3 @@ -128,9 +128,9 @@ 11.4 java.text \ 11.5 java.text.spi \ 11.6 java.time \ 11.7 + java.time.chrono \ 11.8 + java.time.format \ 11.9 java.time.temporal \ 11.10 - java.time.calendar \ 11.11 - java.time.format \ 11.12 java.time.zone \ 11.13 java.util \ 11.14 java.util.concurrent \
12.1 --- a/common/makefiles/javadoc/Javadoc.gmk Thu Feb 21 15:25:31 2013 -0400 12.2 +++ b/common/makefiles/javadoc/Javadoc.gmk Fri Feb 22 13:09:37 2013 -0400 12.3 @@ -46,14 +46,11 @@ 12.4 12.5 BUILD_NUMBER=$(JDK_BUILD_NUMBER) 12.6 12.7 -BOOT_JAVA_CMD=$(JAVA) 12.8 - 12.9 -JAVADOC_JAR = $(LANGTOOLS_DIST)/bootstrap/lib/javadoc.jar 12.10 -JAVADOC_CMD = $(BOOT_JAVA_CMD) \ 12.11 +JAVADOC_CMD = $(JAVA) \ 12.12 -Xmx1024m \ 12.13 -Djava.awt.headless=true \ 12.14 - "-Xbootclasspath/p:$(JAVADOC_JAR)" \ 12.15 - -jar $(JAVADOC_JAR) -bootclasspath $(JDK_OUTPUTDIR)/classes 12.16 + $(NEW_JAVADOC) \ 12.17 + -bootclasspath $(JDK_OUTPUTDIR)/classes 12.18 12.19 # Copyright year for beginning of Java and some of the apis 12.20 # (Needed when creating the javadocs) 12.21 @@ -270,6 +267,7 @@ 12.22 -use \ 12.23 -keywords \ 12.24 -Xdoclint:none \ 12.25 + -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \ 12.26 $(ADDITIONAL_JAVADOCFLAGS) 12.27 12.28 ifdef OPENJDK
13.1 --- a/common/makefiles/javadoc/NON_CORE_PKGS.gmk Thu Feb 21 15:25:31 2013 -0400 13.2 +++ b/common/makefiles/javadoc/NON_CORE_PKGS.gmk Fri Feb 22 13:09:37 2013 -0400 13.3 @@ -80,7 +80,8 @@ 13.4 13.5 TREEAPI_PKGS = com.sun.source.doctree \ 13.6 com.sun.source.tree \ 13.7 - com.sun.source.util 13.8 + com.sun.source.util \ 13.9 + jdk 13.10 13.11 SMARTCARDIO_PKGS = javax.smartcardio 13.12 13.13 @@ -93,6 +94,8 @@ 13.14 com.apple.eio 13.15 endif 13.16 13.17 +JDK_PKGS = jdk 13.18 + 13.19 # non-core packages in rt.jar 13.20 NON_CORE_PKGS = $(DOMAPI_PKGS) \ 13.21 $(MGMT_PKGS) \ 13.22 @@ -103,5 +106,5 @@ 13.23 $(HTTPSERVER_PKGS) \ 13.24 $(SMARTCARDIO_PKGS) \ 13.25 $(SCTPAPI_PKGS) \ 13.26 - $(APPLE_EXT_PKGS) 13.27 - 13.28 + $(APPLE_EXT_PKGS) \ 13.29 + $(JDK_PKGS)
14.1 --- a/get_source.sh Thu Feb 21 15:25:31 2013 -0400 14.2 +++ b/get_source.sh Fri Feb 22 13:09:37 2013 -0400 14.3 @@ -26,7 +26,7 @@ 14.4 # 14.5 14.6 # Get clones of all nested repositories 14.7 -sh ./common/bin/hgforest.sh clone "$@" 14.8 +sh ./common/bin/hgforest.sh clone "$@" || exit 1 14.9 14.10 # Update all existing repositories to the latest sources 14.11 sh ./common/bin/hgforest.sh pull -u
15.1 --- a/make/scripts/webrev.ksh Thu Feb 21 15:25:31 2013 -0400 15.2 +++ b/make/scripts/webrev.ksh Fri Feb 22 13:09:37 2013 -0400 15.3 @@ -19,7 +19,7 @@ 15.4 # 15.5 # CDDL HEADER END 15.6 # 15.7 -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. 15.8 +# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. 15.9 # Use is subject to license terms. 15.10 # 15.11 # This script takes a file list and a workspace and builds a set of html files 15.12 @@ -27,7 +27,7 @@ 15.13 # Documentation is available via 'webrev -h'. 15.14 # 15.15 15.16 -WEBREV_UPDATED=23.18-hg 15.17 +WEBREV_UPDATED=23.18-hg+jbs 15.18 15.19 HTML='<?xml version="1.0"?> 15.20 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 15.21 @@ -146,7 +146,7 @@ 15.22 # 15.23 bug2url() 15.24 { 15.25 - sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL'&\">&</a>|g' 15.26 + sed -e 's|[0-9]\{5,\}|<a href=\"'$BUGURL$IDPREFIX'&\">&</a>|g' 15.27 } 15.28 15.29 # 15.30 @@ -230,8 +230,8 @@ 15.31 # $ sdiff_to_html old/usr/src/tools/scripts/webrev.sh \ 15.32 # new/usr/src/tools/scripts/webrev.sh \ 15.33 # webrev.sh usr/src/tools/scripts \ 15.34 -# '<a href="http://monaco.sfbay.sun.com/detail.jsp?cr=1234567"> 15.35 -# 1234567</a> my bugid' > <file>.html 15.36 +# '<a href="https://jbs.oracle.com/bugs/browse/JDK-1234567"> 15.37 +# JDK-1234567</a> my bugid' > <file>.html 15.38 # 15.39 # framed_sdiff() is then called which creates $2.frames.html 15.40 # in the webrev tree. 15.41 @@ -1160,7 +1160,7 @@ 15.42 print "$comm" 15.43 return 15.44 fi 15.45 - 15.46 + 15.47 print "$comm" | html_quote | bug2url | sac2url 15.48 ) 15.49 fi 15.50 @@ -1418,7 +1418,7 @@ 15.51 next;} 15.52 END {for (tree in trees) 15.53 { rev=revs[trees[tree]]; 15.54 - if (rev > 0) 15.55 + if (rev > 0) 15.56 {printf("%s %d\n",trees[tree],rev-1)} 15.57 }}' | while read LINE 15.58 do 15.59 @@ -1459,7 +1459,7 @@ 15.60 { 15.61 TREE=$1 15.62 HGCMD="hg -R $CWS/$TREE status $FSTAT_OPT" 15.63 - 15.64 + 15.65 $HGCMD -mdn 2>/dev/null | $FILTER | while read F 15.66 do 15.67 echo $TREE/$F 15.68 @@ -1543,7 +1543,7 @@ 15.69 if (n == 0) 15.70 { printf("A %s/%s\n",tree,$2)} 15.71 else 15.72 - { printf("A %s\n",$2)}; 15.73 + { printf("A %s\n",$2)}; 15.74 next} 15.75 /^ / {n=index($1,tree); 15.76 if (n == 0) 15.77 @@ -1604,7 +1604,7 @@ 15.78 # We need at least one of default-push or default paths set in .hg/hgrc 15.79 # If neither are set we don't know who to compare with. 15.80 15.81 -function flist_from_mercurial 15.82 +function flist_from_mercurial 15.83 { 15.84 # if [ "${PWS##ssh://}" != "$PWS" -o \ 15.85 # "${PWS##http://}" != "$PWS" -o \ 15.86 @@ -1757,7 +1757,7 @@ 15.87 elif [[ "$OS" == "Linux" ]]; then 15.88 DEVTOOLS="/java/devtools/linux/bin" 15.89 fi 15.90 - 15.91 + 15.92 ppath=$PATH 15.93 ppath=$ppath:/usr/sfw/bin:/usr/bin:/usr/sbin 15.94 ppath=$ppath:/opt/teamware/bin:/opt/onbld/bin 15.95 @@ -1844,7 +1844,7 @@ 15.96 ssh_host=`echo $CMD | sed -e 's/ssh:\/\/\([^/]*\)\/.*/\1/'` 15.97 ssh_dir=`echo $CMD | sed -e 's/ssh:\/\/[^/]*\/\(.*\)/\1/'` 15.98 fi 15.99 - 15.100 + 15.101 } 15.102 15.103 function build_old_new_mercurial 15.104 @@ -2096,7 +2096,7 @@ 15.105 PARENT_REV=$OPTARG;; 15.106 15.107 v) print "$0 version: $WEBREV_UPDATED";; 15.108 - 15.109 + 15.110 15.111 ?) usage;; 15.112 esac 15.113 @@ -2338,7 +2338,7 @@ 15.114 # 15.115 [[ -z $codemgr_ws && -n $CODEMGR_WS ]] && codemgr_ws=$CODEMGR_WS 15.116 [[ -z $codemgr_ws && -n $WSPACE ]] && codemgr_ws=`$WSPACE name` 15.117 - 15.118 + 15.119 if [[ -n $codemgr_ws && ! -d $codemgr_ws ]]; then 15.120 print -u2 "$codemgr_ws: no such workspace" 15.121 exit 1 15.122 @@ -2521,10 +2521,16 @@ 15.123 # Bug IDs will be replaced by a URL. Order of precedence 15.124 # is: default location, $WEBREV_BUGURL, the -O flag. 15.125 # 15.126 -BUGURL='http://monaco.sfbay.sun.com/detail.jsp?cr=' 15.127 +BUGURL='https://jbs.oracle.com/bugs/browse/' 15.128 [[ -n $WEBREV_BUGURL ]] && BUGURL="$WEBREV_BUGURL" 15.129 -[[ -n "$Oflag" ]] && \ 15.130 +if [[ -n "$Oflag" ]]; then 15.131 + CRID=`echo $CRID | sed -e 's/JDK-//'` 15.132 BUGURL='http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=' 15.133 + IDPREFIX='' 15.134 +else 15.135 + IDPREFIX='JDK-' 15.136 +fi 15.137 + 15.138 15.139 # 15.140 # Likewise, ARC cases will be replaced by a URL. Order of precedence 15.141 @@ -2561,7 +2567,7 @@ 15.142 15.143 # 15.144 # Should we ignore changes in white spaces when generating diffs? 15.145 -# 15.146 +# 15.147 if [[ -n $bflag ]]; then 15.148 DIFFOPTS="-t" 15.149 else 15.150 @@ -2748,7 +2754,7 @@ 15.151 fi 15.152 fi 15.153 else 15.154 - 15.155 + 15.156 # 15.157 # If we have old and new versions of the file then run the 15.158 # appropriate diffs. This is complicated by a couple of factors: 15.159 @@ -3000,22 +3006,31 @@ 15.160 # external URL has a <title> like: 15.161 # <title>Bug ID: 6641309 Wrong Cookie separator used in HttpURLConnection</title> 15.162 # while internal URL has <title> like: 15.163 -# <title>6641309: Wrong Cookie separator used in HttpURLConnection</title> 15.164 +# <title>[#JDK-6641309] Wrong Cookie separator used in HttpURLConnection</title> 15.165 # 15.166 if [[ -n $CRID ]]; then 15.167 for id in $CRID 15.168 do 15.169 + if [[ -z "$Oflag" ]]; then 15.170 + #add "JDK-" to raw bug id for jbs links. 15.171 + id=`echo ${id} | sed 's/^\([0-9]\{5,\}\)$/JDK-\1/'` 15.172 + fi 15.173 print "<tr><th>Bug id:</th><td>" 15.174 url="${BUGURL}${id}" 15.175 + if [[ -n "$Oflag" ]]; then 15.176 + cleanup='s/Bug ID: \([0-9]\{5,\}\) \(.*\)/JDK-\1 : \2/' 15.177 + else 15.178 + cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|' 15.179 + fi 15.180 if [[ -n $WGET ]]; then 15.181 - msg=`$WGET -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed 's/Bug ID://'` 15.182 + msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup" | html_quote` 15.183 fi 15.184 - if [[ -n $msg ]]; then 15.185 - print "<a href=\"$url\">$msg</a>" 15.186 - else 15.187 - print $id | bug2url 15.188 + if [[ -z $msg ]]; then 15.189 + msg="${id}" 15.190 fi 15.191 - 15.192 + 15.193 + print "<a href=\"$url\">$msg</a>" 15.194 + 15.195 print "</td></tr>" 15.196 done 15.197 fi 15.198 @@ -3179,4 +3194,3 @@ 15.199 15.200 print "Done." 15.201 print "Output to: $WDIR" 15.202 -
16.1 --- a/test/Makefile Thu Feb 21 15:25:31 2013 -0400 16.2 +++ b/test/Makefile Fri Feb 22 13:09:37 2013 -0400 16.3 @@ -38,8 +38,8 @@ 16.4 define SUBDIR_TEST # subdirectory target 16.5 if [ -d $1 ] ; then \ 16.6 if [ -r $1/test/Makefile ] ; then \ 16.7 - echo "$(MAKE) -C $1/test $2" ; \ 16.8 - $(MAKE) -C $1/test $2 ; \ 16.9 + echo "$(MAKE) -k -C $1/test $2" ; \ 16.10 + $(MAKE) -k -C $1/test $2 ; \ 16.11 else \ 16.12 echo "ERROR: File does not exist: $1/test/Makefile"; \ 16.13 exit 1; \ 16.14 @@ -53,7 +53,7 @@ 16.15 LANGTOOLS_TEST_LIST = langtools_jtreg 16.16 16.17 # Test target list for jdk repository 16.18 -JDK_DEFAULT_TEST_LIST = \ 16.19 +JDK_ALL_TEST_LIST = \ 16.20 jdk_beans1 \ 16.21 jdk_io \ 16.22 jdk_lang \ 16.23 @@ -64,10 +64,7 @@ 16.24 jdk_security1 \ 16.25 jdk_text \ 16.26 jdk_util \ 16.27 - jdk_time 16.28 - 16.29 -# These tests are not part of the default testing list 16.30 -JDK_NONDEFAULT_TEST_LIST = \ 16.31 + jdk_time \ 16.32 jdk_awt \ 16.33 jdk_beans2 jdk_beans3 \ 16.34 jdk_management \ 16.35 @@ -80,14 +77,14 @@ 16.36 jdk_jdi \ 16.37 jdk_jfr 16.38 16.39 -# All jdk tests 16.40 -JDK_ALL_TEST_LIST = $(JDK_DEFAULT_TEST_LIST) $(JDK_NONDEFAULT_TEST_LIST) 16.41 +# Theses are meta test targets in jdk 16.42 +JDK_META_TEST_LIST = jdk_all jdk_default jdk_core 16.43 16.44 # These are the current jck test targets in the jdk repository 16.45 JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime 16.46 16.47 -# Default test target (everything) 16.48 -default: $(JDK_DEFAULT_TEST_LIST) $(LANGTOOLS_TEST_LIST) 16.49 +# Default test target (core) 16.50 +default: jdk_core $(LANGTOOLS_TEST_LIST) 16.51 16.52 # All testing 16.53 all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) 16.54 @@ -95,7 +92,8 @@ 16.55 # Test targets 16.56 $(LANGTOOLS_TEST_LIST): 16.57 @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) 16.58 -$(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST): 16.59 + 16.60 +$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST): 16.61 @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) 16.62 16.63 clean: 16.64 @@ -104,7 +102,7 @@ 16.65 16.66 # Phony targets (e.g. these are not filenames) 16.67 .PHONY: all clean \ 16.68 - $(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST) \ 16.69 + $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \ 16.70 $(LANGTOOLS_TEST_LIST) 16.71 16.72 ################################################################
