Mercurial > jdk8-mips64-public / changeset
changeset
8005850: build-infra: Make --enable-openjdk-only really disable custom
Fri, 11 Jan 2013 10:46:59 +0100
- author
- erikj
- date
- Fri, 11 Jan 2013 10:46:59 +0100
- changeset 575
- 6f8f7a5449f6
- parent 574
- db3984e4eb97
- child 576
- b66c81dfa291
- child 577
- 3540aa40c868
8005850: build-infra: Make --enable-openjdk-only really disable custom
Reviewed-by: ohair, dholmes
1.1 --- a/common/autoconf/configure.ac Thu Jan 10 12:20:16 2013 +0100 1.2 +++ b/common/autoconf/configure.ac Fri Jan 11 10:46:59 2013 +0100 1.3 @@ -83,6 +83,9 @@ 1.4 BASIC_SETUP_PATHS 1.5 BASIC_SETUP_LOGGING 1.6 1.7 +# Check if it's a pure open build or if custom sources are to be used. 1.8 +JDKOPT_SETUP_OPEN_OR_CUSTOM 1.9 + 1.10 # These are needed to be able to create a configuration name (and thus the output directory) 1.11 JDKOPT_SETUP_JDK_VARIANT 1.12 JDKOPT_SETUP_JVM_VARIANTS
2.1 --- a/common/autoconf/generated-configure.sh Thu Jan 10 12:20:16 2013 +0100 2.2 +++ b/common/autoconf/generated-configure.sh Fri Jan 11 10:46:59 2013 +0100 2.3 @@ -1,6 +1,6 @@ 2.4 #! /bin/sh 2.5 # Guess values for system-dependent variables and create Makefiles. 2.6 -# Generated by GNU Autoconf 2.68 for OpenJDK jdk8. 2.7 +# Generated by GNU Autoconf 2.67 for OpenJDK jdk8. 2.8 # 2.9 # Report bugs to <build-dev@openjdk.java.net>. 2.10 # 2.11 @@ -91,7 +91,6 @@ 2.12 IFS=" "" $as_nl" 2.13 2.14 # Find who we are. Look in the path if we contain no directory separator. 2.15 -as_myself= 2.16 case $0 in #(( 2.17 *[\\/]* ) as_myself=$0 ;; 2.18 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.19 @@ -217,18 +216,11 @@ 2.20 # We cannot yet assume a decent shell, so we have to provide a 2.21 # neutralization value for shells without unset; and this also 2.22 # works around shells that cannot unset nonexistent variables. 2.23 - # Preserve -v and -x to the replacement shell. 2.24 BASH_ENV=/dev/null 2.25 ENV=/dev/null 2.26 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 2.27 export CONFIG_SHELL 2.28 - case $- in # (((( 2.29 - *v*x* | *x*v* ) as_opts=-vx ;; 2.30 - *v* ) as_opts=-v ;; 2.31 - *x* ) as_opts=-x ;; 2.32 - * ) as_opts= ;; 2.33 - esac 2.34 - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 2.35 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 2.36 fi 2.37 2.38 if test x$as_have_required = xno; then : 2.39 @@ -783,7 +775,6 @@ 2.40 BUILD_HEADLESS 2.41 SUPPORT_HEADFUL 2.42 SUPPORT_HEADLESS 2.43 -SET_OPENJDK 2.44 BDEPS_FTP 2.45 BDEPS_UNZIP 2.46 OS_VERSION_MICRO 2.47 @@ -822,6 +813,7 @@ 2.48 JVM_VARIANT_SERVER 2.49 JVM_VARIANTS 2.50 JDK_VARIANT 2.51 +SET_OPENJDK 2.52 BUILD_LOG_WRAPPER 2.53 BUILD_LOG_PREVIOUS 2.54 BUILD_LOG 2.55 @@ -962,6 +954,7 @@ 2.56 with_sys_root 2.57 with_tools_dir 2.58 with_devkit 2.59 +enable_openjdk_only 2.60 with_jdk_variant 2.61 with_jvm_variants 2.62 enable_debug 2.63 @@ -971,7 +964,6 @@ 2.64 with_builddeps_server 2.65 with_builddeps_dir 2.66 with_builddeps_group 2.67 -enable_openjdk_only 2.68 enable_headful 2.69 enable_hotspot_test_in_build 2.70 with_cacerts_file 2.71 @@ -1441,7 +1433,7 @@ 2.72 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 2.73 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 2.74 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 2.75 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 2.76 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 2.77 ;; 2.78 2.79 esac 2.80 @@ -1657,10 +1649,10 @@ 2.81 --disable-option-checking ignore unrecognized --enable/--with options 2.82 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) 2.83 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 2.84 + --enable-openjdk-only suppress building custom source even if present 2.85 + [disabled] 2.86 --enable-debug set the debug level to fastdebug (shorthand for 2.87 --with-debug-level=fastdebug) [disabled] 2.88 - --enable-openjdk-only supress building closed source even if present 2.89 - [disabled] 2.90 --disable-headful disable building headful support (graphical UI 2.91 support) [enabled] 2.92 --enable-hotspot-test-in-build 2.93 @@ -1866,7 +1858,7 @@ 2.94 if $ac_init_version; then 2.95 cat <<\_ACEOF 2.96 OpenJDK configure jdk8 2.97 -generated by GNU Autoconf 2.68 2.98 +generated by GNU Autoconf 2.67 2.99 2.100 Copyright (C) 2010 Free Software Foundation, Inc. 2.101 This configure script is free software; the Free Software Foundation 2.102 @@ -1912,7 +1904,7 @@ 2.103 2.104 ac_retval=1 2.105 fi 2.106 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.107 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.108 as_fn_set_status $ac_retval 2.109 2.110 } # ac_fn_c_try_compile 2.111 @@ -1950,7 +1942,7 @@ 2.112 2.113 ac_retval=1 2.114 fi 2.115 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.116 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.117 as_fn_set_status $ac_retval 2.118 2.119 } # ac_fn_cxx_try_compile 2.120 @@ -1988,7 +1980,7 @@ 2.121 2.122 ac_retval=1 2.123 fi 2.124 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.125 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.126 as_fn_set_status $ac_retval 2.127 2.128 } # ac_fn_objc_try_compile 2.129 @@ -2025,7 +2017,7 @@ 2.130 2.131 ac_retval=1 2.132 fi 2.133 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.134 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.135 as_fn_set_status $ac_retval 2.136 2.137 } # ac_fn_c_try_cpp 2.138 @@ -2062,7 +2054,7 @@ 2.139 2.140 ac_retval=1 2.141 fi 2.142 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.143 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.144 as_fn_set_status $ac_retval 2.145 2.146 } # ac_fn_cxx_try_cpp 2.147 @@ -2075,10 +2067,10 @@ 2.148 ac_fn_cxx_check_header_mongrel () 2.149 { 2.150 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.151 - if eval \${$3+:} false; then : 2.152 + if eval "test \"\${$3+set}\"" = set; then : 2.153 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.154 $as_echo_n "checking for $2... " >&6; } 2.155 -if eval \${$3+:} false; then : 2.156 +if eval "test \"\${$3+set}\"" = set; then : 2.157 $as_echo_n "(cached) " >&6 2.158 fi 2.159 eval ac_res=\$$3 2.160 @@ -2145,7 +2137,7 @@ 2.161 esac 2.162 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.163 $as_echo_n "checking for $2... " >&6; } 2.164 -if eval \${$3+:} false; then : 2.165 +if eval "test \"\${$3+set}\"" = set; then : 2.166 $as_echo_n "(cached) " >&6 2.167 else 2.168 eval "$3=\$ac_header_compiler" 2.169 @@ -2154,7 +2146,7 @@ 2.170 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2.171 $as_echo "$ac_res" >&6; } 2.172 fi 2.173 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.174 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.175 2.176 } # ac_fn_cxx_check_header_mongrel 2.177 2.178 @@ -2195,7 +2187,7 @@ 2.179 ac_retval=$ac_status 2.180 fi 2.181 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 2.182 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.183 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.184 as_fn_set_status $ac_retval 2.185 2.186 } # ac_fn_cxx_try_run 2.187 @@ -2209,7 +2201,7 @@ 2.188 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.189 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.190 $as_echo_n "checking for $2... " >&6; } 2.191 -if eval \${$3+:} false; then : 2.192 +if eval "test \"\${$3+set}\"" = set; then : 2.193 $as_echo_n "(cached) " >&6 2.194 else 2.195 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.196 @@ -2227,7 +2219,7 @@ 2.197 eval ac_res=\$$3 2.198 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2.199 $as_echo "$ac_res" >&6; } 2.200 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.201 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.202 2.203 } # ac_fn_cxx_check_header_compile 2.204 2.205 @@ -2404,7 +2396,7 @@ 2.206 rm -f conftest.val 2.207 2.208 fi 2.209 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.210 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.211 as_fn_set_status $ac_retval 2.212 2.213 } # ac_fn_cxx_compute_int 2.214 @@ -2450,7 +2442,7 @@ 2.215 # interfere with the next link command; also delete a directory that is 2.216 # left behind by Apple's compiler. We do this before executing the actions. 2.217 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 2.218 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.219 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.220 as_fn_set_status $ac_retval 2.221 2.222 } # ac_fn_cxx_try_link 2.223 @@ -2463,7 +2455,7 @@ 2.224 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.225 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.226 $as_echo_n "checking for $2... " >&6; } 2.227 -if eval \${$3+:} false; then : 2.228 +if eval "test \"\${$3+set}\"" = set; then : 2.229 $as_echo_n "(cached) " >&6 2.230 else 2.231 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.232 @@ -2518,7 +2510,7 @@ 2.233 eval ac_res=\$$3 2.234 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2.235 $as_echo "$ac_res" >&6; } 2.236 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.237 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.238 2.239 } # ac_fn_cxx_check_func 2.240 2.241 @@ -2531,7 +2523,7 @@ 2.242 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 2.243 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 2.244 $as_echo_n "checking for $2... " >&6; } 2.245 -if eval \${$3+:} false; then : 2.246 +if eval "test \"\${$3+set}\"" = set; then : 2.247 $as_echo_n "(cached) " >&6 2.248 else 2.249 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.250 @@ -2549,7 +2541,7 @@ 2.251 eval ac_res=\$$3 2.252 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 2.253 $as_echo "$ac_res" >&6; } 2.254 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 2.255 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 2.256 2.257 } # ac_fn_c_check_header_compile 2.258 cat >config.log <<_ACEOF 2.259 @@ -2557,7 +2549,7 @@ 2.260 running configure, to aid debugging if configure makes a mistake. 2.261 2.262 It was created by OpenJDK $as_me jdk8, which was 2.263 -generated by GNU Autoconf 2.68. Invocation command line was 2.264 +generated by GNU Autoconf 2.67. Invocation command line was 2.265 2.266 $ $0 $@ 2.267 2.268 @@ -2815,7 +2807,7 @@ 2.269 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.270 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.271 as_fn_error $? "failed to load site script $ac_site_file 2.272 -See \`config.log' for more details" "$LINENO" 5; } 2.273 +See \`config.log' for more details" "$LINENO" 5 ; } 2.274 fi 2.275 done 2.276 2.277 @@ -3444,6 +3436,13 @@ 2.278 2.279 2.280 2.281 +############################################################################### 2.282 +# 2.283 +# Should we build only OpenJDK even if closed sources are present? 2.284 +# 2.285 + 2.286 + 2.287 + 2.288 2.289 ############################################################################### 2.290 # 2.291 @@ -3698,7 +3697,7 @@ 2.292 #CUSTOM_AUTOCONF_INCLUDE 2.293 2.294 # Do not change or remove the following line, it is needed for consistency checks: 2.295 -DATE_WHEN_GENERATED=1357690920 2.296 +DATE_WHEN_GENERATED=1357897535 2.297 2.298 ############################################################################### 2.299 # 2.300 @@ -3736,7 +3735,7 @@ 2.301 set dummy $ac_prog; ac_word=$2 2.302 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.303 $as_echo_n "checking for $ac_word... " >&6; } 2.304 -if ${ac_cv_path_BASENAME+:} false; then : 2.305 +if test "${ac_cv_path_BASENAME+set}" = set; then : 2.306 $as_echo_n "(cached) " >&6 2.307 else 2.308 case $BASENAME in 2.309 @@ -3795,7 +3794,7 @@ 2.310 set dummy $ac_prog; ac_word=$2 2.311 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.312 $as_echo_n "checking for $ac_word... " >&6; } 2.313 -if ${ac_cv_path_BASH+:} false; then : 2.314 +if test "${ac_cv_path_BASH+set}" = set; then : 2.315 $as_echo_n "(cached) " >&6 2.316 else 2.317 case $BASH in 2.318 @@ -3854,7 +3853,7 @@ 2.319 set dummy $ac_prog; ac_word=$2 2.320 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.321 $as_echo_n "checking for $ac_word... " >&6; } 2.322 -if ${ac_cv_path_CAT+:} false; then : 2.323 +if test "${ac_cv_path_CAT+set}" = set; then : 2.324 $as_echo_n "(cached) " >&6 2.325 else 2.326 case $CAT in 2.327 @@ -3913,7 +3912,7 @@ 2.328 set dummy $ac_prog; ac_word=$2 2.329 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.330 $as_echo_n "checking for $ac_word... " >&6; } 2.331 -if ${ac_cv_path_CHMOD+:} false; then : 2.332 +if test "${ac_cv_path_CHMOD+set}" = set; then : 2.333 $as_echo_n "(cached) " >&6 2.334 else 2.335 case $CHMOD in 2.336 @@ -3972,7 +3971,7 @@ 2.337 set dummy $ac_prog; ac_word=$2 2.338 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.339 $as_echo_n "checking for $ac_word... " >&6; } 2.340 -if ${ac_cv_path_CMP+:} false; then : 2.341 +if test "${ac_cv_path_CMP+set}" = set; then : 2.342 $as_echo_n "(cached) " >&6 2.343 else 2.344 case $CMP in 2.345 @@ -4031,7 +4030,7 @@ 2.346 set dummy $ac_prog; ac_word=$2 2.347 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.348 $as_echo_n "checking for $ac_word... " >&6; } 2.349 -if ${ac_cv_path_COMM+:} false; then : 2.350 +if test "${ac_cv_path_COMM+set}" = set; then : 2.351 $as_echo_n "(cached) " >&6 2.352 else 2.353 case $COMM in 2.354 @@ -4090,7 +4089,7 @@ 2.355 set dummy $ac_prog; ac_word=$2 2.356 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.357 $as_echo_n "checking for $ac_word... " >&6; } 2.358 -if ${ac_cv_path_CP+:} false; then : 2.359 +if test "${ac_cv_path_CP+set}" = set; then : 2.360 $as_echo_n "(cached) " >&6 2.361 else 2.362 case $CP in 2.363 @@ -4149,7 +4148,7 @@ 2.364 set dummy $ac_prog; ac_word=$2 2.365 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.366 $as_echo_n "checking for $ac_word... " >&6; } 2.367 -if ${ac_cv_path_CPIO+:} false; then : 2.368 +if test "${ac_cv_path_CPIO+set}" = set; then : 2.369 $as_echo_n "(cached) " >&6 2.370 else 2.371 case $CPIO in 2.372 @@ -4208,7 +4207,7 @@ 2.373 set dummy $ac_prog; ac_word=$2 2.374 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.375 $as_echo_n "checking for $ac_word... " >&6; } 2.376 -if ${ac_cv_path_CUT+:} false; then : 2.377 +if test "${ac_cv_path_CUT+set}" = set; then : 2.378 $as_echo_n "(cached) " >&6 2.379 else 2.380 case $CUT in 2.381 @@ -4267,7 +4266,7 @@ 2.382 set dummy $ac_prog; ac_word=$2 2.383 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.384 $as_echo_n "checking for $ac_word... " >&6; } 2.385 -if ${ac_cv_path_DATE+:} false; then : 2.386 +if test "${ac_cv_path_DATE+set}" = set; then : 2.387 $as_echo_n "(cached) " >&6 2.388 else 2.389 case $DATE in 2.390 @@ -4326,7 +4325,7 @@ 2.391 set dummy $ac_prog; ac_word=$2 2.392 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.393 $as_echo_n "checking for $ac_word... " >&6; } 2.394 -if ${ac_cv_path_DIFF+:} false; then : 2.395 +if test "${ac_cv_path_DIFF+set}" = set; then : 2.396 $as_echo_n "(cached) " >&6 2.397 else 2.398 case $DIFF in 2.399 @@ -4385,7 +4384,7 @@ 2.400 set dummy $ac_prog; ac_word=$2 2.401 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.402 $as_echo_n "checking for $ac_word... " >&6; } 2.403 -if ${ac_cv_path_DIRNAME+:} false; then : 2.404 +if test "${ac_cv_path_DIRNAME+set}" = set; then : 2.405 $as_echo_n "(cached) " >&6 2.406 else 2.407 case $DIRNAME in 2.408 @@ -4444,7 +4443,7 @@ 2.409 set dummy $ac_prog; ac_word=$2 2.410 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.411 $as_echo_n "checking for $ac_word... " >&6; } 2.412 -if ${ac_cv_path_ECHO+:} false; then : 2.413 +if test "${ac_cv_path_ECHO+set}" = set; then : 2.414 $as_echo_n "(cached) " >&6 2.415 else 2.416 case $ECHO in 2.417 @@ -4503,7 +4502,7 @@ 2.418 set dummy $ac_prog; ac_word=$2 2.419 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.420 $as_echo_n "checking for $ac_word... " >&6; } 2.421 -if ${ac_cv_path_EXPR+:} false; then : 2.422 +if test "${ac_cv_path_EXPR+set}" = set; then : 2.423 $as_echo_n "(cached) " >&6 2.424 else 2.425 case $EXPR in 2.426 @@ -4562,7 +4561,7 @@ 2.427 set dummy $ac_prog; ac_word=$2 2.428 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.429 $as_echo_n "checking for $ac_word... " >&6; } 2.430 -if ${ac_cv_path_FILE+:} false; then : 2.431 +if test "${ac_cv_path_FILE+set}" = set; then : 2.432 $as_echo_n "(cached) " >&6 2.433 else 2.434 case $FILE in 2.435 @@ -4621,7 +4620,7 @@ 2.436 set dummy $ac_prog; ac_word=$2 2.437 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.438 $as_echo_n "checking for $ac_word... " >&6; } 2.439 -if ${ac_cv_path_FIND+:} false; then : 2.440 +if test "${ac_cv_path_FIND+set}" = set; then : 2.441 $as_echo_n "(cached) " >&6 2.442 else 2.443 case $FIND in 2.444 @@ -4680,7 +4679,7 @@ 2.445 set dummy $ac_prog; ac_word=$2 2.446 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.447 $as_echo_n "checking for $ac_word... " >&6; } 2.448 -if ${ac_cv_path_HEAD+:} false; then : 2.449 +if test "${ac_cv_path_HEAD+set}" = set; then : 2.450 $as_echo_n "(cached) " >&6 2.451 else 2.452 case $HEAD in 2.453 @@ -4739,7 +4738,7 @@ 2.454 set dummy $ac_prog; ac_word=$2 2.455 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.456 $as_echo_n "checking for $ac_word... " >&6; } 2.457 -if ${ac_cv_path_LN+:} false; then : 2.458 +if test "${ac_cv_path_LN+set}" = set; then : 2.459 $as_echo_n "(cached) " >&6 2.460 else 2.461 case $LN in 2.462 @@ -4798,7 +4797,7 @@ 2.463 set dummy $ac_prog; ac_word=$2 2.464 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.465 $as_echo_n "checking for $ac_word... " >&6; } 2.466 -if ${ac_cv_path_LS+:} false; then : 2.467 +if test "${ac_cv_path_LS+set}" = set; then : 2.468 $as_echo_n "(cached) " >&6 2.469 else 2.470 case $LS in 2.471 @@ -4857,7 +4856,7 @@ 2.472 set dummy $ac_prog; ac_word=$2 2.473 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.474 $as_echo_n "checking for $ac_word... " >&6; } 2.475 -if ${ac_cv_path_MKDIR+:} false; then : 2.476 +if test "${ac_cv_path_MKDIR+set}" = set; then : 2.477 $as_echo_n "(cached) " >&6 2.478 else 2.479 case $MKDIR in 2.480 @@ -4916,7 +4915,7 @@ 2.481 set dummy $ac_prog; ac_word=$2 2.482 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.483 $as_echo_n "checking for $ac_word... " >&6; } 2.484 -if ${ac_cv_path_MKTEMP+:} false; then : 2.485 +if test "${ac_cv_path_MKTEMP+set}" = set; then : 2.486 $as_echo_n "(cached) " >&6 2.487 else 2.488 case $MKTEMP in 2.489 @@ -4975,7 +4974,7 @@ 2.490 set dummy $ac_prog; ac_word=$2 2.491 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.492 $as_echo_n "checking for $ac_word... " >&6; } 2.493 -if ${ac_cv_path_MV+:} false; then : 2.494 +if test "${ac_cv_path_MV+set}" = set; then : 2.495 $as_echo_n "(cached) " >&6 2.496 else 2.497 case $MV in 2.498 @@ -5034,7 +5033,7 @@ 2.499 set dummy $ac_prog; ac_word=$2 2.500 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.501 $as_echo_n "checking for $ac_word... " >&6; } 2.502 -if ${ac_cv_path_PRINTF+:} false; then : 2.503 +if test "${ac_cv_path_PRINTF+set}" = set; then : 2.504 $as_echo_n "(cached) " >&6 2.505 else 2.506 case $PRINTF in 2.507 @@ -5093,7 +5092,7 @@ 2.508 set dummy $ac_prog; ac_word=$2 2.509 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.510 $as_echo_n "checking for $ac_word... " >&6; } 2.511 -if ${ac_cv_path_THEPWDCMD+:} false; then : 2.512 +if test "${ac_cv_path_THEPWDCMD+set}" = set; then : 2.513 $as_echo_n "(cached) " >&6 2.514 else 2.515 case $THEPWDCMD in 2.516 @@ -5152,7 +5151,7 @@ 2.517 set dummy $ac_prog; ac_word=$2 2.518 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.519 $as_echo_n "checking for $ac_word... " >&6; } 2.520 -if ${ac_cv_path_RM+:} false; then : 2.521 +if test "${ac_cv_path_RM+set}" = set; then : 2.522 $as_echo_n "(cached) " >&6 2.523 else 2.524 case $RM in 2.525 @@ -5211,7 +5210,7 @@ 2.526 set dummy $ac_prog; ac_word=$2 2.527 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.528 $as_echo_n "checking for $ac_word... " >&6; } 2.529 -if ${ac_cv_path_SH+:} false; then : 2.530 +if test "${ac_cv_path_SH+set}" = set; then : 2.531 $as_echo_n "(cached) " >&6 2.532 else 2.533 case $SH in 2.534 @@ -5270,7 +5269,7 @@ 2.535 set dummy $ac_prog; ac_word=$2 2.536 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.537 $as_echo_n "checking for $ac_word... " >&6; } 2.538 -if ${ac_cv_path_SORT+:} false; then : 2.539 +if test "${ac_cv_path_SORT+set}" = set; then : 2.540 $as_echo_n "(cached) " >&6 2.541 else 2.542 case $SORT in 2.543 @@ -5329,7 +5328,7 @@ 2.544 set dummy $ac_prog; ac_word=$2 2.545 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.546 $as_echo_n "checking for $ac_word... " >&6; } 2.547 -if ${ac_cv_path_TAIL+:} false; then : 2.548 +if test "${ac_cv_path_TAIL+set}" = set; then : 2.549 $as_echo_n "(cached) " >&6 2.550 else 2.551 case $TAIL in 2.552 @@ -5388,7 +5387,7 @@ 2.553 set dummy $ac_prog; ac_word=$2 2.554 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.555 $as_echo_n "checking for $ac_word... " >&6; } 2.556 -if ${ac_cv_path_TAR+:} false; then : 2.557 +if test "${ac_cv_path_TAR+set}" = set; then : 2.558 $as_echo_n "(cached) " >&6 2.559 else 2.560 case $TAR in 2.561 @@ -5447,7 +5446,7 @@ 2.562 set dummy $ac_prog; ac_word=$2 2.563 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.564 $as_echo_n "checking for $ac_word... " >&6; } 2.565 -if ${ac_cv_path_TEE+:} false; then : 2.566 +if test "${ac_cv_path_TEE+set}" = set; then : 2.567 $as_echo_n "(cached) " >&6 2.568 else 2.569 case $TEE in 2.570 @@ -5506,7 +5505,7 @@ 2.571 set dummy $ac_prog; ac_word=$2 2.572 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.573 $as_echo_n "checking for $ac_word... " >&6; } 2.574 -if ${ac_cv_path_TOUCH+:} false; then : 2.575 +if test "${ac_cv_path_TOUCH+set}" = set; then : 2.576 $as_echo_n "(cached) " >&6 2.577 else 2.578 case $TOUCH in 2.579 @@ -5565,7 +5564,7 @@ 2.580 set dummy $ac_prog; ac_word=$2 2.581 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.582 $as_echo_n "checking for $ac_word... " >&6; } 2.583 -if ${ac_cv_path_TR+:} false; then : 2.584 +if test "${ac_cv_path_TR+set}" = set; then : 2.585 $as_echo_n "(cached) " >&6 2.586 else 2.587 case $TR in 2.588 @@ -5624,7 +5623,7 @@ 2.589 set dummy $ac_prog; ac_word=$2 2.590 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.591 $as_echo_n "checking for $ac_word... " >&6; } 2.592 -if ${ac_cv_path_UNAME+:} false; then : 2.593 +if test "${ac_cv_path_UNAME+set}" = set; then : 2.594 $as_echo_n "(cached) " >&6 2.595 else 2.596 case $UNAME in 2.597 @@ -5683,7 +5682,7 @@ 2.598 set dummy $ac_prog; ac_word=$2 2.599 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.600 $as_echo_n "checking for $ac_word... " >&6; } 2.601 -if ${ac_cv_path_UNIQ+:} false; then : 2.602 +if test "${ac_cv_path_UNIQ+set}" = set; then : 2.603 $as_echo_n "(cached) " >&6 2.604 else 2.605 case $UNIQ in 2.606 @@ -5742,7 +5741,7 @@ 2.607 set dummy $ac_prog; ac_word=$2 2.608 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.609 $as_echo_n "checking for $ac_word... " >&6; } 2.610 -if ${ac_cv_path_WC+:} false; then : 2.611 +if test "${ac_cv_path_WC+set}" = set; then : 2.612 $as_echo_n "(cached) " >&6 2.613 else 2.614 case $WC in 2.615 @@ -5801,7 +5800,7 @@ 2.616 set dummy $ac_prog; ac_word=$2 2.617 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.618 $as_echo_n "checking for $ac_word... " >&6; } 2.619 -if ${ac_cv_path_WHICH+:} false; then : 2.620 +if test "${ac_cv_path_WHICH+set}" = set; then : 2.621 $as_echo_n "(cached) " >&6 2.622 else 2.623 case $WHICH in 2.624 @@ -5860,7 +5859,7 @@ 2.625 set dummy $ac_prog; ac_word=$2 2.626 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.627 $as_echo_n "checking for $ac_word... " >&6; } 2.628 -if ${ac_cv_path_XARGS+:} false; then : 2.629 +if test "${ac_cv_path_XARGS+set}" = set; then : 2.630 $as_echo_n "(cached) " >&6 2.631 else 2.632 case $XARGS in 2.633 @@ -5920,7 +5919,7 @@ 2.634 set dummy $ac_prog; ac_word=$2 2.635 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.636 $as_echo_n "checking for $ac_word... " >&6; } 2.637 -if ${ac_cv_prog_AWK+:} false; then : 2.638 +if test "${ac_cv_prog_AWK+set}" = set; then : 2.639 $as_echo_n "(cached) " >&6 2.640 else 2.641 if test -n "$AWK"; then 2.642 @@ -5970,7 +5969,7 @@ 2.643 2.644 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 2.645 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 2.646 -if ${ac_cv_path_GREP+:} false; then : 2.647 +if test "${ac_cv_path_GREP+set}" = set; then : 2.648 $as_echo_n "(cached) " >&6 2.649 else 2.650 if test -z "$GREP"; then 2.651 @@ -6045,7 +6044,7 @@ 2.652 2.653 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 2.654 $as_echo_n "checking for egrep... " >&6; } 2.655 -if ${ac_cv_path_EGREP+:} false; then : 2.656 +if test "${ac_cv_path_EGREP+set}" = set; then : 2.657 $as_echo_n "(cached) " >&6 2.658 else 2.659 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 2.660 @@ -6124,7 +6123,7 @@ 2.661 2.662 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 2.663 $as_echo_n "checking for fgrep... " >&6; } 2.664 -if ${ac_cv_path_FGREP+:} false; then : 2.665 +if test "${ac_cv_path_FGREP+set}" = set; then : 2.666 $as_echo_n "(cached) " >&6 2.667 else 2.668 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 2.669 @@ -6203,7 +6202,7 @@ 2.670 2.671 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 2.672 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 2.673 -if ${ac_cv_path_SED+:} false; then : 2.674 +if test "${ac_cv_path_SED+set}" = set; then : 2.675 $as_echo_n "(cached) " >&6 2.676 else 2.677 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ 2.678 @@ -6289,7 +6288,7 @@ 2.679 set dummy $ac_prog; ac_word=$2 2.680 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.681 $as_echo_n "checking for $ac_word... " >&6; } 2.682 -if ${ac_cv_path_NAWK+:} false; then : 2.683 +if test "${ac_cv_path_NAWK+set}" = set; then : 2.684 $as_echo_n "(cached) " >&6 2.685 else 2.686 case $NAWK in 2.687 @@ -6349,7 +6348,7 @@ 2.688 set dummy cygpath; ac_word=$2 2.689 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.690 $as_echo_n "checking for $ac_word... " >&6; } 2.691 -if ${ac_cv_path_CYGPATH+:} false; then : 2.692 +if test "${ac_cv_path_CYGPATH+set}" = set; then : 2.693 $as_echo_n "(cached) " >&6 2.694 else 2.695 case $CYGPATH in 2.696 @@ -6389,7 +6388,7 @@ 2.697 set dummy readlink; ac_word=$2 2.698 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.699 $as_echo_n "checking for $ac_word... " >&6; } 2.700 -if ${ac_cv_path_READLINK+:} false; then : 2.701 +if test "${ac_cv_path_READLINK+set}" = set; then : 2.702 $as_echo_n "(cached) " >&6 2.703 else 2.704 case $READLINK in 2.705 @@ -6429,7 +6428,7 @@ 2.706 set dummy df; ac_word=$2 2.707 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.708 $as_echo_n "checking for $ac_word... " >&6; } 2.709 -if ${ac_cv_path_DF+:} false; then : 2.710 +if test "${ac_cv_path_DF+set}" = set; then : 2.711 $as_echo_n "(cached) " >&6 2.712 else 2.713 case $DF in 2.714 @@ -6469,7 +6468,7 @@ 2.715 set dummy SetFile; ac_word=$2 2.716 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.717 $as_echo_n "checking for $ac_word... " >&6; } 2.718 -if ${ac_cv_path_SETFILE+:} false; then : 2.719 +if test "${ac_cv_path_SETFILE+set}" = set; then : 2.720 $as_echo_n "(cached) " >&6 2.721 else 2.722 case $SETFILE in 2.723 @@ -6515,7 +6514,7 @@ 2.724 2.725 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 2.726 $as_echo_n "checking build system type... " >&6; } 2.727 -if ${ac_cv_build+:} false; then : 2.728 +if test "${ac_cv_build+set}" = set; then : 2.729 $as_echo_n "(cached) " >&6 2.730 else 2.731 ac_build_alias=$build_alias 2.732 @@ -6531,7 +6530,7 @@ 2.733 $as_echo "$ac_cv_build" >&6; } 2.734 case $ac_cv_build in 2.735 *-*-*) ;; 2.736 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 2.737 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 2.738 esac 2.739 build=$ac_cv_build 2.740 ac_save_IFS=$IFS; IFS='-' 2.741 @@ -6549,7 +6548,7 @@ 2.742 2.743 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 2.744 $as_echo_n "checking host system type... " >&6; } 2.745 -if ${ac_cv_host+:} false; then : 2.746 +if test "${ac_cv_host+set}" = set; then : 2.747 $as_echo_n "(cached) " >&6 2.748 else 2.749 if test "x$host_alias" = x; then 2.750 @@ -6564,7 +6563,7 @@ 2.751 $as_echo "$ac_cv_host" >&6; } 2.752 case $ac_cv_host in 2.753 *-*-*) ;; 2.754 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 2.755 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 2.756 esac 2.757 host=$ac_cv_host 2.758 ac_save_IFS=$IFS; IFS='-' 2.759 @@ -6582,7 +6581,7 @@ 2.760 2.761 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 2.762 $as_echo_n "checking target system type... " >&6; } 2.763 -if ${ac_cv_target+:} false; then : 2.764 +if test "${ac_cv_target+set}" = set; then : 2.765 $as_echo_n "(cached) " >&6 2.766 else 2.767 if test "x$target_alias" = x; then 2.768 @@ -6597,7 +6596,7 @@ 2.769 $as_echo "$ac_cv_target" >&6; } 2.770 case $ac_cv_target in 2.771 *-*-*) ;; 2.772 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 2.773 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 2.774 esac 2.775 target=$ac_cv_target 2.776 ac_save_IFS=$IFS; IFS='-' 2.777 @@ -7488,6 +7487,53 @@ 2.778 2.779 2.780 2.781 +# Check if it's a pure open build or if custom sources are to be used. 2.782 + 2.783 + # Check whether --enable-openjdk-only was given. 2.784 +if test "${enable_openjdk_only+set}" = set; then : 2.785 + enableval=$enable_openjdk_only; 2.786 +else 2.787 + enable_openjdk_only="no" 2.788 +fi 2.789 + 2.790 + 2.791 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for presence of closed sources" >&5 2.792 +$as_echo_n "checking for presence of closed sources... " >&6; } 2.793 + if test -d "$SRC_ROOT/jdk/src/closed"; then 2.794 + CLOSED_SOURCE_PRESENT=yes 2.795 + else 2.796 + CLOSED_SOURCE_PRESENT=no 2.797 + fi 2.798 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOSED_SOURCE_PRESENT" >&5 2.799 +$as_echo "$CLOSED_SOURCE_PRESENT" >&6; } 2.800 + 2.801 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if closed source is suppressed (openjdk-only)" >&5 2.802 +$as_echo_n "checking if closed source is suppressed (openjdk-only)... " >&6; } 2.803 + SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only" 2.804 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUPPRESS_CLOSED_SOURCE" >&5 2.805 +$as_echo "$SUPPRESS_CLOSED_SOURCE" >&6; } 2.806 + 2.807 + if test "x$CLOSED_SOURCE_PRESENT" = xno; then 2.808 + OPENJDK=true 2.809 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then 2.810 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&5 2.811 +$as_echo "$as_me: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&2;} 2.812 + fi 2.813 + else 2.814 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then 2.815 + OPENJDK=true 2.816 + else 2.817 + OPENJDK=false 2.818 + fi 2.819 + fi 2.820 + 2.821 + if test "x$OPENJDK" = "xtrue"; then 2.822 + SET_OPENJDK="OPENJDK=true" 2.823 + fi 2.824 + 2.825 + 2.826 + 2.827 + 2.828 # These are needed to be able to create a configuration name (and thus the output directory) 2.829 2.830 ############################################################################### 2.831 @@ -8016,7 +8062,7 @@ 2.832 set dummy $ac_prog; ac_word=$2 2.833 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.834 $as_echo_n "checking for $ac_word... " >&6; } 2.835 -if ${ac_cv_prog_PKGHANDLER+:} false; then : 2.836 +if test "${ac_cv_prog_PKGHANDLER+set}" = set; then : 2.837 $as_echo_n "(cached) " >&6 2.838 else 2.839 if test -n "$PKGHANDLER"; then 2.840 @@ -8381,7 +8427,7 @@ 2.841 set dummy $ac_prog; ac_word=$2 2.842 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.843 $as_echo_n "checking for $ac_word... " >&6; } 2.844 -if ${ac_cv_path_CHECK_GMAKE+:} false; then : 2.845 +if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then : 2.846 $as_echo_n "(cached) " >&6 2.847 else 2.848 case $CHECK_GMAKE in 2.849 @@ -8735,7 +8781,7 @@ 2.850 set dummy $ac_prog; ac_word=$2 2.851 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.852 $as_echo_n "checking for $ac_word... " >&6; } 2.853 -if ${ac_cv_path_CHECK_MAKE+:} false; then : 2.854 +if test "${ac_cv_path_CHECK_MAKE+set}" = set; then : 2.855 $as_echo_n "(cached) " >&6 2.856 else 2.857 case $CHECK_MAKE in 2.858 @@ -9094,7 +9140,7 @@ 2.859 set dummy $ac_prog; ac_word=$2 2.860 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.861 $as_echo_n "checking for $ac_word... " >&6; } 2.862 -if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then : 2.863 +if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then : 2.864 $as_echo_n "(cached) " >&6 2.865 else 2.866 case $CHECK_TOOLSDIR_GMAKE in 2.867 @@ -9447,7 +9493,7 @@ 2.868 set dummy $ac_prog; ac_word=$2 2.869 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.870 $as_echo_n "checking for $ac_word... " >&6; } 2.871 -if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then : 2.872 +if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then : 2.873 $as_echo_n "(cached) " >&6 2.874 else 2.875 case $CHECK_TOOLSDIR_MAKE in 2.876 @@ -9843,7 +9889,7 @@ 2.877 set dummy $ac_prog; ac_word=$2 2.878 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.879 $as_echo_n "checking for $ac_word... " >&6; } 2.880 -if ${ac_cv_path_UNZIP+:} false; then : 2.881 +if test "${ac_cv_path_UNZIP+set}" = set; then : 2.882 $as_echo_n "(cached) " >&6 2.883 else 2.884 case $UNZIP in 2.885 @@ -9902,7 +9948,7 @@ 2.886 set dummy $ac_prog; ac_word=$2 2.887 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.888 $as_echo_n "checking for $ac_word... " >&6; } 2.889 -if ${ac_cv_path_ZIP+:} false; then : 2.890 +if test "${ac_cv_path_ZIP+set}" = set; then : 2.891 $as_echo_n "(cached) " >&6 2.892 else 2.893 case $ZIP in 2.894 @@ -9961,7 +10007,7 @@ 2.895 set dummy ldd; ac_word=$2 2.896 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.897 $as_echo_n "checking for $ac_word... " >&6; } 2.898 -if ${ac_cv_path_LDD+:} false; then : 2.899 +if test "${ac_cv_path_LDD+set}" = set; then : 2.900 $as_echo_n "(cached) " >&6 2.901 else 2.902 case $LDD in 2.903 @@ -10007,7 +10053,7 @@ 2.904 set dummy otool; ac_word=$2 2.905 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.906 $as_echo_n "checking for $ac_word... " >&6; } 2.907 -if ${ac_cv_path_OTOOL+:} false; then : 2.908 +if test "${ac_cv_path_OTOOL+set}" = set; then : 2.909 $as_echo_n "(cached) " >&6 2.910 else 2.911 case $OTOOL in 2.912 @@ -10052,7 +10098,7 @@ 2.913 set dummy $ac_prog; ac_word=$2 2.914 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.915 $as_echo_n "checking for $ac_word... " >&6; } 2.916 -if ${ac_cv_path_READELF+:} false; then : 2.917 +if test "${ac_cv_path_READELF+set}" = set; then : 2.918 $as_echo_n "(cached) " >&6 2.919 else 2.920 case $READELF in 2.921 @@ -10095,7 +10141,7 @@ 2.922 set dummy hg; ac_word=$2 2.923 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.924 $as_echo_n "checking for $ac_word... " >&6; } 2.925 -if ${ac_cv_path_HG+:} false; then : 2.926 +if test "${ac_cv_path_HG+set}" = set; then : 2.927 $as_echo_n "(cached) " >&6 2.928 else 2.929 case $HG in 2.930 @@ -10135,7 +10181,7 @@ 2.931 set dummy stat; ac_word=$2 2.932 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.933 $as_echo_n "checking for $ac_word... " >&6; } 2.934 -if ${ac_cv_path_STAT+:} false; then : 2.935 +if test "${ac_cv_path_STAT+set}" = set; then : 2.936 $as_echo_n "(cached) " >&6 2.937 else 2.938 case $STAT in 2.939 @@ -10175,7 +10221,7 @@ 2.940 set dummy time; ac_word=$2 2.941 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.942 $as_echo_n "checking for $ac_word... " >&6; } 2.943 -if ${ac_cv_path_TIME+:} false; then : 2.944 +if test "${ac_cv_path_TIME+set}" = set; then : 2.945 $as_echo_n "(cached) " >&6 2.946 else 2.947 case $TIME in 2.948 @@ -10220,7 +10266,7 @@ 2.949 set dummy $ac_prog; ac_word=$2 2.950 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.951 $as_echo_n "checking for $ac_word... " >&6; } 2.952 -if ${ac_cv_path_COMM+:} false; then : 2.953 +if test "${ac_cv_path_COMM+set}" = set; then : 2.954 $as_echo_n "(cached) " >&6 2.955 else 2.956 case $COMM in 2.957 @@ -10284,7 +10330,7 @@ 2.958 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 2.959 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.960 $as_echo_n "checking for $ac_word... " >&6; } 2.961 -if ${ac_cv_path_PKG_CONFIG+:} false; then : 2.962 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 2.963 $as_echo_n "(cached) " >&6 2.964 else 2.965 case $PKG_CONFIG in 2.966 @@ -10327,7 +10373,7 @@ 2.967 set dummy pkg-config; ac_word=$2 2.968 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.969 $as_echo_n "checking for $ac_word... " >&6; } 2.970 -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : 2.971 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : 2.972 $as_echo_n "(cached) " >&6 2.973 else 2.974 case $ac_pt_PKG_CONFIG in 2.975 @@ -10500,7 +10546,7 @@ 2.976 set dummy $ac_prog; ac_word=$2 2.977 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.978 $as_echo_n "checking for $ac_word... " >&6; } 2.979 -if ${ac_cv_prog_BDEPS_UNZIP+:} false; then : 2.980 +if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then : 2.981 $as_echo_n "(cached) " >&6 2.982 else 2.983 if test -n "$BDEPS_UNZIP"; then 2.984 @@ -10546,7 +10592,7 @@ 2.985 set dummy $ac_prog; ac_word=$2 2.986 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.987 $as_echo_n "checking for $ac_word... " >&6; } 2.988 -if ${ac_cv_prog_BDEPS_FTP+:} false; then : 2.989 +if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then : 2.990 $as_echo_n "(cached) " >&6 2.991 else 2.992 if test -n "$BDEPS_FTP"; then 2.993 @@ -10595,54 +10641,6 @@ 2.994 2.995 ############################################################################### 2.996 # 2.997 -# Should we build only OpenJDK even if closed sources are present? 2.998 -# 2.999 -# Check whether --enable-openjdk-only was given. 2.1000 -if test "${enable_openjdk_only+set}" = set; then : 2.1001 - enableval=$enable_openjdk_only; 2.1002 -else 2.1003 - enable_openjdk_only="no" 2.1004 -fi 2.1005 - 2.1006 - 2.1007 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for presence of closed sources" >&5 2.1008 -$as_echo_n "checking for presence of closed sources... " >&6; } 2.1009 -if test -d "$SRC_ROOT/jdk/src/closed"; then 2.1010 - CLOSED_SOURCE_PRESENT=yes 2.1011 -else 2.1012 - CLOSED_SOURCE_PRESENT=no 2.1013 -fi 2.1014 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOSED_SOURCE_PRESENT" >&5 2.1015 -$as_echo "$CLOSED_SOURCE_PRESENT" >&6; } 2.1016 - 2.1017 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if closed source is supressed (openjdk-only)" >&5 2.1018 -$as_echo_n "checking if closed source is supressed (openjdk-only)... " >&6; } 2.1019 -SUPRESS_CLOSED_SOURCE="$enable_openjdk_only" 2.1020 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUPRESS_CLOSED_SOURCE" >&5 2.1021 -$as_echo "$SUPRESS_CLOSED_SOURCE" >&6; } 2.1022 - 2.1023 -if test "x$CLOSED_SOURCE_PRESENT" = xno; then 2.1024 - OPENJDK=true 2.1025 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then 2.1026 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&5 2.1027 -$as_echo "$as_me: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&2;} 2.1028 - fi 2.1029 -else 2.1030 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then 2.1031 - OPENJDK=true 2.1032 - else 2.1033 - OPENJDK=false 2.1034 - fi 2.1035 -fi 2.1036 - 2.1037 -if test "x$OPENJDK" = "xtrue"; then 2.1038 - SET_OPENJDK="OPENJDK=true" 2.1039 -fi 2.1040 - 2.1041 - 2.1042 - 2.1043 -############################################################################### 2.1044 -# 2.1045 # Should we build a JDK/JVM with headful support (ie a graphical ui)? 2.1046 # We always build headless support. 2.1047 # 2.1048 @@ -11860,7 +11858,7 @@ 2.1049 set dummy javac; ac_word=$2 2.1050 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1051 $as_echo_n "checking for $ac_word... " >&6; } 2.1052 -if ${ac_cv_path_JAVAC_CHECK+:} false; then : 2.1053 +if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then : 2.1054 $as_echo_n "(cached) " >&6 2.1055 else 2.1056 case $JAVAC_CHECK in 2.1057 @@ -11900,7 +11898,7 @@ 2.1058 set dummy java; ac_word=$2 2.1059 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1060 $as_echo_n "checking for $ac_word... " >&6; } 2.1061 -if ${ac_cv_path_JAVA_CHECK+:} false; then : 2.1062 +if test "${ac_cv_path_JAVA_CHECK+set}" = set; then : 2.1063 $as_echo_n "(cached) " >&6 2.1064 else 2.1065 case $JAVA_CHECK in 2.1066 @@ -15959,7 +15957,7 @@ 2.1067 set dummy link; ac_word=$2 2.1068 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1069 $as_echo_n "checking for $ac_word... " >&6; } 2.1070 -if ${ac_cv_path_CYGWIN_LINK+:} false; then : 2.1071 +if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then : 2.1072 $as_echo_n "(cached) " >&6 2.1073 else 2.1074 case $CYGWIN_LINK in 2.1075 @@ -16948,7 +16946,7 @@ 2.1076 set dummy $ac_prog; ac_word=$2 2.1077 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1078 $as_echo_n "checking for $ac_word... " >&6; } 2.1079 -if ${ac_cv_path_BUILD_CC+:} false; then : 2.1080 +if test "${ac_cv_path_BUILD_CC+set}" = set; then : 2.1081 $as_echo_n "(cached) " >&6 2.1082 else 2.1083 case $BUILD_CC in 2.1084 @@ -17259,7 +17257,7 @@ 2.1085 set dummy $ac_prog; ac_word=$2 2.1086 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1087 $as_echo_n "checking for $ac_word... " >&6; } 2.1088 -if ${ac_cv_path_BUILD_CXX+:} false; then : 2.1089 +if test "${ac_cv_path_BUILD_CXX+set}" = set; then : 2.1090 $as_echo_n "(cached) " >&6 2.1091 else 2.1092 case $BUILD_CXX in 2.1093 @@ -17568,7 +17566,7 @@ 2.1094 set dummy ld; ac_word=$2 2.1095 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1096 $as_echo_n "checking for $ac_word... " >&6; } 2.1097 -if ${ac_cv_path_BUILD_LD+:} false; then : 2.1098 +if test "${ac_cv_path_BUILD_LD+set}" = set; then : 2.1099 $as_echo_n "(cached) " >&6 2.1100 else 2.1101 case $BUILD_LD in 2.1102 @@ -18080,7 +18078,7 @@ 2.1103 set dummy $ac_prog; ac_word=$2 2.1104 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1105 $as_echo_n "checking for $ac_word... " >&6; } 2.1106 -if ${ac_cv_path_TOOLS_DIR_CC+:} false; then : 2.1107 +if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then : 2.1108 $as_echo_n "(cached) " >&6 2.1109 else 2.1110 case $TOOLS_DIR_CC in 2.1111 @@ -18132,7 +18130,7 @@ 2.1112 set dummy $ac_prog; ac_word=$2 2.1113 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1114 $as_echo_n "checking for $ac_word... " >&6; } 2.1115 -if ${ac_cv_path_POTENTIAL_CC+:} false; then : 2.1116 +if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then : 2.1117 $as_echo_n "(cached) " >&6 2.1118 else 2.1119 case $POTENTIAL_CC in 2.1120 @@ -18545,7 +18543,7 @@ 2.1121 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2.1122 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1123 $as_echo_n "checking for $ac_word... " >&6; } 2.1124 -if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then : 2.1125 +if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then : 2.1126 $as_echo_n "(cached) " >&6 2.1127 else 2.1128 if test -n "$PROPER_COMPILER_CC"; then 2.1129 @@ -18589,7 +18587,7 @@ 2.1130 set dummy $ac_prog; ac_word=$2 2.1131 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1132 $as_echo_n "checking for $ac_word... " >&6; } 2.1133 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then : 2.1134 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then : 2.1135 $as_echo_n "(cached) " >&6 2.1136 else 2.1137 if test -n "$ac_ct_PROPER_COMPILER_CC"; then 2.1138 @@ -19039,7 +19037,7 @@ 2.1139 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2.1140 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1141 $as_echo_n "checking for $ac_word... " >&6; } 2.1142 -if ${ac_cv_prog_CC+:} false; then : 2.1143 +if test "${ac_cv_prog_CC+set}" = set; then : 2.1144 $as_echo_n "(cached) " >&6 2.1145 else 2.1146 if test -n "$CC"; then 2.1147 @@ -19083,7 +19081,7 @@ 2.1148 set dummy $ac_prog; ac_word=$2 2.1149 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1150 $as_echo_n "checking for $ac_word... " >&6; } 2.1151 -if ${ac_cv_prog_ac_ct_CC+:} false; then : 2.1152 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 2.1153 $as_echo_n "(cached) " >&6 2.1154 else 2.1155 if test -n "$ac_ct_CC"; then 2.1156 @@ -19136,7 +19134,7 @@ 2.1157 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.1158 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.1159 as_fn_error $? "no acceptable C compiler found in \$PATH 2.1160 -See \`config.log' for more details" "$LINENO" 5; } 2.1161 +See \`config.log' for more details" "$LINENO" 5 ; } 2.1162 2.1163 # Provide some information about the compiler. 2.1164 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 2.1165 @@ -19251,7 +19249,7 @@ 2.1166 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.1167 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.1168 as_fn_error 77 "C compiler cannot create executables 2.1169 -See \`config.log' for more details" "$LINENO" 5; } 2.1170 +See \`config.log' for more details" "$LINENO" 5 ; } 2.1171 else 2.1172 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 2.1173 $as_echo "yes" >&6; } 2.1174 @@ -19294,7 +19292,7 @@ 2.1175 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.1176 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.1177 as_fn_error $? "cannot compute suffix of executables: cannot compile and link 2.1178 -See \`config.log' for more details" "$LINENO" 5; } 2.1179 +See \`config.log' for more details" "$LINENO" 5 ; } 2.1180 fi 2.1181 rm -f conftest conftest$ac_cv_exeext 2.1182 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 2.1183 @@ -19353,7 +19351,7 @@ 2.1184 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.1185 as_fn_error $? "cannot run C compiled programs. 2.1186 If you meant to cross compile, use \`--host'. 2.1187 -See \`config.log' for more details" "$LINENO" 5; } 2.1188 +See \`config.log' for more details" "$LINENO" 5 ; } 2.1189 fi 2.1190 fi 2.1191 fi 2.1192 @@ -19364,7 +19362,7 @@ 2.1193 ac_clean_files=$ac_clean_files_save 2.1194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 2.1195 $as_echo_n "checking for suffix of object files... " >&6; } 2.1196 -if ${ac_cv_objext+:} false; then : 2.1197 +if test "${ac_cv_objext+set}" = set; then : 2.1198 $as_echo_n "(cached) " >&6 2.1199 else 2.1200 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.1201 @@ -19405,7 +19403,7 @@ 2.1202 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.1203 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.1204 as_fn_error $? "cannot compute suffix of object files: cannot compile 2.1205 -See \`config.log' for more details" "$LINENO" 5; } 2.1206 +See \`config.log' for more details" "$LINENO" 5 ; } 2.1207 fi 2.1208 rm -f conftest.$ac_cv_objext conftest.$ac_ext 2.1209 fi 2.1210 @@ -19415,7 +19413,7 @@ 2.1211 ac_objext=$OBJEXT 2.1212 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 2.1213 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 2.1214 -if ${ac_cv_c_compiler_gnu+:} false; then : 2.1215 +if test "${ac_cv_c_compiler_gnu+set}" = set; then : 2.1216 $as_echo_n "(cached) " >&6 2.1217 else 2.1218 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.1219 @@ -19452,7 +19450,7 @@ 2.1220 ac_save_CFLAGS=$CFLAGS 2.1221 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 2.1222 $as_echo_n "checking whether $CC accepts -g... " >&6; } 2.1223 -if ${ac_cv_prog_cc_g+:} false; then : 2.1224 +if test "${ac_cv_prog_cc_g+set}" = set; then : 2.1225 $as_echo_n "(cached) " >&6 2.1226 else 2.1227 ac_save_c_werror_flag=$ac_c_werror_flag 2.1228 @@ -19530,7 +19528,7 @@ 2.1229 fi 2.1230 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 2.1231 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 2.1232 -if ${ac_cv_prog_cc_c89+:} false; then : 2.1233 +if test "${ac_cv_prog_cc_c89+set}" = set; then : 2.1234 $as_echo_n "(cached) " >&6 2.1235 else 2.1236 ac_cv_prog_cc_c89=no 2.1237 @@ -19649,7 +19647,7 @@ 2.1238 set dummy $ac_prog; ac_word=$2 2.1239 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1240 $as_echo_n "checking for $ac_word... " >&6; } 2.1241 -if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then : 2.1242 +if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then : 2.1243 $as_echo_n "(cached) " >&6 2.1244 else 2.1245 case $TOOLS_DIR_CXX in 2.1246 @@ -19701,7 +19699,7 @@ 2.1247 set dummy $ac_prog; ac_word=$2 2.1248 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1249 $as_echo_n "checking for $ac_word... " >&6; } 2.1250 -if ${ac_cv_path_POTENTIAL_CXX+:} false; then : 2.1251 +if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then : 2.1252 $as_echo_n "(cached) " >&6 2.1253 else 2.1254 case $POTENTIAL_CXX in 2.1255 @@ -20114,7 +20112,7 @@ 2.1256 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2.1257 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1258 $as_echo_n "checking for $ac_word... " >&6; } 2.1259 -if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then : 2.1260 +if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then : 2.1261 $as_echo_n "(cached) " >&6 2.1262 else 2.1263 if test -n "$PROPER_COMPILER_CXX"; then 2.1264 @@ -20158,7 +20156,7 @@ 2.1265 set dummy $ac_prog; ac_word=$2 2.1266 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1267 $as_echo_n "checking for $ac_word... " >&6; } 2.1268 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then : 2.1269 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then : 2.1270 $as_echo_n "(cached) " >&6 2.1271 else 2.1272 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then 2.1273 @@ -20612,7 +20610,7 @@ 2.1274 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2.1275 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1276 $as_echo_n "checking for $ac_word... " >&6; } 2.1277 -if ${ac_cv_prog_CXX+:} false; then : 2.1278 +if test "${ac_cv_prog_CXX+set}" = set; then : 2.1279 $as_echo_n "(cached) " >&6 2.1280 else 2.1281 if test -n "$CXX"; then 2.1282 @@ -20656,7 +20654,7 @@ 2.1283 set dummy $ac_prog; ac_word=$2 2.1284 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1285 $as_echo_n "checking for $ac_word... " >&6; } 2.1286 -if ${ac_cv_prog_ac_ct_CXX+:} false; then : 2.1287 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : 2.1288 $as_echo_n "(cached) " >&6 2.1289 else 2.1290 if test -n "$ac_ct_CXX"; then 2.1291 @@ -20734,7 +20732,7 @@ 2.1292 2.1293 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 2.1294 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } 2.1295 -if ${ac_cv_cxx_compiler_gnu+:} false; then : 2.1296 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : 2.1297 $as_echo_n "(cached) " >&6 2.1298 else 2.1299 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.1300 @@ -20771,7 +20769,7 @@ 2.1301 ac_save_CXXFLAGS=$CXXFLAGS 2.1302 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 2.1303 $as_echo_n "checking whether $CXX accepts -g... " >&6; } 2.1304 -if ${ac_cv_prog_cxx_g+:} false; then : 2.1305 +if test "${ac_cv_prog_cxx_g+set}" = set; then : 2.1306 $as_echo_n "(cached) " >&6 2.1307 else 2.1308 ac_save_cxx_werror_flag=$ac_cxx_werror_flag 2.1309 @@ -20869,7 +20867,7 @@ 2.1310 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2.1311 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1312 $as_echo_n "checking for $ac_word... " >&6; } 2.1313 -if ${ac_cv_prog_OBJC+:} false; then : 2.1314 +if test "${ac_cv_prog_OBJC+set}" = set; then : 2.1315 $as_echo_n "(cached) " >&6 2.1316 else 2.1317 if test -n "$OBJC"; then 2.1318 @@ -20913,7 +20911,7 @@ 2.1319 set dummy $ac_prog; ac_word=$2 2.1320 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1321 $as_echo_n "checking for $ac_word... " >&6; } 2.1322 -if ${ac_cv_prog_ac_ct_OBJC+:} false; then : 2.1323 +if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then : 2.1324 $as_echo_n "(cached) " >&6 2.1325 else 2.1326 if test -n "$ac_ct_OBJC"; then 2.1327 @@ -20989,7 +20987,7 @@ 2.1328 2.1329 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 2.1330 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } 2.1331 -if ${ac_cv_objc_compiler_gnu+:} false; then : 2.1332 +if test "${ac_cv_objc_compiler_gnu+set}" = set; then : 2.1333 $as_echo_n "(cached) " >&6 2.1334 else 2.1335 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.1336 @@ -21026,7 +21024,7 @@ 2.1337 ac_save_OBJCFLAGS=$OBJCFLAGS 2.1338 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 2.1339 $as_echo_n "checking whether $OBJC accepts -g... " >&6; } 2.1340 -if ${ac_cv_prog_objc_g+:} false; then : 2.1341 +if test "${ac_cv_prog_objc_g+set}" = set; then : 2.1342 $as_echo_n "(cached) " >&6 2.1343 else 2.1344 ac_save_objc_werror_flag=$ac_objc_werror_flag 2.1345 @@ -21402,7 +21400,7 @@ 2.1346 set dummy ${ac_tool_prefix}ar; ac_word=$2 2.1347 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1348 $as_echo_n "checking for $ac_word... " >&6; } 2.1349 -if ${ac_cv_prog_AR+:} false; then : 2.1350 +if test "${ac_cv_prog_AR+set}" = set; then : 2.1351 $as_echo_n "(cached) " >&6 2.1352 else 2.1353 if test -n "$AR"; then 2.1354 @@ -21442,7 +21440,7 @@ 2.1355 set dummy ar; ac_word=$2 2.1356 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1357 $as_echo_n "checking for $ac_word... " >&6; } 2.1358 -if ${ac_cv_prog_ac_ct_AR+:} false; then : 2.1359 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 2.1360 $as_echo_n "(cached) " >&6 2.1361 else 2.1362 if test -n "$ac_ct_AR"; then 2.1363 @@ -21784,7 +21782,7 @@ 2.1364 set dummy link; ac_word=$2 2.1365 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1366 $as_echo_n "checking for $ac_word... " >&6; } 2.1367 -if ${ac_cv_prog_WINLD+:} false; then : 2.1368 +if test "${ac_cv_prog_WINLD+set}" = set; then : 2.1369 $as_echo_n "(cached) " >&6 2.1370 else 2.1371 if test -n "$WINLD"; then 2.1372 @@ -22123,7 +22121,7 @@ 2.1373 set dummy mt; ac_word=$2 2.1374 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1375 $as_echo_n "checking for $ac_word... " >&6; } 2.1376 -if ${ac_cv_prog_MT+:} false; then : 2.1377 +if test "${ac_cv_prog_MT+set}" = set; then : 2.1378 $as_echo_n "(cached) " >&6 2.1379 else 2.1380 if test -n "$MT"; then 2.1381 @@ -22444,7 +22442,7 @@ 2.1382 set dummy rc; ac_word=$2 2.1383 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1384 $as_echo_n "checking for $ac_word... " >&6; } 2.1385 -if ${ac_cv_prog_RC+:} false; then : 2.1386 +if test "${ac_cv_prog_RC+set}" = set; then : 2.1387 $as_echo_n "(cached) " >&6 2.1388 else 2.1389 if test -n "$RC"; then 2.1390 @@ -22835,7 +22833,7 @@ 2.1391 set dummy lib; ac_word=$2 2.1392 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1393 $as_echo_n "checking for $ac_word... " >&6; } 2.1394 -if ${ac_cv_prog_WINAR+:} false; then : 2.1395 +if test "${ac_cv_prog_WINAR+set}" = set; then : 2.1396 $as_echo_n "(cached) " >&6 2.1397 else 2.1398 if test -n "$WINAR"; then 2.1399 @@ -23141,7 +23139,7 @@ 2.1400 set dummy dumpbin; ac_word=$2 2.1401 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1402 $as_echo_n "checking for $ac_word... " >&6; } 2.1403 -if ${ac_cv_prog_DUMPBIN+:} false; then : 2.1404 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : 2.1405 $as_echo_n "(cached) " >&6 2.1406 else 2.1407 if test -n "$DUMPBIN"; then 2.1408 @@ -23460,7 +23458,7 @@ 2.1409 CPP= 2.1410 fi 2.1411 if test -z "$CPP"; then 2.1412 - if ${ac_cv_prog_CPP+:} false; then : 2.1413 + if test "${ac_cv_prog_CPP+set}" = set; then : 2.1414 $as_echo_n "(cached) " >&6 2.1415 else 2.1416 # Double quotes because CPP needs to be expanded 2.1417 @@ -23576,7 +23574,7 @@ 2.1418 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.1419 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.1420 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 2.1421 -See \`config.log' for more details" "$LINENO" 5; } 2.1422 +See \`config.log' for more details" "$LINENO" 5 ; } 2.1423 fi 2.1424 2.1425 ac_ext=cpp 2.1426 @@ -23860,7 +23858,7 @@ 2.1427 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 2.1428 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } 2.1429 if test -z "$CXXCPP"; then 2.1430 - if ${ac_cv_prog_CXXCPP+:} false; then : 2.1431 + if test "${ac_cv_prog_CXXCPP+set}" = set; then : 2.1432 $as_echo_n "(cached) " >&6 2.1433 else 2.1434 # Double quotes because CXXCPP needs to be expanded 2.1435 @@ -23976,7 +23974,7 @@ 2.1436 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.1437 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.1438 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check 2.1439 -See \`config.log' for more details" "$LINENO" 5; } 2.1440 +See \`config.log' for more details" "$LINENO" 5 ; } 2.1441 fi 2.1442 2.1443 ac_ext=cpp 2.1444 @@ -24278,7 +24276,7 @@ 2.1445 set dummy as; ac_word=$2 2.1446 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1447 $as_echo_n "checking for $ac_word... " >&6; } 2.1448 -if ${ac_cv_path_AS+:} false; then : 2.1449 +if test "${ac_cv_path_AS+set}" = set; then : 2.1450 $as_echo_n "(cached) " >&6 2.1451 else 2.1452 case $AS in 2.1453 @@ -24592,7 +24590,7 @@ 2.1454 set dummy $ac_prog; ac_word=$2 2.1455 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1456 $as_echo_n "checking for $ac_word... " >&6; } 2.1457 -if ${ac_cv_path_NM+:} false; then : 2.1458 +if test "${ac_cv_path_NM+set}" = set; then : 2.1459 $as_echo_n "(cached) " >&6 2.1460 else 2.1461 case $NM in 2.1462 @@ -24901,7 +24899,7 @@ 2.1463 set dummy strip; ac_word=$2 2.1464 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1465 $as_echo_n "checking for $ac_word... " >&6; } 2.1466 -if ${ac_cv_path_STRIP+:} false; then : 2.1467 +if test "${ac_cv_path_STRIP+set}" = set; then : 2.1468 $as_echo_n "(cached) " >&6 2.1469 else 2.1470 case $STRIP in 2.1471 @@ -25207,7 +25205,7 @@ 2.1472 set dummy mcs; ac_word=$2 2.1473 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1474 $as_echo_n "checking for $ac_word... " >&6; } 2.1475 -if ${ac_cv_path_MCS+:} false; then : 2.1476 +if test "${ac_cv_path_MCS+set}" = set; then : 2.1477 $as_echo_n "(cached) " >&6 2.1478 else 2.1479 case $MCS in 2.1480 @@ -25515,7 +25513,7 @@ 2.1481 set dummy ${ac_tool_prefix}nm; ac_word=$2 2.1482 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1483 $as_echo_n "checking for $ac_word... " >&6; } 2.1484 -if ${ac_cv_prog_NM+:} false; then : 2.1485 +if test "${ac_cv_prog_NM+set}" = set; then : 2.1486 $as_echo_n "(cached) " >&6 2.1487 else 2.1488 if test -n "$NM"; then 2.1489 @@ -25555,7 +25553,7 @@ 2.1490 set dummy nm; ac_word=$2 2.1491 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1492 $as_echo_n "checking for $ac_word... " >&6; } 2.1493 -if ${ac_cv_prog_ac_ct_NM+:} false; then : 2.1494 +if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : 2.1495 $as_echo_n "(cached) " >&6 2.1496 else 2.1497 if test -n "$ac_ct_NM"; then 2.1498 @@ -25873,7 +25871,7 @@ 2.1499 set dummy ${ac_tool_prefix}strip; ac_word=$2 2.1500 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1501 $as_echo_n "checking for $ac_word... " >&6; } 2.1502 -if ${ac_cv_prog_STRIP+:} false; then : 2.1503 +if test "${ac_cv_prog_STRIP+set}" = set; then : 2.1504 $as_echo_n "(cached) " >&6 2.1505 else 2.1506 if test -n "$STRIP"; then 2.1507 @@ -25913,7 +25911,7 @@ 2.1508 set dummy strip; ac_word=$2 2.1509 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1510 $as_echo_n "checking for $ac_word... " >&6; } 2.1511 -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : 2.1512 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : 2.1513 $as_echo_n "(cached) " >&6 2.1514 else 2.1515 if test -n "$ac_ct_STRIP"; then 2.1516 @@ -26238,7 +26236,7 @@ 2.1517 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2.1518 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1519 $as_echo_n "checking for $ac_word... " >&6; } 2.1520 -if ${ac_cv_prog_OBJCOPY+:} false; then : 2.1521 +if test "${ac_cv_prog_OBJCOPY+set}" = set; then : 2.1522 $as_echo_n "(cached) " >&6 2.1523 else 2.1524 if test -n "$OBJCOPY"; then 2.1525 @@ -26282,7 +26280,7 @@ 2.1526 set dummy $ac_prog; ac_word=$2 2.1527 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1528 $as_echo_n "checking for $ac_word... " >&6; } 2.1529 -if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then : 2.1530 +if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then : 2.1531 $as_echo_n "(cached) " >&6 2.1532 else 2.1533 if test -n "$ac_ct_OBJCOPY"; then 2.1534 @@ -26609,7 +26607,7 @@ 2.1535 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 2.1536 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1537 $as_echo_n "checking for $ac_word... " >&6; } 2.1538 -if ${ac_cv_prog_OBJDUMP+:} false; then : 2.1539 +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : 2.1540 $as_echo_n "(cached) " >&6 2.1541 else 2.1542 if test -n "$OBJDUMP"; then 2.1543 @@ -26653,7 +26651,7 @@ 2.1544 set dummy $ac_prog; ac_word=$2 2.1545 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1546 $as_echo_n "checking for $ac_word... " >&6; } 2.1547 -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : 2.1548 +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : 2.1549 $as_echo_n "(cached) " >&6 2.1550 else 2.1551 if test -n "$ac_ct_OBJDUMP"; then 2.1552 @@ -26977,7 +26975,7 @@ 2.1553 set dummy lipo; ac_word=$2 2.1554 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1555 $as_echo_n "checking for $ac_word... " >&6; } 2.1556 -if ${ac_cv_path_LIPO+:} false; then : 2.1557 +if test "${ac_cv_path_LIPO+set}" = set; then : 2.1558 $as_echo_n "(cached) " >&6 2.1559 else 2.1560 case $LIPO in 2.1561 @@ -27292,7 +27290,7 @@ 2.1562 2.1563 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 2.1564 $as_echo_n "checking for ANSI C header files... " >&6; } 2.1565 -if ${ac_cv_header_stdc+:} false; then : 2.1566 +if test "${ac_cv_header_stdc+set}" = set; then : 2.1567 $as_echo_n "(cached) " >&6 2.1568 else 2.1569 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 2.1570 @@ -27468,7 +27466,7 @@ 2.1571 for ac_header in stdio.h 2.1572 do : 2.1573 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" 2.1574 -if test "x$ac_cv_header_stdio_h" = xyes; then : 2.1575 +if test "x$ac_cv_header_stdio_h" = x""yes; then : 2.1576 cat >>confdefs.h <<_ACEOF 2.1577 #define HAVE_STDIO_H 1 2.1578 _ACEOF 2.1579 @@ -27497,7 +27495,7 @@ 2.1580 # This bug is HP SR number 8606223364. 2.1581 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 2.1582 $as_echo_n "checking size of int *... " >&6; } 2.1583 -if ${ac_cv_sizeof_int_p+:} false; then : 2.1584 +if test "${ac_cv_sizeof_int_p+set}" = set; then : 2.1585 $as_echo_n "(cached) " >&6 2.1586 else 2.1587 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : 2.1588 @@ -27507,7 +27505,7 @@ 2.1589 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 2.1590 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 2.1591 as_fn_error 77 "cannot compute sizeof (int *) 2.1592 -See \`config.log' for more details" "$LINENO" 5; } 2.1593 +See \`config.log' for more details" "$LINENO" 5 ; } 2.1594 else 2.1595 ac_cv_sizeof_int_p=0 2.1596 fi 2.1597 @@ -27554,7 +27552,7 @@ 2.1598 # 2.1599 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 2.1600 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } 2.1601 -if ${ac_cv_c_bigendian+:} false; then : 2.1602 +if test "${ac_cv_c_bigendian+set}" = set; then : 2.1603 $as_echo_n "(cached) " >&6 2.1604 else 2.1605 ac_cv_c_bigendian=unknown 2.1606 @@ -28554,8 +28552,8 @@ 2.1607 have_x=disabled 2.1608 else 2.1609 case $x_includes,$x_libraries in #( 2.1610 - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( 2.1611 - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : 2.1612 + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( 2.1613 + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : 2.1614 $as_echo_n "(cached) " >&6 2.1615 else 2.1616 # One or both of the vars are not set, and there is no cached value. 2.1617 @@ -28832,7 +28830,7 @@ 2.1618 else 2.1619 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 2.1620 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } 2.1621 -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : 2.1622 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : 2.1623 $as_echo_n "(cached) " >&6 2.1624 else 2.1625 ac_check_lib_save_LIBS=$LIBS 2.1626 @@ -28866,14 +28864,14 @@ 2.1627 fi 2.1628 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 2.1629 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } 2.1630 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : 2.1631 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : 2.1632 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 2.1633 fi 2.1634 2.1635 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 2.1636 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 2.1637 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } 2.1638 -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : 2.1639 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : 2.1640 $as_echo_n "(cached) " >&6 2.1641 else 2.1642 ac_check_lib_save_LIBS=$LIBS 2.1643 @@ -28907,7 +28905,7 @@ 2.1644 fi 2.1645 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 2.1646 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } 2.1647 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : 2.1648 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : 2.1649 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 2.1650 fi 2.1651 2.1652 @@ -28926,14 +28924,14 @@ 2.1653 # The functions gethostbyname, getservbyname, and inet_addr are 2.1654 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. 2.1655 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" 2.1656 -if test "x$ac_cv_func_gethostbyname" = xyes; then : 2.1657 +if test "x$ac_cv_func_gethostbyname" = x""yes; then : 2.1658 2.1659 fi 2.1660 2.1661 if test $ac_cv_func_gethostbyname = no; then 2.1662 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 2.1663 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } 2.1664 -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : 2.1665 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : 2.1666 $as_echo_n "(cached) " >&6 2.1667 else 2.1668 ac_check_lib_save_LIBS=$LIBS 2.1669 @@ -28967,14 +28965,14 @@ 2.1670 fi 2.1671 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 2.1672 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } 2.1673 -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : 2.1674 +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : 2.1675 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 2.1676 fi 2.1677 2.1678 if test $ac_cv_lib_nsl_gethostbyname = no; then 2.1679 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 2.1680 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } 2.1681 -if ${ac_cv_lib_bsd_gethostbyname+:} false; then : 2.1682 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : 2.1683 $as_echo_n "(cached) " >&6 2.1684 else 2.1685 ac_check_lib_save_LIBS=$LIBS 2.1686 @@ -29008,7 +29006,7 @@ 2.1687 fi 2.1688 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 2.1689 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } 2.1690 -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : 2.1691 +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : 2.1692 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" 2.1693 fi 2.1694 2.1695 @@ -29023,14 +29021,14 @@ 2.1696 # must be given before -lnsl if both are needed. We assume that 2.1697 # if connect needs -lnsl, so does gethostbyname. 2.1698 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect" 2.1699 -if test "x$ac_cv_func_connect" = xyes; then : 2.1700 +if test "x$ac_cv_func_connect" = x""yes; then : 2.1701 2.1702 fi 2.1703 2.1704 if test $ac_cv_func_connect = no; then 2.1705 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 2.1706 $as_echo_n "checking for connect in -lsocket... " >&6; } 2.1707 -if ${ac_cv_lib_socket_connect+:} false; then : 2.1708 +if test "${ac_cv_lib_socket_connect+set}" = set; then : 2.1709 $as_echo_n "(cached) " >&6 2.1710 else 2.1711 ac_check_lib_save_LIBS=$LIBS 2.1712 @@ -29064,7 +29062,7 @@ 2.1713 fi 2.1714 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 2.1715 $as_echo "$ac_cv_lib_socket_connect" >&6; } 2.1716 -if test "x$ac_cv_lib_socket_connect" = xyes; then : 2.1717 +if test "x$ac_cv_lib_socket_connect" = x""yes; then : 2.1718 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 2.1719 fi 2.1720 2.1721 @@ -29072,14 +29070,14 @@ 2.1722 2.1723 # Guillermo Gomez says -lposix is necessary on A/UX. 2.1724 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove" 2.1725 -if test "x$ac_cv_func_remove" = xyes; then : 2.1726 +if test "x$ac_cv_func_remove" = x""yes; then : 2.1727 2.1728 fi 2.1729 2.1730 if test $ac_cv_func_remove = no; then 2.1731 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 2.1732 $as_echo_n "checking for remove in -lposix... " >&6; } 2.1733 -if ${ac_cv_lib_posix_remove+:} false; then : 2.1734 +if test "${ac_cv_lib_posix_remove+set}" = set; then : 2.1735 $as_echo_n "(cached) " >&6 2.1736 else 2.1737 ac_check_lib_save_LIBS=$LIBS 2.1738 @@ -29113,7 +29111,7 @@ 2.1739 fi 2.1740 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 2.1741 $as_echo "$ac_cv_lib_posix_remove" >&6; } 2.1742 -if test "x$ac_cv_lib_posix_remove" = xyes; then : 2.1743 +if test "x$ac_cv_lib_posix_remove" = x""yes; then : 2.1744 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 2.1745 fi 2.1746 2.1747 @@ -29121,14 +29119,14 @@ 2.1748 2.1749 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 2.1750 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat" 2.1751 -if test "x$ac_cv_func_shmat" = xyes; then : 2.1752 +if test "x$ac_cv_func_shmat" = x""yes; then : 2.1753 2.1754 fi 2.1755 2.1756 if test $ac_cv_func_shmat = no; then 2.1757 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 2.1758 $as_echo_n "checking for shmat in -lipc... " >&6; } 2.1759 -if ${ac_cv_lib_ipc_shmat+:} false; then : 2.1760 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then : 2.1761 $as_echo_n "(cached) " >&6 2.1762 else 2.1763 ac_check_lib_save_LIBS=$LIBS 2.1764 @@ -29162,7 +29160,7 @@ 2.1765 fi 2.1766 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 2.1767 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } 2.1768 -if test "x$ac_cv_lib_ipc_shmat" = xyes; then : 2.1769 +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : 2.1770 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 2.1771 fi 2.1772 2.1773 @@ -29180,7 +29178,7 @@ 2.1774 # John Interrante, Karl Berry 2.1775 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 2.1776 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } 2.1777 -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : 2.1778 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : 2.1779 $as_echo_n "(cached) " >&6 2.1780 else 2.1781 ac_check_lib_save_LIBS=$LIBS 2.1782 @@ -29214,7 +29212,7 @@ 2.1783 fi 2.1784 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 2.1785 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } 2.1786 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : 2.1787 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : 2.1788 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 2.1789 fi 2.1790 2.1791 @@ -30221,7 +30219,7 @@ 2.1792 LDFLAGS="$FREETYPE2_LIBS" 2.1793 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 2.1794 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } 2.1795 -if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then : 2.1796 +if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then : 2.1797 $as_echo_n "(cached) " >&6 2.1798 else 2.1799 ac_check_lib_save_LIBS=$LIBS 2.1800 @@ -30255,7 +30253,7 @@ 2.1801 fi 2.1802 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 2.1803 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } 2.1804 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : 2.1805 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then : 2.1806 FREETYPE2_FOUND=true 2.1807 else 2.1808 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 2.1809 @@ -30543,7 +30541,7 @@ 2.1810 for ac_header in alsa/asoundlib.h 2.1811 do : 2.1812 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" 2.1813 -if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then : 2.1814 +if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then : 2.1815 cat >>confdefs.h <<_ACEOF 2.1816 #define HAVE_ALSA_ASOUNDLIB_H 1 2.1817 _ACEOF 2.1818 @@ -30602,7 +30600,7 @@ 2.1819 USE_EXTERNAL_LIBJPEG=true 2.1820 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5 2.1821 $as_echo_n "checking for main in -ljpeg... " >&6; } 2.1822 -if ${ac_cv_lib_jpeg_main+:} false; then : 2.1823 +if test "${ac_cv_lib_jpeg_main+set}" = set; then : 2.1824 $as_echo_n "(cached) " >&6 2.1825 else 2.1826 ac_check_lib_save_LIBS=$LIBS 2.1827 @@ -30630,7 +30628,7 @@ 2.1828 fi 2.1829 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5 2.1830 $as_echo "$ac_cv_lib_jpeg_main" >&6; } 2.1831 -if test "x$ac_cv_lib_jpeg_main" = xyes; then : 2.1832 +if test "x$ac_cv_lib_jpeg_main" = x""yes; then : 2.1833 cat >>confdefs.h <<_ACEOF 2.1834 #define HAVE_LIBJPEG 1 2.1835 _ACEOF 2.1836 @@ -30654,7 +30652,7 @@ 2.1837 USE_EXTERNAL_LIBJPEG=true 2.1838 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5 2.1839 $as_echo_n "checking for main in -lgif... " >&6; } 2.1840 -if ${ac_cv_lib_gif_main+:} false; then : 2.1841 +if test "${ac_cv_lib_gif_main+set}" = set; then : 2.1842 $as_echo_n "(cached) " >&6 2.1843 else 2.1844 ac_check_lib_save_LIBS=$LIBS 2.1845 @@ -30682,7 +30680,7 @@ 2.1846 fi 2.1847 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5 2.1848 $as_echo "$ac_cv_lib_gif_main" >&6; } 2.1849 -if test "x$ac_cv_lib_gif_main" = xyes; then : 2.1850 +if test "x$ac_cv_lib_gif_main" = x""yes; then : 2.1851 cat >>confdefs.h <<_ACEOF 2.1852 #define HAVE_LIBGIF 1 2.1853 _ACEOF 2.1854 @@ -30712,7 +30710,7 @@ 2.1855 2.1856 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 2.1857 $as_echo_n "checking for compress in -lz... " >&6; } 2.1858 -if ${ac_cv_lib_z_compress+:} false; then : 2.1859 +if test "${ac_cv_lib_z_compress+set}" = set; then : 2.1860 $as_echo_n "(cached) " >&6 2.1861 else 2.1862 ac_check_lib_save_LIBS=$LIBS 2.1863 @@ -30746,7 +30744,7 @@ 2.1864 fi 2.1865 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 2.1866 $as_echo "$ac_cv_lib_z_compress" >&6; } 2.1867 -if test "x$ac_cv_lib_z_compress" = xyes; then : 2.1868 +if test "x$ac_cv_lib_z_compress" = x""yes; then : 2.1869 ZLIB_FOUND=yes 2.1870 else 2.1871 ZLIB_FOUND=no 2.1872 @@ -30839,7 +30837,7 @@ 2.1873 2.1874 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 2.1875 $as_echo_n "checking for cos in -lm... " >&6; } 2.1876 -if ${ac_cv_lib_m_cos+:} false; then : 2.1877 +if test "${ac_cv_lib_m_cos+set}" = set; then : 2.1878 $as_echo_n "(cached) " >&6 2.1879 else 2.1880 ac_check_lib_save_LIBS=$LIBS 2.1881 @@ -30873,7 +30871,7 @@ 2.1882 fi 2.1883 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 2.1884 $as_echo "$ac_cv_lib_m_cos" >&6; } 2.1885 -if test "x$ac_cv_lib_m_cos" = xyes; then : 2.1886 +if test "x$ac_cv_lib_m_cos" = x""yes; then : 2.1887 cat >>confdefs.h <<_ACEOF 2.1888 #define HAVE_LIBM 1 2.1889 _ACEOF 2.1890 @@ -30897,7 +30895,7 @@ 2.1891 LIBS="" 2.1892 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 2.1893 $as_echo_n "checking for dlopen in -ldl... " >&6; } 2.1894 -if ${ac_cv_lib_dl_dlopen+:} false; then : 2.1895 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : 2.1896 $as_echo_n "(cached) " >&6 2.1897 else 2.1898 ac_check_lib_save_LIBS=$LIBS 2.1899 @@ -30931,7 +30929,7 @@ 2.1900 fi 2.1901 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 2.1902 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } 2.1903 -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : 2.1904 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : 2.1905 cat >>confdefs.h <<_ACEOF 2.1906 #define HAVE_LIBDL 1 2.1907 _ACEOF 2.1908 @@ -31575,7 +31573,7 @@ 2.1909 set dummy ccache; ac_word=$2 2.1910 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 2.1911 $as_echo_n "checking for $ac_word... " >&6; } 2.1912 -if ${ac_cv_path_CCACHE+:} false; then : 2.1913 +if test "${ac_cv_path_CCACHE+set}" = set; then : 2.1914 $as_echo_n "(cached) " >&6 2.1915 else 2.1916 case $CCACHE in 2.1917 @@ -31836,21 +31834,10 @@ 2.1918 :end' >>confcache 2.1919 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 2.1920 if test -w "$cache_file"; then 2.1921 - if test "x$cache_file" != "x/dev/null"; then 2.1922 + test "x$cache_file" != "x/dev/null" && 2.1923 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 2.1924 $as_echo "$as_me: updating cache $cache_file" >&6;} 2.1925 - if test ! -f "$cache_file" || test -h "$cache_file"; then 2.1926 - cat confcache >"$cache_file" 2.1927 - else 2.1928 - case $cache_file in #( 2.1929 - */* | ?:*) 2.1930 - mv -f confcache "$cache_file"$$ && 2.1931 - mv -f "$cache_file"$$ "$cache_file" ;; #( 2.1932 - *) 2.1933 - mv -f confcache "$cache_file" ;; 2.1934 - esac 2.1935 - fi 2.1936 - fi 2.1937 + cat confcache >$cache_file 2.1938 else 2.1939 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 2.1940 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 2.1941 @@ -31882,7 +31869,7 @@ 2.1942 2.1943 2.1944 2.1945 -: "${CONFIG_STATUS=./config.status}" 2.1946 +: ${CONFIG_STATUS=./config.status} 2.1947 ac_write_fail=0 2.1948 ac_clean_files_save=$ac_clean_files 2.1949 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 2.1950 @@ -31983,7 +31970,6 @@ 2.1951 IFS=" "" $as_nl" 2.1952 2.1953 # Find who we are. Look in the path if we contain no directory separator. 2.1954 -as_myself= 2.1955 case $0 in #(( 2.1956 *[\\/]* ) as_myself=$0 ;; 2.1957 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 2.1958 @@ -32291,7 +32277,7 @@ 2.1959 # values after options handling. 2.1960 ac_log=" 2.1961 This file was extended by OpenJDK $as_me jdk8, which was 2.1962 -generated by GNU Autoconf 2.68. Invocation command line was 2.1963 +generated by GNU Autoconf 2.67. Invocation command line was 2.1964 2.1965 CONFIG_FILES = $CONFIG_FILES 2.1966 CONFIG_HEADERS = $CONFIG_HEADERS 2.1967 @@ -32354,7 +32340,7 @@ 2.1968 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 2.1969 ac_cs_version="\\ 2.1970 OpenJDK config.status jdk8 2.1971 -configured by $0, generated by GNU Autoconf 2.68, 2.1972 +configured by $0, generated by GNU Autoconf 2.67, 2.1973 with options \\"\$ac_cs_config\\" 2.1974 2.1975 Copyright (C) 2010 Free Software Foundation, Inc. 2.1976 @@ -32483,7 +32469,7 @@ 2.1977 "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;; 2.1978 "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;; 2.1979 2.1980 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 2.1981 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 2.1982 esac 2.1983 done 2.1984 2.1985 @@ -32505,10 +32491,9 @@ 2.1986 # after its creation but before its name has been assigned to `$tmp'. 2.1987 $debug || 2.1988 { 2.1989 - tmp= ac_tmp= 2.1990 + tmp= 2.1991 trap 'exit_status=$? 2.1992 - : "${ac_tmp:=$tmp}" 2.1993 - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 2.1994 + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 2.1995 ' 0 2.1996 trap 'as_fn_exit 1' 1 2 13 15 2.1997 } 2.1998 @@ -32516,13 +32501,12 @@ 2.1999 2.2000 { 2.2001 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 2.2002 - test -d "$tmp" 2.2003 + test -n "$tmp" && test -d "$tmp" 2.2004 } || 2.2005 { 2.2006 tmp=./conf$$-$RANDOM 2.2007 (umask 077 && mkdir "$tmp") 2.2008 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 2.2009 -ac_tmp=$tmp 2.2010 2.2011 # Set up the scripts for CONFIG_FILES section. 2.2012 # No need to generate them if there are no CONFIG_FILES. 2.2013 @@ -32544,7 +32528,7 @@ 2.2014 ac_cs_awk_cr=$ac_cr 2.2015 fi 2.2016 2.2017 -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 2.2018 +echo 'BEGIN {' >"$tmp/subs1.awk" && 2.2019 _ACEOF 2.2020 2.2021 2.2022 @@ -32572,7 +32556,7 @@ 2.2023 rm -f conf$$subs.sh 2.2024 2.2025 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 2.2026 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 2.2027 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 2.2028 _ACEOF 2.2029 sed -n ' 2.2030 h 2.2031 @@ -32620,7 +32604,7 @@ 2.2032 rm -f conf$$subs.awk 2.2033 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 2.2034 _ACAWK 2.2035 -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 2.2036 +cat >>"\$tmp/subs1.awk" <<_ACAWK && 2.2037 for (key in S) S_is_set[key] = 1 2.2038 FS = "" 2.2039 2.2040 @@ -32652,7 +32636,7 @@ 2.2041 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 2.2042 else 2.2043 cat 2.2044 -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 2.2045 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 2.2046 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 2.2047 _ACEOF 2.2048 2.2049 @@ -32686,7 +32670,7 @@ 2.2050 # No need to generate them if there are no CONFIG_HEADERS. 2.2051 # This happens for instance with `./config.status Makefile'. 2.2052 if test -n "$CONFIG_HEADERS"; then 2.2053 -cat >"$ac_tmp/defines.awk" <<\_ACAWK || 2.2054 +cat >"$tmp/defines.awk" <<\_ACAWK || 2.2055 BEGIN { 2.2056 _ACEOF 2.2057 2.2058 @@ -32698,8 +32682,8 @@ 2.2059 # handling of long lines. 2.2060 ac_delim='%!_!# ' 2.2061 for ac_last_try in false false :; do 2.2062 - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 2.2063 - if test -z "$ac_tt"; then 2.2064 + ac_t=`sed -n "/$ac_delim/p" confdefs.h` 2.2065 + if test -z "$ac_t"; then 2.2066 break 2.2067 elif $ac_last_try; then 2.2068 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 2.2069 @@ -32800,7 +32784,7 @@ 2.2070 esac 2.2071 case $ac_mode$ac_tag in 2.2072 :[FHL]*:*);; 2.2073 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 2.2074 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 2.2075 :[FH]-) ac_tag=-:-;; 2.2076 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 2.2077 esac 2.2078 @@ -32819,7 +32803,7 @@ 2.2079 for ac_f 2.2080 do 2.2081 case $ac_f in 2.2082 - -) ac_f="$ac_tmp/stdin";; 2.2083 + -) ac_f="$tmp/stdin";; 2.2084 *) # Look for the file first in the build tree, then in the source tree 2.2085 # (if the path is not absolute). The absolute path cannot be DOS-style, 2.2086 # because $ac_f cannot contain `:'. 2.2087 @@ -32828,7 +32812,7 @@ 2.2088 [\\/$]*) false;; 2.2089 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 2.2090 esac || 2.2091 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 2.2092 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 2.2093 esac 2.2094 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 2.2095 as_fn_append ac_file_inputs " '$ac_f'" 2.2096 @@ -32854,8 +32838,8 @@ 2.2097 esac 2.2098 2.2099 case $ac_tag in 2.2100 - *:-:* | *:-) cat >"$ac_tmp/stdin" \ 2.2101 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 2.2102 + *:-:* | *:-) cat >"$tmp/stdin" \ 2.2103 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 2.2104 esac 2.2105 ;; 2.2106 esac 2.2107 @@ -32980,22 +32964,21 @@ 2.2108 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t 2.2109 $ac_datarootdir_hack 2.2110 " 2.2111 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ 2.2112 - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.2113 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 2.2114 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.2115 2.2116 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 2.2117 - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 2.2118 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 2.2119 - "$ac_tmp/out"`; test -z "$ac_out"; } && 2.2120 + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 2.2121 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 2.2122 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 2.2123 which seems to be undefined. Please make sure it is defined" >&5 2.2124 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 2.2125 which seems to be undefined. Please make sure it is defined" >&2;} 2.2126 2.2127 - rm -f "$ac_tmp/stdin" 2.2128 + rm -f "$tmp/stdin" 2.2129 case $ac_file in 2.2130 - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 2.2131 - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 2.2132 + -) cat "$tmp/out" && rm -f "$tmp/out";; 2.2133 + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 2.2134 esac \ 2.2135 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.2136 ;; 2.2137 @@ -33006,20 +32989,20 @@ 2.2138 if test x"$ac_file" != x-; then 2.2139 { 2.2140 $as_echo "/* $configure_input */" \ 2.2141 - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 2.2142 - } >"$ac_tmp/config.h" \ 2.2143 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 2.2144 + } >"$tmp/config.h" \ 2.2145 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.2146 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 2.2147 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 2.2148 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 2.2149 $as_echo "$as_me: $ac_file is unchanged" >&6;} 2.2150 else 2.2151 rm -f "$ac_file" 2.2152 - mv "$ac_tmp/config.h" "$ac_file" \ 2.2153 + mv "$tmp/config.h" "$ac_file" \ 2.2154 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 2.2155 fi 2.2156 else 2.2157 $as_echo "/* $configure_input */" \ 2.2158 - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 2.2159 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 2.2160 || as_fn_error $? "could not create -" "$LINENO" 5 2.2161 fi 2.2162 ;;
3.1 --- a/common/autoconf/jdk-options.m4 Thu Jan 10 12:20:16 2013 +0100 3.2 +++ b/common/autoconf/jdk-options.m4 Fri Jan 11 10:46:59 2013 +0100 3.3 @@ -247,46 +247,50 @@ 3.4 AC_SUBST(BUILD_VARIANT_RELEASE) 3.5 ]) 3.6 3.7 -AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], 3.8 -[ 3.9 3.10 ############################################################################### 3.11 # 3.12 # Should we build only OpenJDK even if closed sources are present? 3.13 # 3.14 -AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only], 3.15 - [supress building closed source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"]) 3.16 +AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM], 3.17 +[ 3.18 + AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only], 3.19 + [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"]) 3.20 3.21 -AC_MSG_CHECKING([for presence of closed sources]) 3.22 -if test -d "$SRC_ROOT/jdk/src/closed"; then 3.23 + AC_MSG_CHECKING([for presence of closed sources]) 3.24 + if test -d "$SRC_ROOT/jdk/src/closed"; then 3.25 CLOSED_SOURCE_PRESENT=yes 3.26 -else 3.27 + else 3.28 CLOSED_SOURCE_PRESENT=no 3.29 -fi 3.30 -AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT]) 3.31 + fi 3.32 + AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT]) 3.33 3.34 -AC_MSG_CHECKING([if closed source is supressed (openjdk-only)]) 3.35 -SUPRESS_CLOSED_SOURCE="$enable_openjdk_only" 3.36 -AC_MSG_RESULT([$SUPRESS_CLOSED_SOURCE]) 3.37 + AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)]) 3.38 + SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only" 3.39 + AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE]) 3.40 3.41 -if test "x$CLOSED_SOURCE_PRESENT" = xno; then 3.42 - OPENJDK=true 3.43 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then 3.44 - AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense]) 3.45 + if test "x$CLOSED_SOURCE_PRESENT" = xno; then 3.46 + OPENJDK=true 3.47 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then 3.48 + AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense]) 3.49 + fi 3.50 + else 3.51 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then 3.52 + OPENJDK=true 3.53 + else 3.54 + OPENJDK=false 3.55 + fi 3.56 fi 3.57 -else 3.58 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then 3.59 - OPENJDK=true 3.60 - else 3.61 - OPENJDK=false 3.62 + 3.63 + if test "x$OPENJDK" = "xtrue"; then 3.64 + SET_OPENJDK="OPENJDK=true" 3.65 fi 3.66 -fi 3.67 3.68 -if test "x$OPENJDK" = "xtrue"; then 3.69 - SET_OPENJDK="OPENJDK=true" 3.70 -fi 3.71 + AC_SUBST(SET_OPENJDK) 3.72 +]) 3.73 3.74 -AC_SUBST(SET_OPENJDK) 3.75 +AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], 3.76 +[ 3.77 3.78 ############################################################################### 3.79 #
