Mercurial > jdk8-mips64-public / changeset
changeset
8005794: in new infra, how do we change java -version?
Tue, 08 Jan 2013 16:23:45 -0800
- author
- tbell
- date
- Tue, 08 Jan 2013 16:23:45 -0800
- changeset 573
- b284980b7d9a
- parent 572
- 64a9ebad39fe
- child 574
- db3984e4eb97
8005794: in new infra, how do we change java -version?
Summary: Added configure parameter --with-user-release-suffix
Reviewed-by: ohair, tbell
| common/autoconf/generated-configure.sh | file | annotate | diff | comparison | revisions | |
| common/autoconf/jdk-options.m4 | file | annotate | diff | comparison | revisions |
1.1 --- a/common/autoconf/generated-configure.sh Tue Jan 08 13:14:22 2013 -0800 1.2 +++ b/common/autoconf/generated-configure.sh Tue Jan 08 16:23:45 2013 -0800 1.3 @@ -1,6 +1,6 @@ 1.4 #! /bin/sh 1.5 # Guess values for system-dependent variables and create Makefiles. 1.6 -# Generated by GNU Autoconf 2.67 for OpenJDK jdk8. 1.7 +# Generated by GNU Autoconf 2.68 for OpenJDK jdk8. 1.8 # 1.9 # Report bugs to <build-dev@openjdk.java.net>. 1.10 # 1.11 @@ -91,6 +91,7 @@ 1.12 IFS=" "" $as_nl" 1.13 1.14 # Find who we are. Look in the path if we contain no directory separator. 1.15 +as_myself= 1.16 case $0 in #(( 1.17 *[\\/]* ) as_myself=$0 ;; 1.18 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 1.19 @@ -216,11 +217,18 @@ 1.20 # We cannot yet assume a decent shell, so we have to provide a 1.21 # neutralization value for shells without unset; and this also 1.22 # works around shells that cannot unset nonexistent variables. 1.23 + # Preserve -v and -x to the replacement shell. 1.24 BASH_ENV=/dev/null 1.25 ENV=/dev/null 1.26 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 1.27 export CONFIG_SHELL 1.28 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 1.29 + case $- in # (((( 1.30 + *v*x* | *x*v* ) as_opts=-vx ;; 1.31 + *v* ) as_opts=-v ;; 1.32 + *x* ) as_opts=-x ;; 1.33 + * ) as_opts= ;; 1.34 + esac 1.35 + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 1.36 fi 1.37 1.38 if test x$as_have_required = xno; then : 1.39 @@ -752,7 +760,6 @@ 1.40 JAVA_CHECK 1.41 JAVAC_CHECK 1.42 COOKED_BUILD_NUMBER 1.43 -USER_RELEASE_SUFFIX 1.44 JDK_VERSION 1.45 COPYRIGHT_YEAR 1.46 MACOSX_BUNDLE_ID_BASE 1.47 @@ -768,6 +775,7 @@ 1.48 JDK_MICRO_VERSION 1.49 JDK_MINOR_VERSION 1.50 JDK_MAJOR_VERSION 1.51 +USER_RELEASE_SUFFIX 1.52 COMPRESS_JARS 1.53 UNLIMITED_CRYPTO 1.54 CACERTS_FILE 1.55 @@ -970,6 +978,7 @@ 1.56 enable_unlimited_crypto 1.57 with_milestone 1.58 with_build_number 1.59 +with_user_release_suffix 1.60 with_boot_jdk 1.61 with_boot_jdk_jvmargs 1.62 with_add_source_root 1.63 @@ -1432,7 +1441,7 @@ 1.64 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 1.65 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 1.66 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 1.67 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 1.68 + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 1.69 ;; 1.70 1.71 esac 1.72 @@ -1701,6 +1710,9 @@ 1.73 --with-cacerts-file specify alternative cacerts file 1.74 --with-milestone Set milestone value for build [internal] 1.75 --with-build-number Set build number value for build [b00] 1.76 + --with-user-release-suffix 1.77 + Add a custom string to the version string if build 1.78 + number isn't set.[username_builddateb00] 1.79 --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] 1.80 --with-boot-jdk-jvmargs specify JVM arguments to be passed to all 1.81 invocations of the Boot JDK, overriding the default 1.82 @@ -1854,7 +1866,7 @@ 1.83 if $ac_init_version; then 1.84 cat <<\_ACEOF 1.85 OpenJDK configure jdk8 1.86 -generated by GNU Autoconf 2.67 1.87 +generated by GNU Autoconf 2.68 1.88 1.89 Copyright (C) 2010 Free Software Foundation, Inc. 1.90 This configure script is free software; the Free Software Foundation 1.91 @@ -1900,7 +1912,7 @@ 1.92 1.93 ac_retval=1 1.94 fi 1.95 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.96 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.97 as_fn_set_status $ac_retval 1.98 1.99 } # ac_fn_c_try_compile 1.100 @@ -1938,7 +1950,7 @@ 1.101 1.102 ac_retval=1 1.103 fi 1.104 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.105 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.106 as_fn_set_status $ac_retval 1.107 1.108 } # ac_fn_cxx_try_compile 1.109 @@ -1976,7 +1988,7 @@ 1.110 1.111 ac_retval=1 1.112 fi 1.113 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.114 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.115 as_fn_set_status $ac_retval 1.116 1.117 } # ac_fn_objc_try_compile 1.118 @@ -2013,7 +2025,7 @@ 1.119 1.120 ac_retval=1 1.121 fi 1.122 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.123 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.124 as_fn_set_status $ac_retval 1.125 1.126 } # ac_fn_c_try_cpp 1.127 @@ -2050,7 +2062,7 @@ 1.128 1.129 ac_retval=1 1.130 fi 1.131 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.132 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.133 as_fn_set_status $ac_retval 1.134 1.135 } # ac_fn_cxx_try_cpp 1.136 @@ -2063,10 +2075,10 @@ 1.137 ac_fn_cxx_check_header_mongrel () 1.138 { 1.139 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.140 - if eval "test \"\${$3+set}\"" = set; then : 1.141 + if eval \${$3+:} false; then : 1.142 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.143 $as_echo_n "checking for $2... " >&6; } 1.144 -if eval "test \"\${$3+set}\"" = set; then : 1.145 +if eval \${$3+:} false; then : 1.146 $as_echo_n "(cached) " >&6 1.147 fi 1.148 eval ac_res=\$$3 1.149 @@ -2133,7 +2145,7 @@ 1.150 esac 1.151 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.152 $as_echo_n "checking for $2... " >&6; } 1.153 -if eval "test \"\${$3+set}\"" = set; then : 1.154 +if eval \${$3+:} false; then : 1.155 $as_echo_n "(cached) " >&6 1.156 else 1.157 eval "$3=\$ac_header_compiler" 1.158 @@ -2142,7 +2154,7 @@ 1.159 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.160 $as_echo "$ac_res" >&6; } 1.161 fi 1.162 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.163 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.164 1.165 } # ac_fn_cxx_check_header_mongrel 1.166 1.167 @@ -2183,7 +2195,7 @@ 1.168 ac_retval=$ac_status 1.169 fi 1.170 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1.171 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.172 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.173 as_fn_set_status $ac_retval 1.174 1.175 } # ac_fn_cxx_try_run 1.176 @@ -2197,7 +2209,7 @@ 1.177 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.178 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.179 $as_echo_n "checking for $2... " >&6; } 1.180 -if eval "test \"\${$3+set}\"" = set; then : 1.181 +if eval \${$3+:} false; then : 1.182 $as_echo_n "(cached) " >&6 1.183 else 1.184 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.185 @@ -2215,7 +2227,7 @@ 1.186 eval ac_res=\$$3 1.187 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.188 $as_echo "$ac_res" >&6; } 1.189 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.190 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.191 1.192 } # ac_fn_cxx_check_header_compile 1.193 1.194 @@ -2392,7 +2404,7 @@ 1.195 rm -f conftest.val 1.196 1.197 fi 1.198 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.199 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.200 as_fn_set_status $ac_retval 1.201 1.202 } # ac_fn_cxx_compute_int 1.203 @@ -2438,7 +2450,7 @@ 1.204 # interfere with the next link command; also delete a directory that is 1.205 # left behind by Apple's compiler. We do this before executing the actions. 1.206 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 1.207 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.208 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.209 as_fn_set_status $ac_retval 1.210 1.211 } # ac_fn_cxx_try_link 1.212 @@ -2451,7 +2463,7 @@ 1.213 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.214 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.215 $as_echo_n "checking for $2... " >&6; } 1.216 -if eval "test \"\${$3+set}\"" = set; then : 1.217 +if eval \${$3+:} false; then : 1.218 $as_echo_n "(cached) " >&6 1.219 else 1.220 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.221 @@ -2506,7 +2518,7 @@ 1.222 eval ac_res=\$$3 1.223 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.224 $as_echo "$ac_res" >&6; } 1.225 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.226 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.227 1.228 } # ac_fn_cxx_check_func 1.229 1.230 @@ -2519,7 +2531,7 @@ 1.231 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 1.232 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 1.233 $as_echo_n "checking for $2... " >&6; } 1.234 -if eval "test \"\${$3+set}\"" = set; then : 1.235 +if eval \${$3+:} false; then : 1.236 $as_echo_n "(cached) " >&6 1.237 else 1.238 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.239 @@ -2537,7 +2549,7 @@ 1.240 eval ac_res=\$$3 1.241 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 1.242 $as_echo "$ac_res" >&6; } 1.243 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 1.244 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 1.245 1.246 } # ac_fn_c_check_header_compile 1.247 cat >config.log <<_ACEOF 1.248 @@ -2545,7 +2557,7 @@ 1.249 running configure, to aid debugging if configure makes a mistake. 1.250 1.251 It was created by OpenJDK $as_me jdk8, which was 1.252 -generated by GNU Autoconf 2.67. Invocation command line was 1.253 +generated by GNU Autoconf 2.68. Invocation command line was 1.254 1.255 $ $0 $@ 1.256 1.257 @@ -2803,7 +2815,7 @@ 1.258 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.259 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.260 as_fn_error $? "failed to load site script $ac_site_file 1.261 -See \`config.log' for more details" "$LINENO" 5 ; } 1.262 +See \`config.log' for more details" "$LINENO" 5; } 1.263 fi 1.264 done 1.265 1.266 @@ -3686,7 +3698,7 @@ 1.267 #CUSTOM_AUTOCONF_INCLUDE 1.268 1.269 # Do not change or remove the following line, it is needed for consistency checks: 1.270 -DATE_WHEN_GENERATED=1357219413 1.271 +DATE_WHEN_GENERATED=1357690920 1.272 1.273 ############################################################################### 1.274 # 1.275 @@ -3724,7 +3736,7 @@ 1.276 set dummy $ac_prog; ac_word=$2 1.277 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.278 $as_echo_n "checking for $ac_word... " >&6; } 1.279 -if test "${ac_cv_path_BASENAME+set}" = set; then : 1.280 +if ${ac_cv_path_BASENAME+:} false; then : 1.281 $as_echo_n "(cached) " >&6 1.282 else 1.283 case $BASENAME in 1.284 @@ -3783,7 +3795,7 @@ 1.285 set dummy $ac_prog; ac_word=$2 1.286 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.287 $as_echo_n "checking for $ac_word... " >&6; } 1.288 -if test "${ac_cv_path_BASH+set}" = set; then : 1.289 +if ${ac_cv_path_BASH+:} false; then : 1.290 $as_echo_n "(cached) " >&6 1.291 else 1.292 case $BASH in 1.293 @@ -3842,7 +3854,7 @@ 1.294 set dummy $ac_prog; ac_word=$2 1.295 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.296 $as_echo_n "checking for $ac_word... " >&6; } 1.297 -if test "${ac_cv_path_CAT+set}" = set; then : 1.298 +if ${ac_cv_path_CAT+:} false; then : 1.299 $as_echo_n "(cached) " >&6 1.300 else 1.301 case $CAT in 1.302 @@ -3901,7 +3913,7 @@ 1.303 set dummy $ac_prog; ac_word=$2 1.304 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.305 $as_echo_n "checking for $ac_word... " >&6; } 1.306 -if test "${ac_cv_path_CHMOD+set}" = set; then : 1.307 +if ${ac_cv_path_CHMOD+:} false; then : 1.308 $as_echo_n "(cached) " >&6 1.309 else 1.310 case $CHMOD in 1.311 @@ -3960,7 +3972,7 @@ 1.312 set dummy $ac_prog; ac_word=$2 1.313 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.314 $as_echo_n "checking for $ac_word... " >&6; } 1.315 -if test "${ac_cv_path_CMP+set}" = set; then : 1.316 +if ${ac_cv_path_CMP+:} false; then : 1.317 $as_echo_n "(cached) " >&6 1.318 else 1.319 case $CMP in 1.320 @@ -4019,7 +4031,7 @@ 1.321 set dummy $ac_prog; ac_word=$2 1.322 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.323 $as_echo_n "checking for $ac_word... " >&6; } 1.324 -if test "${ac_cv_path_COMM+set}" = set; then : 1.325 +if ${ac_cv_path_COMM+:} false; then : 1.326 $as_echo_n "(cached) " >&6 1.327 else 1.328 case $COMM in 1.329 @@ -4078,7 +4090,7 @@ 1.330 set dummy $ac_prog; ac_word=$2 1.331 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.332 $as_echo_n "checking for $ac_word... " >&6; } 1.333 -if test "${ac_cv_path_CP+set}" = set; then : 1.334 +if ${ac_cv_path_CP+:} false; then : 1.335 $as_echo_n "(cached) " >&6 1.336 else 1.337 case $CP in 1.338 @@ -4137,7 +4149,7 @@ 1.339 set dummy $ac_prog; ac_word=$2 1.340 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.341 $as_echo_n "checking for $ac_word... " >&6; } 1.342 -if test "${ac_cv_path_CPIO+set}" = set; then : 1.343 +if ${ac_cv_path_CPIO+:} false; then : 1.344 $as_echo_n "(cached) " >&6 1.345 else 1.346 case $CPIO in 1.347 @@ -4196,7 +4208,7 @@ 1.348 set dummy $ac_prog; ac_word=$2 1.349 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.350 $as_echo_n "checking for $ac_word... " >&6; } 1.351 -if test "${ac_cv_path_CUT+set}" = set; then : 1.352 +if ${ac_cv_path_CUT+:} false; then : 1.353 $as_echo_n "(cached) " >&6 1.354 else 1.355 case $CUT in 1.356 @@ -4255,7 +4267,7 @@ 1.357 set dummy $ac_prog; ac_word=$2 1.358 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.359 $as_echo_n "checking for $ac_word... " >&6; } 1.360 -if test "${ac_cv_path_DATE+set}" = set; then : 1.361 +if ${ac_cv_path_DATE+:} false; then : 1.362 $as_echo_n "(cached) " >&6 1.363 else 1.364 case $DATE in 1.365 @@ -4314,7 +4326,7 @@ 1.366 set dummy $ac_prog; ac_word=$2 1.367 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.368 $as_echo_n "checking for $ac_word... " >&6; } 1.369 -if test "${ac_cv_path_DIFF+set}" = set; then : 1.370 +if ${ac_cv_path_DIFF+:} false; then : 1.371 $as_echo_n "(cached) " >&6 1.372 else 1.373 case $DIFF in 1.374 @@ -4373,7 +4385,7 @@ 1.375 set dummy $ac_prog; ac_word=$2 1.376 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.377 $as_echo_n "checking for $ac_word... " >&6; } 1.378 -if test "${ac_cv_path_DIRNAME+set}" = set; then : 1.379 +if ${ac_cv_path_DIRNAME+:} false; then : 1.380 $as_echo_n "(cached) " >&6 1.381 else 1.382 case $DIRNAME in 1.383 @@ -4432,7 +4444,7 @@ 1.384 set dummy $ac_prog; ac_word=$2 1.385 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.386 $as_echo_n "checking for $ac_word... " >&6; } 1.387 -if test "${ac_cv_path_ECHO+set}" = set; then : 1.388 +if ${ac_cv_path_ECHO+:} false; then : 1.389 $as_echo_n "(cached) " >&6 1.390 else 1.391 case $ECHO in 1.392 @@ -4491,7 +4503,7 @@ 1.393 set dummy $ac_prog; ac_word=$2 1.394 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.395 $as_echo_n "checking for $ac_word... " >&6; } 1.396 -if test "${ac_cv_path_EXPR+set}" = set; then : 1.397 +if ${ac_cv_path_EXPR+:} false; then : 1.398 $as_echo_n "(cached) " >&6 1.399 else 1.400 case $EXPR in 1.401 @@ -4550,7 +4562,7 @@ 1.402 set dummy $ac_prog; ac_word=$2 1.403 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.404 $as_echo_n "checking for $ac_word... " >&6; } 1.405 -if test "${ac_cv_path_FILE+set}" = set; then : 1.406 +if ${ac_cv_path_FILE+:} false; then : 1.407 $as_echo_n "(cached) " >&6 1.408 else 1.409 case $FILE in 1.410 @@ -4609,7 +4621,7 @@ 1.411 set dummy $ac_prog; ac_word=$2 1.412 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.413 $as_echo_n "checking for $ac_word... " >&6; } 1.414 -if test "${ac_cv_path_FIND+set}" = set; then : 1.415 +if ${ac_cv_path_FIND+:} false; then : 1.416 $as_echo_n "(cached) " >&6 1.417 else 1.418 case $FIND in 1.419 @@ -4668,7 +4680,7 @@ 1.420 set dummy $ac_prog; ac_word=$2 1.421 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.422 $as_echo_n "checking for $ac_word... " >&6; } 1.423 -if test "${ac_cv_path_HEAD+set}" = set; then : 1.424 +if ${ac_cv_path_HEAD+:} false; then : 1.425 $as_echo_n "(cached) " >&6 1.426 else 1.427 case $HEAD in 1.428 @@ -4727,7 +4739,7 @@ 1.429 set dummy $ac_prog; ac_word=$2 1.430 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.431 $as_echo_n "checking for $ac_word... " >&6; } 1.432 -if test "${ac_cv_path_LN+set}" = set; then : 1.433 +if ${ac_cv_path_LN+:} false; then : 1.434 $as_echo_n "(cached) " >&6 1.435 else 1.436 case $LN in 1.437 @@ -4786,7 +4798,7 @@ 1.438 set dummy $ac_prog; ac_word=$2 1.439 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.440 $as_echo_n "checking for $ac_word... " >&6; } 1.441 -if test "${ac_cv_path_LS+set}" = set; then : 1.442 +if ${ac_cv_path_LS+:} false; then : 1.443 $as_echo_n "(cached) " >&6 1.444 else 1.445 case $LS in 1.446 @@ -4845,7 +4857,7 @@ 1.447 set dummy $ac_prog; ac_word=$2 1.448 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.449 $as_echo_n "checking for $ac_word... " >&6; } 1.450 -if test "${ac_cv_path_MKDIR+set}" = set; then : 1.451 +if ${ac_cv_path_MKDIR+:} false; then : 1.452 $as_echo_n "(cached) " >&6 1.453 else 1.454 case $MKDIR in 1.455 @@ -4904,7 +4916,7 @@ 1.456 set dummy $ac_prog; ac_word=$2 1.457 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.458 $as_echo_n "checking for $ac_word... " >&6; } 1.459 -if test "${ac_cv_path_MKTEMP+set}" = set; then : 1.460 +if ${ac_cv_path_MKTEMP+:} false; then : 1.461 $as_echo_n "(cached) " >&6 1.462 else 1.463 case $MKTEMP in 1.464 @@ -4963,7 +4975,7 @@ 1.465 set dummy $ac_prog; ac_word=$2 1.466 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.467 $as_echo_n "checking for $ac_word... " >&6; } 1.468 -if test "${ac_cv_path_MV+set}" = set; then : 1.469 +if ${ac_cv_path_MV+:} false; then : 1.470 $as_echo_n "(cached) " >&6 1.471 else 1.472 case $MV in 1.473 @@ -5022,7 +5034,7 @@ 1.474 set dummy $ac_prog; ac_word=$2 1.475 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.476 $as_echo_n "checking for $ac_word... " >&6; } 1.477 -if test "${ac_cv_path_PRINTF+set}" = set; then : 1.478 +if ${ac_cv_path_PRINTF+:} false; then : 1.479 $as_echo_n "(cached) " >&6 1.480 else 1.481 case $PRINTF in 1.482 @@ -5081,7 +5093,7 @@ 1.483 set dummy $ac_prog; ac_word=$2 1.484 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.485 $as_echo_n "checking for $ac_word... " >&6; } 1.486 -if test "${ac_cv_path_THEPWDCMD+set}" = set; then : 1.487 +if ${ac_cv_path_THEPWDCMD+:} false; then : 1.488 $as_echo_n "(cached) " >&6 1.489 else 1.490 case $THEPWDCMD in 1.491 @@ -5140,7 +5152,7 @@ 1.492 set dummy $ac_prog; ac_word=$2 1.493 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.494 $as_echo_n "checking for $ac_word... " >&6; } 1.495 -if test "${ac_cv_path_RM+set}" = set; then : 1.496 +if ${ac_cv_path_RM+:} false; then : 1.497 $as_echo_n "(cached) " >&6 1.498 else 1.499 case $RM in 1.500 @@ -5199,7 +5211,7 @@ 1.501 set dummy $ac_prog; ac_word=$2 1.502 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.503 $as_echo_n "checking for $ac_word... " >&6; } 1.504 -if test "${ac_cv_path_SH+set}" = set; then : 1.505 +if ${ac_cv_path_SH+:} false; then : 1.506 $as_echo_n "(cached) " >&6 1.507 else 1.508 case $SH in 1.509 @@ -5258,7 +5270,7 @@ 1.510 set dummy $ac_prog; ac_word=$2 1.511 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.512 $as_echo_n "checking for $ac_word... " >&6; } 1.513 -if test "${ac_cv_path_SORT+set}" = set; then : 1.514 +if ${ac_cv_path_SORT+:} false; then : 1.515 $as_echo_n "(cached) " >&6 1.516 else 1.517 case $SORT in 1.518 @@ -5317,7 +5329,7 @@ 1.519 set dummy $ac_prog; ac_word=$2 1.520 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.521 $as_echo_n "checking for $ac_word... " >&6; } 1.522 -if test "${ac_cv_path_TAIL+set}" = set; then : 1.523 +if ${ac_cv_path_TAIL+:} false; then : 1.524 $as_echo_n "(cached) " >&6 1.525 else 1.526 case $TAIL in 1.527 @@ -5376,7 +5388,7 @@ 1.528 set dummy $ac_prog; ac_word=$2 1.529 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.530 $as_echo_n "checking for $ac_word... " >&6; } 1.531 -if test "${ac_cv_path_TAR+set}" = set; then : 1.532 +if ${ac_cv_path_TAR+:} false; then : 1.533 $as_echo_n "(cached) " >&6 1.534 else 1.535 case $TAR in 1.536 @@ -5435,7 +5447,7 @@ 1.537 set dummy $ac_prog; ac_word=$2 1.538 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.539 $as_echo_n "checking for $ac_word... " >&6; } 1.540 -if test "${ac_cv_path_TEE+set}" = set; then : 1.541 +if ${ac_cv_path_TEE+:} false; then : 1.542 $as_echo_n "(cached) " >&6 1.543 else 1.544 case $TEE in 1.545 @@ -5494,7 +5506,7 @@ 1.546 set dummy $ac_prog; ac_word=$2 1.547 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.548 $as_echo_n "checking for $ac_word... " >&6; } 1.549 -if test "${ac_cv_path_TOUCH+set}" = set; then : 1.550 +if ${ac_cv_path_TOUCH+:} false; then : 1.551 $as_echo_n "(cached) " >&6 1.552 else 1.553 case $TOUCH in 1.554 @@ -5553,7 +5565,7 @@ 1.555 set dummy $ac_prog; ac_word=$2 1.556 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.557 $as_echo_n "checking for $ac_word... " >&6; } 1.558 -if test "${ac_cv_path_TR+set}" = set; then : 1.559 +if ${ac_cv_path_TR+:} false; then : 1.560 $as_echo_n "(cached) " >&6 1.561 else 1.562 case $TR in 1.563 @@ -5612,7 +5624,7 @@ 1.564 set dummy $ac_prog; ac_word=$2 1.565 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.566 $as_echo_n "checking for $ac_word... " >&6; } 1.567 -if test "${ac_cv_path_UNAME+set}" = set; then : 1.568 +if ${ac_cv_path_UNAME+:} false; then : 1.569 $as_echo_n "(cached) " >&6 1.570 else 1.571 case $UNAME in 1.572 @@ -5671,7 +5683,7 @@ 1.573 set dummy $ac_prog; ac_word=$2 1.574 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.575 $as_echo_n "checking for $ac_word... " >&6; } 1.576 -if test "${ac_cv_path_UNIQ+set}" = set; then : 1.577 +if ${ac_cv_path_UNIQ+:} false; then : 1.578 $as_echo_n "(cached) " >&6 1.579 else 1.580 case $UNIQ in 1.581 @@ -5730,7 +5742,7 @@ 1.582 set dummy $ac_prog; ac_word=$2 1.583 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.584 $as_echo_n "checking for $ac_word... " >&6; } 1.585 -if test "${ac_cv_path_WC+set}" = set; then : 1.586 +if ${ac_cv_path_WC+:} false; then : 1.587 $as_echo_n "(cached) " >&6 1.588 else 1.589 case $WC in 1.590 @@ -5789,7 +5801,7 @@ 1.591 set dummy $ac_prog; ac_word=$2 1.592 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.593 $as_echo_n "checking for $ac_word... " >&6; } 1.594 -if test "${ac_cv_path_WHICH+set}" = set; then : 1.595 +if ${ac_cv_path_WHICH+:} false; then : 1.596 $as_echo_n "(cached) " >&6 1.597 else 1.598 case $WHICH in 1.599 @@ -5848,7 +5860,7 @@ 1.600 set dummy $ac_prog; ac_word=$2 1.601 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.602 $as_echo_n "checking for $ac_word... " >&6; } 1.603 -if test "${ac_cv_path_XARGS+set}" = set; then : 1.604 +if ${ac_cv_path_XARGS+:} false; then : 1.605 $as_echo_n "(cached) " >&6 1.606 else 1.607 case $XARGS in 1.608 @@ -5908,7 +5920,7 @@ 1.609 set dummy $ac_prog; ac_word=$2 1.610 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.611 $as_echo_n "checking for $ac_word... " >&6; } 1.612 -if test "${ac_cv_prog_AWK+set}" = set; then : 1.613 +if ${ac_cv_prog_AWK+:} false; then : 1.614 $as_echo_n "(cached) " >&6 1.615 else 1.616 if test -n "$AWK"; then 1.617 @@ -5958,7 +5970,7 @@ 1.618 1.619 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 1.620 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 1.621 -if test "${ac_cv_path_GREP+set}" = set; then : 1.622 +if ${ac_cv_path_GREP+:} false; then : 1.623 $as_echo_n "(cached) " >&6 1.624 else 1.625 if test -z "$GREP"; then 1.626 @@ -6033,7 +6045,7 @@ 1.627 1.628 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 1.629 $as_echo_n "checking for egrep... " >&6; } 1.630 -if test "${ac_cv_path_EGREP+set}" = set; then : 1.631 +if ${ac_cv_path_EGREP+:} false; then : 1.632 $as_echo_n "(cached) " >&6 1.633 else 1.634 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 1.635 @@ -6112,7 +6124,7 @@ 1.636 1.637 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 1.638 $as_echo_n "checking for fgrep... " >&6; } 1.639 -if test "${ac_cv_path_FGREP+set}" = set; then : 1.640 +if ${ac_cv_path_FGREP+:} false; then : 1.641 $as_echo_n "(cached) " >&6 1.642 else 1.643 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 1.644 @@ -6191,7 +6203,7 @@ 1.645 1.646 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 1.647 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 1.648 -if test "${ac_cv_path_SED+set}" = set; then : 1.649 +if ${ac_cv_path_SED+:} false; then : 1.650 $as_echo_n "(cached) " >&6 1.651 else 1.652 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ 1.653 @@ -6277,7 +6289,7 @@ 1.654 set dummy $ac_prog; ac_word=$2 1.655 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.656 $as_echo_n "checking for $ac_word... " >&6; } 1.657 -if test "${ac_cv_path_NAWK+set}" = set; then : 1.658 +if ${ac_cv_path_NAWK+:} false; then : 1.659 $as_echo_n "(cached) " >&6 1.660 else 1.661 case $NAWK in 1.662 @@ -6337,7 +6349,7 @@ 1.663 set dummy cygpath; ac_word=$2 1.664 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.665 $as_echo_n "checking for $ac_word... " >&6; } 1.666 -if test "${ac_cv_path_CYGPATH+set}" = set; then : 1.667 +if ${ac_cv_path_CYGPATH+:} false; then : 1.668 $as_echo_n "(cached) " >&6 1.669 else 1.670 case $CYGPATH in 1.671 @@ -6377,7 +6389,7 @@ 1.672 set dummy readlink; ac_word=$2 1.673 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.674 $as_echo_n "checking for $ac_word... " >&6; } 1.675 -if test "${ac_cv_path_READLINK+set}" = set; then : 1.676 +if ${ac_cv_path_READLINK+:} false; then : 1.677 $as_echo_n "(cached) " >&6 1.678 else 1.679 case $READLINK in 1.680 @@ -6417,7 +6429,7 @@ 1.681 set dummy df; ac_word=$2 1.682 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.683 $as_echo_n "checking for $ac_word... " >&6; } 1.684 -if test "${ac_cv_path_DF+set}" = set; then : 1.685 +if ${ac_cv_path_DF+:} false; then : 1.686 $as_echo_n "(cached) " >&6 1.687 else 1.688 case $DF in 1.689 @@ -6457,7 +6469,7 @@ 1.690 set dummy SetFile; ac_word=$2 1.691 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.692 $as_echo_n "checking for $ac_word... " >&6; } 1.693 -if test "${ac_cv_path_SETFILE+set}" = set; then : 1.694 +if ${ac_cv_path_SETFILE+:} false; then : 1.695 $as_echo_n "(cached) " >&6 1.696 else 1.697 case $SETFILE in 1.698 @@ -6503,7 +6515,7 @@ 1.699 1.700 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 1.701 $as_echo_n "checking build system type... " >&6; } 1.702 -if test "${ac_cv_build+set}" = set; then : 1.703 +if ${ac_cv_build+:} false; then : 1.704 $as_echo_n "(cached) " >&6 1.705 else 1.706 ac_build_alias=$build_alias 1.707 @@ -6519,7 +6531,7 @@ 1.708 $as_echo "$ac_cv_build" >&6; } 1.709 case $ac_cv_build in 1.710 *-*-*) ;; 1.711 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 1.712 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 1.713 esac 1.714 build=$ac_cv_build 1.715 ac_save_IFS=$IFS; IFS='-' 1.716 @@ -6537,7 +6549,7 @@ 1.717 1.718 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 1.719 $as_echo_n "checking host system type... " >&6; } 1.720 -if test "${ac_cv_host+set}" = set; then : 1.721 +if ${ac_cv_host+:} false; then : 1.722 $as_echo_n "(cached) " >&6 1.723 else 1.724 if test "x$host_alias" = x; then 1.725 @@ -6552,7 +6564,7 @@ 1.726 $as_echo "$ac_cv_host" >&6; } 1.727 case $ac_cv_host in 1.728 *-*-*) ;; 1.729 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 1.730 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 1.731 esac 1.732 host=$ac_cv_host 1.733 ac_save_IFS=$IFS; IFS='-' 1.734 @@ -6570,7 +6582,7 @@ 1.735 1.736 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 1.737 $as_echo_n "checking target system type... " >&6; } 1.738 -if test "${ac_cv_target+set}" = set; then : 1.739 +if ${ac_cv_target+:} false; then : 1.740 $as_echo_n "(cached) " >&6 1.741 else 1.742 if test "x$target_alias" = x; then 1.743 @@ -6585,7 +6597,7 @@ 1.744 $as_echo "$ac_cv_target" >&6; } 1.745 case $ac_cv_target in 1.746 *-*-*) ;; 1.747 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 1.748 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 1.749 esac 1.750 target=$ac_cv_target 1.751 ac_save_IFS=$IFS; IFS='-' 1.752 @@ -8004,7 +8016,7 @@ 1.753 set dummy $ac_prog; ac_word=$2 1.754 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.755 $as_echo_n "checking for $ac_word... " >&6; } 1.756 -if test "${ac_cv_prog_PKGHANDLER+set}" = set; then : 1.757 +if ${ac_cv_prog_PKGHANDLER+:} false; then : 1.758 $as_echo_n "(cached) " >&6 1.759 else 1.760 if test -n "$PKGHANDLER"; then 1.761 @@ -8369,7 +8381,7 @@ 1.762 set dummy $ac_prog; ac_word=$2 1.763 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.764 $as_echo_n "checking for $ac_word... " >&6; } 1.765 -if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then : 1.766 +if ${ac_cv_path_CHECK_GMAKE+:} false; then : 1.767 $as_echo_n "(cached) " >&6 1.768 else 1.769 case $CHECK_GMAKE in 1.770 @@ -8723,7 +8735,7 @@ 1.771 set dummy $ac_prog; ac_word=$2 1.772 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.773 $as_echo_n "checking for $ac_word... " >&6; } 1.774 -if test "${ac_cv_path_CHECK_MAKE+set}" = set; then : 1.775 +if ${ac_cv_path_CHECK_MAKE+:} false; then : 1.776 $as_echo_n "(cached) " >&6 1.777 else 1.778 case $CHECK_MAKE in 1.779 @@ -9082,7 +9094,7 @@ 1.780 set dummy $ac_prog; ac_word=$2 1.781 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.782 $as_echo_n "checking for $ac_word... " >&6; } 1.783 -if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then : 1.784 +if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then : 1.785 $as_echo_n "(cached) " >&6 1.786 else 1.787 case $CHECK_TOOLSDIR_GMAKE in 1.788 @@ -9435,7 +9447,7 @@ 1.789 set dummy $ac_prog; ac_word=$2 1.790 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.791 $as_echo_n "checking for $ac_word... " >&6; } 1.792 -if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then : 1.793 +if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then : 1.794 $as_echo_n "(cached) " >&6 1.795 else 1.796 case $CHECK_TOOLSDIR_MAKE in 1.797 @@ -9831,7 +9843,7 @@ 1.798 set dummy $ac_prog; ac_word=$2 1.799 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.800 $as_echo_n "checking for $ac_word... " >&6; } 1.801 -if test "${ac_cv_path_UNZIP+set}" = set; then : 1.802 +if ${ac_cv_path_UNZIP+:} false; then : 1.803 $as_echo_n "(cached) " >&6 1.804 else 1.805 case $UNZIP in 1.806 @@ -9890,7 +9902,7 @@ 1.807 set dummy $ac_prog; ac_word=$2 1.808 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.809 $as_echo_n "checking for $ac_word... " >&6; } 1.810 -if test "${ac_cv_path_ZIP+set}" = set; then : 1.811 +if ${ac_cv_path_ZIP+:} false; then : 1.812 $as_echo_n "(cached) " >&6 1.813 else 1.814 case $ZIP in 1.815 @@ -9949,7 +9961,7 @@ 1.816 set dummy ldd; ac_word=$2 1.817 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.818 $as_echo_n "checking for $ac_word... " >&6; } 1.819 -if test "${ac_cv_path_LDD+set}" = set; then : 1.820 +if ${ac_cv_path_LDD+:} false; then : 1.821 $as_echo_n "(cached) " >&6 1.822 else 1.823 case $LDD in 1.824 @@ -9995,7 +10007,7 @@ 1.825 set dummy otool; ac_word=$2 1.826 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.827 $as_echo_n "checking for $ac_word... " >&6; } 1.828 -if test "${ac_cv_path_OTOOL+set}" = set; then : 1.829 +if ${ac_cv_path_OTOOL+:} false; then : 1.830 $as_echo_n "(cached) " >&6 1.831 else 1.832 case $OTOOL in 1.833 @@ -10040,7 +10052,7 @@ 1.834 set dummy $ac_prog; ac_word=$2 1.835 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.836 $as_echo_n "checking for $ac_word... " >&6; } 1.837 -if test "${ac_cv_path_READELF+set}" = set; then : 1.838 +if ${ac_cv_path_READELF+:} false; then : 1.839 $as_echo_n "(cached) " >&6 1.840 else 1.841 case $READELF in 1.842 @@ -10083,7 +10095,7 @@ 1.843 set dummy hg; ac_word=$2 1.844 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.845 $as_echo_n "checking for $ac_word... " >&6; } 1.846 -if test "${ac_cv_path_HG+set}" = set; then : 1.847 +if ${ac_cv_path_HG+:} false; then : 1.848 $as_echo_n "(cached) " >&6 1.849 else 1.850 case $HG in 1.851 @@ -10123,7 +10135,7 @@ 1.852 set dummy stat; ac_word=$2 1.853 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.854 $as_echo_n "checking for $ac_word... " >&6; } 1.855 -if test "${ac_cv_path_STAT+set}" = set; then : 1.856 +if ${ac_cv_path_STAT+:} false; then : 1.857 $as_echo_n "(cached) " >&6 1.858 else 1.859 case $STAT in 1.860 @@ -10163,7 +10175,7 @@ 1.861 set dummy time; ac_word=$2 1.862 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.863 $as_echo_n "checking for $ac_word... " >&6; } 1.864 -if test "${ac_cv_path_TIME+set}" = set; then : 1.865 +if ${ac_cv_path_TIME+:} false; then : 1.866 $as_echo_n "(cached) " >&6 1.867 else 1.868 case $TIME in 1.869 @@ -10208,7 +10220,7 @@ 1.870 set dummy $ac_prog; ac_word=$2 1.871 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.872 $as_echo_n "checking for $ac_word... " >&6; } 1.873 -if test "${ac_cv_path_COMM+set}" = set; then : 1.874 +if ${ac_cv_path_COMM+:} false; then : 1.875 $as_echo_n "(cached) " >&6 1.876 else 1.877 case $COMM in 1.878 @@ -10272,7 +10284,7 @@ 1.879 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 1.880 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.881 $as_echo_n "checking for $ac_word... " >&6; } 1.882 -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 1.883 +if ${ac_cv_path_PKG_CONFIG+:} false; then : 1.884 $as_echo_n "(cached) " >&6 1.885 else 1.886 case $PKG_CONFIG in 1.887 @@ -10315,7 +10327,7 @@ 1.888 set dummy pkg-config; ac_word=$2 1.889 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.890 $as_echo_n "checking for $ac_word... " >&6; } 1.891 -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : 1.892 +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : 1.893 $as_echo_n "(cached) " >&6 1.894 else 1.895 case $ac_pt_PKG_CONFIG in 1.896 @@ -10488,7 +10500,7 @@ 1.897 set dummy $ac_prog; ac_word=$2 1.898 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.899 $as_echo_n "checking for $ac_word... " >&6; } 1.900 -if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then : 1.901 +if ${ac_cv_prog_BDEPS_UNZIP+:} false; then : 1.902 $as_echo_n "(cached) " >&6 1.903 else 1.904 if test -n "$BDEPS_UNZIP"; then 1.905 @@ -10534,7 +10546,7 @@ 1.906 set dummy $ac_prog; ac_word=$2 1.907 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.908 $as_echo_n "checking for $ac_word... " >&6; } 1.909 -if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then : 1.910 +if ${ac_cv_prog_BDEPS_FTP+:} false; then : 1.911 $as_echo_n "(cached) " >&6 1.912 else 1.913 if test -n "$BDEPS_FTP"; then 1.914 @@ -10739,11 +10751,11 @@ 1.915 fi 1.916 1.917 if test "x$with_milestone" = xyes; then 1.918 - as_fn_error $? "Milestone must have a value" "$LINENO" 5 1.919 + as_fn_error $? "Milestone must have a value" "$LINENO" 5 1.920 elif test "x$with_milestone" != x; then 1.921 MILESTONE="$with_milestone" 1.922 else 1.923 - MILESTONE=internal 1.924 + MILESTONE=internal 1.925 fi 1.926 1.927 1.928 @@ -10753,13 +10765,31 @@ 1.929 fi 1.930 1.931 if test "x$with_build_number" = xyes; then 1.932 - as_fn_error $? "Build number must have a value" "$LINENO" 5 1.933 + as_fn_error $? "Build number must have a value" "$LINENO" 5 1.934 elif test "x$with_build_number" != x; then 1.935 - JDK_BUILD_NUMBER="$with_build_number" 1.936 + JDK_BUILD_NUMBER="$with_build_number" 1.937 fi 1.938 if test "x$JDK_BUILD_NUMBER" = x; then 1.939 - JDK_BUILD_NUMBER=b00 1.940 -fi 1.941 + JDK_BUILD_NUMBER=b00 1.942 +fi 1.943 + 1.944 + 1.945 +# Check whether --with-user-release-suffix was given. 1.946 +if test "${with_user_release_suffix+set}" = set; then : 1.947 + withval=$with_user_release_suffix; 1.948 +fi 1.949 + 1.950 +if test "x$with_user_release_suffix" = xyes; then 1.951 + as_fn_error $? "Release suffix must have a value" "$LINENO" 5 1.952 +elif test "x$with_user_release_suffix" != x; then 1.953 + USER_RELEASE_SUFFIX="$with_user_release_suffix" 1.954 +else 1.955 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 1.956 + # Avoid [:alnum:] since it depends on the locale. 1.957 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 1.958 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 1.959 +fi 1.960 + 1.961 1.962 # Now set the JDK version, milestone, build number etc. 1.963 1.964 @@ -10780,16 +10810,10 @@ 1.965 1.966 1.967 if test "x$JDK_UPDATE_VERSION" != x; then 1.968 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 1.969 -else 1.970 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 1.971 -fi 1.972 - 1.973 - 1.974 -BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 1.975 -# Avoid [:alnum:] since it depends on the locale. 1.976 -CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 1.977 -USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 1.978 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 1.979 +else 1.980 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 1.981 +fi 1.982 1.983 1.984 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` 1.985 @@ -11836,7 +11860,7 @@ 1.986 set dummy javac; ac_word=$2 1.987 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.988 $as_echo_n "checking for $ac_word... " >&6; } 1.989 -if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then : 1.990 +if ${ac_cv_path_JAVAC_CHECK+:} false; then : 1.991 $as_echo_n "(cached) " >&6 1.992 else 1.993 case $JAVAC_CHECK in 1.994 @@ -11876,7 +11900,7 @@ 1.995 set dummy java; ac_word=$2 1.996 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.997 $as_echo_n "checking for $ac_word... " >&6; } 1.998 -if test "${ac_cv_path_JAVA_CHECK+set}" = set; then : 1.999 +if ${ac_cv_path_JAVA_CHECK+:} false; then : 1.1000 $as_echo_n "(cached) " >&6 1.1001 else 1.1002 case $JAVA_CHECK in 1.1003 @@ -15935,7 +15959,7 @@ 1.1004 set dummy link; ac_word=$2 1.1005 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1006 $as_echo_n "checking for $ac_word... " >&6; } 1.1007 -if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then : 1.1008 +if ${ac_cv_path_CYGWIN_LINK+:} false; then : 1.1009 $as_echo_n "(cached) " >&6 1.1010 else 1.1011 case $CYGWIN_LINK in 1.1012 @@ -16924,7 +16948,7 @@ 1.1013 set dummy $ac_prog; ac_word=$2 1.1014 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1015 $as_echo_n "checking for $ac_word... " >&6; } 1.1016 -if test "${ac_cv_path_BUILD_CC+set}" = set; then : 1.1017 +if ${ac_cv_path_BUILD_CC+:} false; then : 1.1018 $as_echo_n "(cached) " >&6 1.1019 else 1.1020 case $BUILD_CC in 1.1021 @@ -17235,7 +17259,7 @@ 1.1022 set dummy $ac_prog; ac_word=$2 1.1023 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1024 $as_echo_n "checking for $ac_word... " >&6; } 1.1025 -if test "${ac_cv_path_BUILD_CXX+set}" = set; then : 1.1026 +if ${ac_cv_path_BUILD_CXX+:} false; then : 1.1027 $as_echo_n "(cached) " >&6 1.1028 else 1.1029 case $BUILD_CXX in 1.1030 @@ -17544,7 +17568,7 @@ 1.1031 set dummy ld; ac_word=$2 1.1032 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1033 $as_echo_n "checking for $ac_word... " >&6; } 1.1034 -if test "${ac_cv_path_BUILD_LD+set}" = set; then : 1.1035 +if ${ac_cv_path_BUILD_LD+:} false; then : 1.1036 $as_echo_n "(cached) " >&6 1.1037 else 1.1038 case $BUILD_LD in 1.1039 @@ -18056,7 +18080,7 @@ 1.1040 set dummy $ac_prog; ac_word=$2 1.1041 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1042 $as_echo_n "checking for $ac_word... " >&6; } 1.1043 -if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then : 1.1044 +if ${ac_cv_path_TOOLS_DIR_CC+:} false; then : 1.1045 $as_echo_n "(cached) " >&6 1.1046 else 1.1047 case $TOOLS_DIR_CC in 1.1048 @@ -18108,7 +18132,7 @@ 1.1049 set dummy $ac_prog; ac_word=$2 1.1050 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1051 $as_echo_n "checking for $ac_word... " >&6; } 1.1052 -if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then : 1.1053 +if ${ac_cv_path_POTENTIAL_CC+:} false; then : 1.1054 $as_echo_n "(cached) " >&6 1.1055 else 1.1056 case $POTENTIAL_CC in 1.1057 @@ -18521,7 +18545,7 @@ 1.1058 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1059 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1060 $as_echo_n "checking for $ac_word... " >&6; } 1.1061 -if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then : 1.1062 +if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then : 1.1063 $as_echo_n "(cached) " >&6 1.1064 else 1.1065 if test -n "$PROPER_COMPILER_CC"; then 1.1066 @@ -18565,7 +18589,7 @@ 1.1067 set dummy $ac_prog; ac_word=$2 1.1068 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1069 $as_echo_n "checking for $ac_word... " >&6; } 1.1070 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then : 1.1071 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then : 1.1072 $as_echo_n "(cached) " >&6 1.1073 else 1.1074 if test -n "$ac_ct_PROPER_COMPILER_CC"; then 1.1075 @@ -19015,7 +19039,7 @@ 1.1076 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1077 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1078 $as_echo_n "checking for $ac_word... " >&6; } 1.1079 -if test "${ac_cv_prog_CC+set}" = set; then : 1.1080 +if ${ac_cv_prog_CC+:} false; then : 1.1081 $as_echo_n "(cached) " >&6 1.1082 else 1.1083 if test -n "$CC"; then 1.1084 @@ -19059,7 +19083,7 @@ 1.1085 set dummy $ac_prog; ac_word=$2 1.1086 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1087 $as_echo_n "checking for $ac_word... " >&6; } 1.1088 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 1.1089 +if ${ac_cv_prog_ac_ct_CC+:} false; then : 1.1090 $as_echo_n "(cached) " >&6 1.1091 else 1.1092 if test -n "$ac_ct_CC"; then 1.1093 @@ -19112,7 +19136,7 @@ 1.1094 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1095 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1096 as_fn_error $? "no acceptable C compiler found in \$PATH 1.1097 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1098 +See \`config.log' for more details" "$LINENO" 5; } 1.1099 1.1100 # Provide some information about the compiler. 1.1101 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 1.1102 @@ -19227,7 +19251,7 @@ 1.1103 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1104 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1105 as_fn_error 77 "C compiler cannot create executables 1.1106 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1107 +See \`config.log' for more details" "$LINENO" 5; } 1.1108 else 1.1109 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 1.1110 $as_echo "yes" >&6; } 1.1111 @@ -19270,7 +19294,7 @@ 1.1112 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1113 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1114 as_fn_error $? "cannot compute suffix of executables: cannot compile and link 1.1115 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1116 +See \`config.log' for more details" "$LINENO" 5; } 1.1117 fi 1.1118 rm -f conftest conftest$ac_cv_exeext 1.1119 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 1.1120 @@ -19329,7 +19353,7 @@ 1.1121 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1122 as_fn_error $? "cannot run C compiled programs. 1.1123 If you meant to cross compile, use \`--host'. 1.1124 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1125 +See \`config.log' for more details" "$LINENO" 5; } 1.1126 fi 1.1127 fi 1.1128 fi 1.1129 @@ -19340,7 +19364,7 @@ 1.1130 ac_clean_files=$ac_clean_files_save 1.1131 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 1.1132 $as_echo_n "checking for suffix of object files... " >&6; } 1.1133 -if test "${ac_cv_objext+set}" = set; then : 1.1134 +if ${ac_cv_objext+:} false; then : 1.1135 $as_echo_n "(cached) " >&6 1.1136 else 1.1137 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1138 @@ -19381,7 +19405,7 @@ 1.1139 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1140 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1141 as_fn_error $? "cannot compute suffix of object files: cannot compile 1.1142 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1143 +See \`config.log' for more details" "$LINENO" 5; } 1.1144 fi 1.1145 rm -f conftest.$ac_cv_objext conftest.$ac_ext 1.1146 fi 1.1147 @@ -19391,7 +19415,7 @@ 1.1148 ac_objext=$OBJEXT 1.1149 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 1.1150 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 1.1151 -if test "${ac_cv_c_compiler_gnu+set}" = set; then : 1.1152 +if ${ac_cv_c_compiler_gnu+:} false; then : 1.1153 $as_echo_n "(cached) " >&6 1.1154 else 1.1155 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1156 @@ -19428,7 +19452,7 @@ 1.1157 ac_save_CFLAGS=$CFLAGS 1.1158 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 1.1159 $as_echo_n "checking whether $CC accepts -g... " >&6; } 1.1160 -if test "${ac_cv_prog_cc_g+set}" = set; then : 1.1161 +if ${ac_cv_prog_cc_g+:} false; then : 1.1162 $as_echo_n "(cached) " >&6 1.1163 else 1.1164 ac_save_c_werror_flag=$ac_c_werror_flag 1.1165 @@ -19506,7 +19530,7 @@ 1.1166 fi 1.1167 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 1.1168 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 1.1169 -if test "${ac_cv_prog_cc_c89+set}" = set; then : 1.1170 +if ${ac_cv_prog_cc_c89+:} false; then : 1.1171 $as_echo_n "(cached) " >&6 1.1172 else 1.1173 ac_cv_prog_cc_c89=no 1.1174 @@ -19625,7 +19649,7 @@ 1.1175 set dummy $ac_prog; ac_word=$2 1.1176 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1177 $as_echo_n "checking for $ac_word... " >&6; } 1.1178 -if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then : 1.1179 +if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then : 1.1180 $as_echo_n "(cached) " >&6 1.1181 else 1.1182 case $TOOLS_DIR_CXX in 1.1183 @@ -19677,7 +19701,7 @@ 1.1184 set dummy $ac_prog; ac_word=$2 1.1185 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1186 $as_echo_n "checking for $ac_word... " >&6; } 1.1187 -if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then : 1.1188 +if ${ac_cv_path_POTENTIAL_CXX+:} false; then : 1.1189 $as_echo_n "(cached) " >&6 1.1190 else 1.1191 case $POTENTIAL_CXX in 1.1192 @@ -20090,7 +20114,7 @@ 1.1193 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1195 $as_echo_n "checking for $ac_word... " >&6; } 1.1196 -if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then : 1.1197 +if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then : 1.1198 $as_echo_n "(cached) " >&6 1.1199 else 1.1200 if test -n "$PROPER_COMPILER_CXX"; then 1.1201 @@ -20134,7 +20158,7 @@ 1.1202 set dummy $ac_prog; ac_word=$2 1.1203 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1204 $as_echo_n "checking for $ac_word... " >&6; } 1.1205 -if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then : 1.1206 +if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then : 1.1207 $as_echo_n "(cached) " >&6 1.1208 else 1.1209 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then 1.1210 @@ -20588,7 +20612,7 @@ 1.1211 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1212 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1213 $as_echo_n "checking for $ac_word... " >&6; } 1.1214 -if test "${ac_cv_prog_CXX+set}" = set; then : 1.1215 +if ${ac_cv_prog_CXX+:} false; then : 1.1216 $as_echo_n "(cached) " >&6 1.1217 else 1.1218 if test -n "$CXX"; then 1.1219 @@ -20632,7 +20656,7 @@ 1.1220 set dummy $ac_prog; ac_word=$2 1.1221 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1222 $as_echo_n "checking for $ac_word... " >&6; } 1.1223 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : 1.1224 +if ${ac_cv_prog_ac_ct_CXX+:} false; then : 1.1225 $as_echo_n "(cached) " >&6 1.1226 else 1.1227 if test -n "$ac_ct_CXX"; then 1.1228 @@ -20710,7 +20734,7 @@ 1.1229 1.1230 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 1.1231 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } 1.1232 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : 1.1233 +if ${ac_cv_cxx_compiler_gnu+:} false; then : 1.1234 $as_echo_n "(cached) " >&6 1.1235 else 1.1236 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1237 @@ -20747,7 +20771,7 @@ 1.1238 ac_save_CXXFLAGS=$CXXFLAGS 1.1239 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 1.1240 $as_echo_n "checking whether $CXX accepts -g... " >&6; } 1.1241 -if test "${ac_cv_prog_cxx_g+set}" = set; then : 1.1242 +if ${ac_cv_prog_cxx_g+:} false; then : 1.1243 $as_echo_n "(cached) " >&6 1.1244 else 1.1245 ac_save_cxx_werror_flag=$ac_cxx_werror_flag 1.1246 @@ -20845,7 +20869,7 @@ 1.1247 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1248 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1249 $as_echo_n "checking for $ac_word... " >&6; } 1.1250 -if test "${ac_cv_prog_OBJC+set}" = set; then : 1.1251 +if ${ac_cv_prog_OBJC+:} false; then : 1.1252 $as_echo_n "(cached) " >&6 1.1253 else 1.1254 if test -n "$OBJC"; then 1.1255 @@ -20889,7 +20913,7 @@ 1.1256 set dummy $ac_prog; ac_word=$2 1.1257 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1258 $as_echo_n "checking for $ac_word... " >&6; } 1.1259 -if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then : 1.1260 +if ${ac_cv_prog_ac_ct_OBJC+:} false; then : 1.1261 $as_echo_n "(cached) " >&6 1.1262 else 1.1263 if test -n "$ac_ct_OBJC"; then 1.1264 @@ -20965,7 +20989,7 @@ 1.1265 1.1266 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 1.1267 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } 1.1268 -if test "${ac_cv_objc_compiler_gnu+set}" = set; then : 1.1269 +if ${ac_cv_objc_compiler_gnu+:} false; then : 1.1270 $as_echo_n "(cached) " >&6 1.1271 else 1.1272 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1273 @@ -21002,7 +21026,7 @@ 1.1274 ac_save_OBJCFLAGS=$OBJCFLAGS 1.1275 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 1.1276 $as_echo_n "checking whether $OBJC accepts -g... " >&6; } 1.1277 -if test "${ac_cv_prog_objc_g+set}" = set; then : 1.1278 +if ${ac_cv_prog_objc_g+:} false; then : 1.1279 $as_echo_n "(cached) " >&6 1.1280 else 1.1281 ac_save_objc_werror_flag=$ac_objc_werror_flag 1.1282 @@ -21378,7 +21402,7 @@ 1.1283 set dummy ${ac_tool_prefix}ar; ac_word=$2 1.1284 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1285 $as_echo_n "checking for $ac_word... " >&6; } 1.1286 -if test "${ac_cv_prog_AR+set}" = set; then : 1.1287 +if ${ac_cv_prog_AR+:} false; then : 1.1288 $as_echo_n "(cached) " >&6 1.1289 else 1.1290 if test -n "$AR"; then 1.1291 @@ -21418,7 +21442,7 @@ 1.1292 set dummy ar; ac_word=$2 1.1293 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1294 $as_echo_n "checking for $ac_word... " >&6; } 1.1295 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 1.1296 +if ${ac_cv_prog_ac_ct_AR+:} false; then : 1.1297 $as_echo_n "(cached) " >&6 1.1298 else 1.1299 if test -n "$ac_ct_AR"; then 1.1300 @@ -21760,7 +21784,7 @@ 1.1301 set dummy link; ac_word=$2 1.1302 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1303 $as_echo_n "checking for $ac_word... " >&6; } 1.1304 -if test "${ac_cv_prog_WINLD+set}" = set; then : 1.1305 +if ${ac_cv_prog_WINLD+:} false; then : 1.1306 $as_echo_n "(cached) " >&6 1.1307 else 1.1308 if test -n "$WINLD"; then 1.1309 @@ -22099,7 +22123,7 @@ 1.1310 set dummy mt; ac_word=$2 1.1311 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1312 $as_echo_n "checking for $ac_word... " >&6; } 1.1313 -if test "${ac_cv_prog_MT+set}" = set; then : 1.1314 +if ${ac_cv_prog_MT+:} false; then : 1.1315 $as_echo_n "(cached) " >&6 1.1316 else 1.1317 if test -n "$MT"; then 1.1318 @@ -22420,7 +22444,7 @@ 1.1319 set dummy rc; ac_word=$2 1.1320 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1321 $as_echo_n "checking for $ac_word... " >&6; } 1.1322 -if test "${ac_cv_prog_RC+set}" = set; then : 1.1323 +if ${ac_cv_prog_RC+:} false; then : 1.1324 $as_echo_n "(cached) " >&6 1.1325 else 1.1326 if test -n "$RC"; then 1.1327 @@ -22811,7 +22835,7 @@ 1.1328 set dummy lib; ac_word=$2 1.1329 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1330 $as_echo_n "checking for $ac_word... " >&6; } 1.1331 -if test "${ac_cv_prog_WINAR+set}" = set; then : 1.1332 +if ${ac_cv_prog_WINAR+:} false; then : 1.1333 $as_echo_n "(cached) " >&6 1.1334 else 1.1335 if test -n "$WINAR"; then 1.1336 @@ -23117,7 +23141,7 @@ 1.1337 set dummy dumpbin; ac_word=$2 1.1338 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1339 $as_echo_n "checking for $ac_word... " >&6; } 1.1340 -if test "${ac_cv_prog_DUMPBIN+set}" = set; then : 1.1341 +if ${ac_cv_prog_DUMPBIN+:} false; then : 1.1342 $as_echo_n "(cached) " >&6 1.1343 else 1.1344 if test -n "$DUMPBIN"; then 1.1345 @@ -23436,7 +23460,7 @@ 1.1346 CPP= 1.1347 fi 1.1348 if test -z "$CPP"; then 1.1349 - if test "${ac_cv_prog_CPP+set}" = set; then : 1.1350 + if ${ac_cv_prog_CPP+:} false; then : 1.1351 $as_echo_n "(cached) " >&6 1.1352 else 1.1353 # Double quotes because CPP needs to be expanded 1.1354 @@ -23552,7 +23576,7 @@ 1.1355 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1356 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1357 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 1.1358 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1359 +See \`config.log' for more details" "$LINENO" 5; } 1.1360 fi 1.1361 1.1362 ac_ext=cpp 1.1363 @@ -23836,7 +23860,7 @@ 1.1364 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 1.1365 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } 1.1366 if test -z "$CXXCPP"; then 1.1367 - if test "${ac_cv_prog_CXXCPP+set}" = set; then : 1.1368 + if ${ac_cv_prog_CXXCPP+:} false; then : 1.1369 $as_echo_n "(cached) " >&6 1.1370 else 1.1371 # Double quotes because CXXCPP needs to be expanded 1.1372 @@ -23952,7 +23976,7 @@ 1.1373 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1374 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1375 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check 1.1376 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1377 +See \`config.log' for more details" "$LINENO" 5; } 1.1378 fi 1.1379 1.1380 ac_ext=cpp 1.1381 @@ -24254,7 +24278,7 @@ 1.1382 set dummy as; ac_word=$2 1.1383 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1384 $as_echo_n "checking for $ac_word... " >&6; } 1.1385 -if test "${ac_cv_path_AS+set}" = set; then : 1.1386 +if ${ac_cv_path_AS+:} false; then : 1.1387 $as_echo_n "(cached) " >&6 1.1388 else 1.1389 case $AS in 1.1390 @@ -24568,7 +24592,7 @@ 1.1391 set dummy $ac_prog; ac_word=$2 1.1392 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1393 $as_echo_n "checking for $ac_word... " >&6; } 1.1394 -if test "${ac_cv_path_NM+set}" = set; then : 1.1395 +if ${ac_cv_path_NM+:} false; then : 1.1396 $as_echo_n "(cached) " >&6 1.1397 else 1.1398 case $NM in 1.1399 @@ -24877,7 +24901,7 @@ 1.1400 set dummy strip; ac_word=$2 1.1401 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1402 $as_echo_n "checking for $ac_word... " >&6; } 1.1403 -if test "${ac_cv_path_STRIP+set}" = set; then : 1.1404 +if ${ac_cv_path_STRIP+:} false; then : 1.1405 $as_echo_n "(cached) " >&6 1.1406 else 1.1407 case $STRIP in 1.1408 @@ -25183,7 +25207,7 @@ 1.1409 set dummy mcs; ac_word=$2 1.1410 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1411 $as_echo_n "checking for $ac_word... " >&6; } 1.1412 -if test "${ac_cv_path_MCS+set}" = set; then : 1.1413 +if ${ac_cv_path_MCS+:} false; then : 1.1414 $as_echo_n "(cached) " >&6 1.1415 else 1.1416 case $MCS in 1.1417 @@ -25491,7 +25515,7 @@ 1.1418 set dummy ${ac_tool_prefix}nm; ac_word=$2 1.1419 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1420 $as_echo_n "checking for $ac_word... " >&6; } 1.1421 -if test "${ac_cv_prog_NM+set}" = set; then : 1.1422 +if ${ac_cv_prog_NM+:} false; then : 1.1423 $as_echo_n "(cached) " >&6 1.1424 else 1.1425 if test -n "$NM"; then 1.1426 @@ -25531,7 +25555,7 @@ 1.1427 set dummy nm; ac_word=$2 1.1428 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1429 $as_echo_n "checking for $ac_word... " >&6; } 1.1430 -if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : 1.1431 +if ${ac_cv_prog_ac_ct_NM+:} false; then : 1.1432 $as_echo_n "(cached) " >&6 1.1433 else 1.1434 if test -n "$ac_ct_NM"; then 1.1435 @@ -25849,7 +25873,7 @@ 1.1436 set dummy ${ac_tool_prefix}strip; ac_word=$2 1.1437 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1438 $as_echo_n "checking for $ac_word... " >&6; } 1.1439 -if test "${ac_cv_prog_STRIP+set}" = set; then : 1.1440 +if ${ac_cv_prog_STRIP+:} false; then : 1.1441 $as_echo_n "(cached) " >&6 1.1442 else 1.1443 if test -n "$STRIP"; then 1.1444 @@ -25889,7 +25913,7 @@ 1.1445 set dummy strip; ac_word=$2 1.1446 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1447 $as_echo_n "checking for $ac_word... " >&6; } 1.1448 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : 1.1449 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : 1.1450 $as_echo_n "(cached) " >&6 1.1451 else 1.1452 if test -n "$ac_ct_STRIP"; then 1.1453 @@ -26214,7 +26238,7 @@ 1.1454 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1455 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1456 $as_echo_n "checking for $ac_word... " >&6; } 1.1457 -if test "${ac_cv_prog_OBJCOPY+set}" = set; then : 1.1458 +if ${ac_cv_prog_OBJCOPY+:} false; then : 1.1459 $as_echo_n "(cached) " >&6 1.1460 else 1.1461 if test -n "$OBJCOPY"; then 1.1462 @@ -26258,7 +26282,7 @@ 1.1463 set dummy $ac_prog; ac_word=$2 1.1464 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1465 $as_echo_n "checking for $ac_word... " >&6; } 1.1466 -if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then : 1.1467 +if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then : 1.1468 $as_echo_n "(cached) " >&6 1.1469 else 1.1470 if test -n "$ac_ct_OBJCOPY"; then 1.1471 @@ -26585,7 +26609,7 @@ 1.1472 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 1.1473 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1474 $as_echo_n "checking for $ac_word... " >&6; } 1.1475 -if test "${ac_cv_prog_OBJDUMP+set}" = set; then : 1.1476 +if ${ac_cv_prog_OBJDUMP+:} false; then : 1.1477 $as_echo_n "(cached) " >&6 1.1478 else 1.1479 if test -n "$OBJDUMP"; then 1.1480 @@ -26629,7 +26653,7 @@ 1.1481 set dummy $ac_prog; ac_word=$2 1.1482 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1483 $as_echo_n "checking for $ac_word... " >&6; } 1.1484 -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : 1.1485 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : 1.1486 $as_echo_n "(cached) " >&6 1.1487 else 1.1488 if test -n "$ac_ct_OBJDUMP"; then 1.1489 @@ -26953,7 +26977,7 @@ 1.1490 set dummy lipo; ac_word=$2 1.1491 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1492 $as_echo_n "checking for $ac_word... " >&6; } 1.1493 -if test "${ac_cv_path_LIPO+set}" = set; then : 1.1494 +if ${ac_cv_path_LIPO+:} false; then : 1.1495 $as_echo_n "(cached) " >&6 1.1496 else 1.1497 case $LIPO in 1.1498 @@ -27268,7 +27292,7 @@ 1.1499 1.1500 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 1.1501 $as_echo_n "checking for ANSI C header files... " >&6; } 1.1502 -if test "${ac_cv_header_stdc+set}" = set; then : 1.1503 +if ${ac_cv_header_stdc+:} false; then : 1.1504 $as_echo_n "(cached) " >&6 1.1505 else 1.1506 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 1.1507 @@ -27444,7 +27468,7 @@ 1.1508 for ac_header in stdio.h 1.1509 do : 1.1510 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" 1.1511 -if test "x$ac_cv_header_stdio_h" = x""yes; then : 1.1512 +if test "x$ac_cv_header_stdio_h" = xyes; then : 1.1513 cat >>confdefs.h <<_ACEOF 1.1514 #define HAVE_STDIO_H 1 1.1515 _ACEOF 1.1516 @@ -27473,7 +27497,7 @@ 1.1517 # This bug is HP SR number 8606223364. 1.1518 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 1.1519 $as_echo_n "checking size of int *... " >&6; } 1.1520 -if test "${ac_cv_sizeof_int_p+set}" = set; then : 1.1521 +if ${ac_cv_sizeof_int_p+:} false; then : 1.1522 $as_echo_n "(cached) " >&6 1.1523 else 1.1524 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : 1.1525 @@ -27483,7 +27507,7 @@ 1.1526 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 1.1527 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 1.1528 as_fn_error 77 "cannot compute sizeof (int *) 1.1529 -See \`config.log' for more details" "$LINENO" 5 ; } 1.1530 +See \`config.log' for more details" "$LINENO" 5; } 1.1531 else 1.1532 ac_cv_sizeof_int_p=0 1.1533 fi 1.1534 @@ -27530,7 +27554,7 @@ 1.1535 # 1.1536 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 1.1537 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } 1.1538 -if test "${ac_cv_c_bigendian+set}" = set; then : 1.1539 +if ${ac_cv_c_bigendian+:} false; then : 1.1540 $as_echo_n "(cached) " >&6 1.1541 else 1.1542 ac_cv_c_bigendian=unknown 1.1543 @@ -28530,8 +28554,8 @@ 1.1544 have_x=disabled 1.1545 else 1.1546 case $x_includes,$x_libraries in #( 1.1547 - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( 1.1548 - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : 1.1549 + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( 1.1550 + *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : 1.1551 $as_echo_n "(cached) " >&6 1.1552 else 1.1553 # One or both of the vars are not set, and there is no cached value. 1.1554 @@ -28808,7 +28832,7 @@ 1.1555 else 1.1556 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 1.1557 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } 1.1558 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : 1.1559 +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : 1.1560 $as_echo_n "(cached) " >&6 1.1561 else 1.1562 ac_check_lib_save_LIBS=$LIBS 1.1563 @@ -28842,14 +28866,14 @@ 1.1564 fi 1.1565 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 1.1566 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } 1.1567 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : 1.1568 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : 1.1569 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 1.1570 fi 1.1571 1.1572 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 1.1573 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 1.1574 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } 1.1575 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : 1.1576 +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : 1.1577 $as_echo_n "(cached) " >&6 1.1578 else 1.1579 ac_check_lib_save_LIBS=$LIBS 1.1580 @@ -28883,7 +28907,7 @@ 1.1581 fi 1.1582 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 1.1583 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } 1.1584 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : 1.1585 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : 1.1586 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 1.1587 fi 1.1588 1.1589 @@ -28902,14 +28926,14 @@ 1.1590 # The functions gethostbyname, getservbyname, and inet_addr are 1.1591 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. 1.1592 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" 1.1593 -if test "x$ac_cv_func_gethostbyname" = x""yes; then : 1.1594 +if test "x$ac_cv_func_gethostbyname" = xyes; then : 1.1595 1.1596 fi 1.1597 1.1598 if test $ac_cv_func_gethostbyname = no; then 1.1599 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 1.1600 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } 1.1601 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : 1.1602 +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : 1.1603 $as_echo_n "(cached) " >&6 1.1604 else 1.1605 ac_check_lib_save_LIBS=$LIBS 1.1606 @@ -28943,14 +28967,14 @@ 1.1607 fi 1.1608 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 1.1609 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } 1.1610 -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : 1.1611 +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : 1.1612 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 1.1613 fi 1.1614 1.1615 if test $ac_cv_lib_nsl_gethostbyname = no; then 1.1616 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 1.1617 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } 1.1618 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : 1.1619 +if ${ac_cv_lib_bsd_gethostbyname+:} false; then : 1.1620 $as_echo_n "(cached) " >&6 1.1621 else 1.1622 ac_check_lib_save_LIBS=$LIBS 1.1623 @@ -28984,7 +29008,7 @@ 1.1624 fi 1.1625 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 1.1626 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } 1.1627 -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : 1.1628 +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : 1.1629 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" 1.1630 fi 1.1631 1.1632 @@ -28999,14 +29023,14 @@ 1.1633 # must be given before -lnsl if both are needed. We assume that 1.1634 # if connect needs -lnsl, so does gethostbyname. 1.1635 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect" 1.1636 -if test "x$ac_cv_func_connect" = x""yes; then : 1.1637 +if test "x$ac_cv_func_connect" = xyes; then : 1.1638 1.1639 fi 1.1640 1.1641 if test $ac_cv_func_connect = no; then 1.1642 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 1.1643 $as_echo_n "checking for connect in -lsocket... " >&6; } 1.1644 -if test "${ac_cv_lib_socket_connect+set}" = set; then : 1.1645 +if ${ac_cv_lib_socket_connect+:} false; then : 1.1646 $as_echo_n "(cached) " >&6 1.1647 else 1.1648 ac_check_lib_save_LIBS=$LIBS 1.1649 @@ -29040,7 +29064,7 @@ 1.1650 fi 1.1651 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 1.1652 $as_echo "$ac_cv_lib_socket_connect" >&6; } 1.1653 -if test "x$ac_cv_lib_socket_connect" = x""yes; then : 1.1654 +if test "x$ac_cv_lib_socket_connect" = xyes; then : 1.1655 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 1.1656 fi 1.1657 1.1658 @@ -29048,14 +29072,14 @@ 1.1659 1.1660 # Guillermo Gomez says -lposix is necessary on A/UX. 1.1661 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove" 1.1662 -if test "x$ac_cv_func_remove" = x""yes; then : 1.1663 +if test "x$ac_cv_func_remove" = xyes; then : 1.1664 1.1665 fi 1.1666 1.1667 if test $ac_cv_func_remove = no; then 1.1668 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 1.1669 $as_echo_n "checking for remove in -lposix... " >&6; } 1.1670 -if test "${ac_cv_lib_posix_remove+set}" = set; then : 1.1671 +if ${ac_cv_lib_posix_remove+:} false; then : 1.1672 $as_echo_n "(cached) " >&6 1.1673 else 1.1674 ac_check_lib_save_LIBS=$LIBS 1.1675 @@ -29089,7 +29113,7 @@ 1.1676 fi 1.1677 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 1.1678 $as_echo "$ac_cv_lib_posix_remove" >&6; } 1.1679 -if test "x$ac_cv_lib_posix_remove" = x""yes; then : 1.1680 +if test "x$ac_cv_lib_posix_remove" = xyes; then : 1.1681 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 1.1682 fi 1.1683 1.1684 @@ -29097,14 +29121,14 @@ 1.1685 1.1686 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 1.1687 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat" 1.1688 -if test "x$ac_cv_func_shmat" = x""yes; then : 1.1689 +if test "x$ac_cv_func_shmat" = xyes; then : 1.1690 1.1691 fi 1.1692 1.1693 if test $ac_cv_func_shmat = no; then 1.1694 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 1.1695 $as_echo_n "checking for shmat in -lipc... " >&6; } 1.1696 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then : 1.1697 +if ${ac_cv_lib_ipc_shmat+:} false; then : 1.1698 $as_echo_n "(cached) " >&6 1.1699 else 1.1700 ac_check_lib_save_LIBS=$LIBS 1.1701 @@ -29138,7 +29162,7 @@ 1.1702 fi 1.1703 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 1.1704 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } 1.1705 -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : 1.1706 +if test "x$ac_cv_lib_ipc_shmat" = xyes; then : 1.1707 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 1.1708 fi 1.1709 1.1710 @@ -29156,7 +29180,7 @@ 1.1711 # John Interrante, Karl Berry 1.1712 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 1.1713 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } 1.1714 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : 1.1715 +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : 1.1716 $as_echo_n "(cached) " >&6 1.1717 else 1.1718 ac_check_lib_save_LIBS=$LIBS 1.1719 @@ -29190,7 +29214,7 @@ 1.1720 fi 1.1721 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 1.1722 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } 1.1723 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : 1.1724 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : 1.1725 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 1.1726 fi 1.1727 1.1728 @@ -30197,7 +30221,7 @@ 1.1729 LDFLAGS="$FREETYPE2_LIBS" 1.1730 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 1.1731 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } 1.1732 -if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then : 1.1733 +if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then : 1.1734 $as_echo_n "(cached) " >&6 1.1735 else 1.1736 ac_check_lib_save_LIBS=$LIBS 1.1737 @@ -30231,7 +30255,7 @@ 1.1738 fi 1.1739 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 1.1740 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } 1.1741 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then : 1.1742 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : 1.1743 FREETYPE2_FOUND=true 1.1744 else 1.1745 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 1.1746 @@ -30519,7 +30543,7 @@ 1.1747 for ac_header in alsa/asoundlib.h 1.1748 do : 1.1749 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" 1.1750 -if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then : 1.1751 +if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then : 1.1752 cat >>confdefs.h <<_ACEOF 1.1753 #define HAVE_ALSA_ASOUNDLIB_H 1 1.1754 _ACEOF 1.1755 @@ -30578,7 +30602,7 @@ 1.1756 USE_EXTERNAL_LIBJPEG=true 1.1757 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5 1.1758 $as_echo_n "checking for main in -ljpeg... " >&6; } 1.1759 -if test "${ac_cv_lib_jpeg_main+set}" = set; then : 1.1760 +if ${ac_cv_lib_jpeg_main+:} false; then : 1.1761 $as_echo_n "(cached) " >&6 1.1762 else 1.1763 ac_check_lib_save_LIBS=$LIBS 1.1764 @@ -30606,7 +30630,7 @@ 1.1765 fi 1.1766 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5 1.1767 $as_echo "$ac_cv_lib_jpeg_main" >&6; } 1.1768 -if test "x$ac_cv_lib_jpeg_main" = x""yes; then : 1.1769 +if test "x$ac_cv_lib_jpeg_main" = xyes; then : 1.1770 cat >>confdefs.h <<_ACEOF 1.1771 #define HAVE_LIBJPEG 1 1.1772 _ACEOF 1.1773 @@ -30630,7 +30654,7 @@ 1.1774 USE_EXTERNAL_LIBJPEG=true 1.1775 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5 1.1776 $as_echo_n "checking for main in -lgif... " >&6; } 1.1777 -if test "${ac_cv_lib_gif_main+set}" = set; then : 1.1778 +if ${ac_cv_lib_gif_main+:} false; then : 1.1779 $as_echo_n "(cached) " >&6 1.1780 else 1.1781 ac_check_lib_save_LIBS=$LIBS 1.1782 @@ -30658,7 +30682,7 @@ 1.1783 fi 1.1784 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5 1.1785 $as_echo "$ac_cv_lib_gif_main" >&6; } 1.1786 -if test "x$ac_cv_lib_gif_main" = x""yes; then : 1.1787 +if test "x$ac_cv_lib_gif_main" = xyes; then : 1.1788 cat >>confdefs.h <<_ACEOF 1.1789 #define HAVE_LIBGIF 1 1.1790 _ACEOF 1.1791 @@ -30688,7 +30712,7 @@ 1.1792 1.1793 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 1.1794 $as_echo_n "checking for compress in -lz... " >&6; } 1.1795 -if test "${ac_cv_lib_z_compress+set}" = set; then : 1.1796 +if ${ac_cv_lib_z_compress+:} false; then : 1.1797 $as_echo_n "(cached) " >&6 1.1798 else 1.1799 ac_check_lib_save_LIBS=$LIBS 1.1800 @@ -30722,7 +30746,7 @@ 1.1801 fi 1.1802 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 1.1803 $as_echo "$ac_cv_lib_z_compress" >&6; } 1.1804 -if test "x$ac_cv_lib_z_compress" = x""yes; then : 1.1805 +if test "x$ac_cv_lib_z_compress" = xyes; then : 1.1806 ZLIB_FOUND=yes 1.1807 else 1.1808 ZLIB_FOUND=no 1.1809 @@ -30815,7 +30839,7 @@ 1.1810 1.1811 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 1.1812 $as_echo_n "checking for cos in -lm... " >&6; } 1.1813 -if test "${ac_cv_lib_m_cos+set}" = set; then : 1.1814 +if ${ac_cv_lib_m_cos+:} false; then : 1.1815 $as_echo_n "(cached) " >&6 1.1816 else 1.1817 ac_check_lib_save_LIBS=$LIBS 1.1818 @@ -30849,7 +30873,7 @@ 1.1819 fi 1.1820 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 1.1821 $as_echo "$ac_cv_lib_m_cos" >&6; } 1.1822 -if test "x$ac_cv_lib_m_cos" = x""yes; then : 1.1823 +if test "x$ac_cv_lib_m_cos" = xyes; then : 1.1824 cat >>confdefs.h <<_ACEOF 1.1825 #define HAVE_LIBM 1 1.1826 _ACEOF 1.1827 @@ -30873,7 +30897,7 @@ 1.1828 LIBS="" 1.1829 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 1.1830 $as_echo_n "checking for dlopen in -ldl... " >&6; } 1.1831 -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : 1.1832 +if ${ac_cv_lib_dl_dlopen+:} false; then : 1.1833 $as_echo_n "(cached) " >&6 1.1834 else 1.1835 ac_check_lib_save_LIBS=$LIBS 1.1836 @@ -30907,7 +30931,7 @@ 1.1837 fi 1.1838 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 1.1839 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } 1.1840 -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : 1.1841 +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : 1.1842 cat >>confdefs.h <<_ACEOF 1.1843 #define HAVE_LIBDL 1 1.1844 _ACEOF 1.1845 @@ -31144,7 +31168,7 @@ 1.1846 # The name of the Service Agent jar. 1.1847 SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}" 1.1848 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 1.1849 - SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" 1.1850 + SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" 1.1851 fi 1.1852 1.1853 1.1854 @@ -31551,7 +31575,7 @@ 1.1855 set dummy ccache; ac_word=$2 1.1856 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 1.1857 $as_echo_n "checking for $ac_word... " >&6; } 1.1858 -if test "${ac_cv_path_CCACHE+set}" = set; then : 1.1859 +if ${ac_cv_path_CCACHE+:} false; then : 1.1860 $as_echo_n "(cached) " >&6 1.1861 else 1.1862 case $CCACHE in 1.1863 @@ -31812,10 +31836,21 @@ 1.1864 :end' >>confcache 1.1865 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 1.1866 if test -w "$cache_file"; then 1.1867 - test "x$cache_file" != "x/dev/null" && 1.1868 + if test "x$cache_file" != "x/dev/null"; then 1.1869 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 1.1870 $as_echo "$as_me: updating cache $cache_file" >&6;} 1.1871 - cat confcache >$cache_file 1.1872 + if test ! -f "$cache_file" || test -h "$cache_file"; then 1.1873 + cat confcache >"$cache_file" 1.1874 + else 1.1875 + case $cache_file in #( 1.1876 + */* | ?:*) 1.1877 + mv -f confcache "$cache_file"$$ && 1.1878 + mv -f "$cache_file"$$ "$cache_file" ;; #( 1.1879 + *) 1.1880 + mv -f confcache "$cache_file" ;; 1.1881 + esac 1.1882 + fi 1.1883 + fi 1.1884 else 1.1885 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 1.1886 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 1.1887 @@ -31847,7 +31882,7 @@ 1.1888 1.1889 1.1890 1.1891 -: ${CONFIG_STATUS=./config.status} 1.1892 +: "${CONFIG_STATUS=./config.status}" 1.1893 ac_write_fail=0 1.1894 ac_clean_files_save=$ac_clean_files 1.1895 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 1.1896 @@ -31948,6 +31983,7 @@ 1.1897 IFS=" "" $as_nl" 1.1898 1.1899 # Find who we are. Look in the path if we contain no directory separator. 1.1900 +as_myself= 1.1901 case $0 in #(( 1.1902 *[\\/]* ) as_myself=$0 ;; 1.1903 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 1.1904 @@ -32255,7 +32291,7 @@ 1.1905 # values after options handling. 1.1906 ac_log=" 1.1907 This file was extended by OpenJDK $as_me jdk8, which was 1.1908 -generated by GNU Autoconf 2.67. Invocation command line was 1.1909 +generated by GNU Autoconf 2.68. Invocation command line was 1.1910 1.1911 CONFIG_FILES = $CONFIG_FILES 1.1912 CONFIG_HEADERS = $CONFIG_HEADERS 1.1913 @@ -32318,7 +32354,7 @@ 1.1914 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 1.1915 ac_cs_version="\\ 1.1916 OpenJDK config.status jdk8 1.1917 -configured by $0, generated by GNU Autoconf 2.67, 1.1918 +configured by $0, generated by GNU Autoconf 2.68, 1.1919 with options \\"\$ac_cs_config\\" 1.1920 1.1921 Copyright (C) 2010 Free Software Foundation, Inc. 1.1922 @@ -32447,7 +32483,7 @@ 1.1923 "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;; 1.1924 "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;; 1.1925 1.1926 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 1.1927 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 1.1928 esac 1.1929 done 1.1930 1.1931 @@ -32469,9 +32505,10 @@ 1.1932 # after its creation but before its name has been assigned to `$tmp'. 1.1933 $debug || 1.1934 { 1.1935 - tmp= 1.1936 + tmp= ac_tmp= 1.1937 trap 'exit_status=$? 1.1938 - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 1.1939 + : "${ac_tmp:=$tmp}" 1.1940 + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 1.1941 ' 0 1.1942 trap 'as_fn_exit 1' 1 2 13 15 1.1943 } 1.1944 @@ -32479,12 +32516,13 @@ 1.1945 1.1946 { 1.1947 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 1.1948 - test -n "$tmp" && test -d "$tmp" 1.1949 + test -d "$tmp" 1.1950 } || 1.1951 { 1.1952 tmp=./conf$$-$RANDOM 1.1953 (umask 077 && mkdir "$tmp") 1.1954 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 1.1955 +ac_tmp=$tmp 1.1956 1.1957 # Set up the scripts for CONFIG_FILES section. 1.1958 # No need to generate them if there are no CONFIG_FILES. 1.1959 @@ -32506,7 +32544,7 @@ 1.1960 ac_cs_awk_cr=$ac_cr 1.1961 fi 1.1962 1.1963 -echo 'BEGIN {' >"$tmp/subs1.awk" && 1.1964 +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 1.1965 _ACEOF 1.1966 1.1967 1.1968 @@ -32534,7 +32572,7 @@ 1.1969 rm -f conf$$subs.sh 1.1970 1.1971 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 1.1972 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 1.1973 +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 1.1974 _ACEOF 1.1975 sed -n ' 1.1976 h 1.1977 @@ -32582,7 +32620,7 @@ 1.1978 rm -f conf$$subs.awk 1.1979 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 1.1980 _ACAWK 1.1981 -cat >>"\$tmp/subs1.awk" <<_ACAWK && 1.1982 +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 1.1983 for (key in S) S_is_set[key] = 1 1.1984 FS = "" 1.1985 1.1986 @@ -32614,7 +32652,7 @@ 1.1987 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 1.1988 else 1.1989 cat 1.1990 -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 1.1991 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 1.1992 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 1.1993 _ACEOF 1.1994 1.1995 @@ -32648,7 +32686,7 @@ 1.1996 # No need to generate them if there are no CONFIG_HEADERS. 1.1997 # This happens for instance with `./config.status Makefile'. 1.1998 if test -n "$CONFIG_HEADERS"; then 1.1999 -cat >"$tmp/defines.awk" <<\_ACAWK || 1.2000 +cat >"$ac_tmp/defines.awk" <<\_ACAWK || 1.2001 BEGIN { 1.2002 _ACEOF 1.2003 1.2004 @@ -32660,8 +32698,8 @@ 1.2005 # handling of long lines. 1.2006 ac_delim='%!_!# ' 1.2007 for ac_last_try in false false :; do 1.2008 - ac_t=`sed -n "/$ac_delim/p" confdefs.h` 1.2009 - if test -z "$ac_t"; then 1.2010 + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 1.2011 + if test -z "$ac_tt"; then 1.2012 break 1.2013 elif $ac_last_try; then 1.2014 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 1.2015 @@ -32762,7 +32800,7 @@ 1.2016 esac 1.2017 case $ac_mode$ac_tag in 1.2018 :[FHL]*:*);; 1.2019 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 1.2020 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 1.2021 :[FH]-) ac_tag=-:-;; 1.2022 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 1.2023 esac 1.2024 @@ -32781,7 +32819,7 @@ 1.2025 for ac_f 1.2026 do 1.2027 case $ac_f in 1.2028 - -) ac_f="$tmp/stdin";; 1.2029 + -) ac_f="$ac_tmp/stdin";; 1.2030 *) # Look for the file first in the build tree, then in the source tree 1.2031 # (if the path is not absolute). The absolute path cannot be DOS-style, 1.2032 # because $ac_f cannot contain `:'. 1.2033 @@ -32790,7 +32828,7 @@ 1.2034 [\\/$]*) false;; 1.2035 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 1.2036 esac || 1.2037 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 1.2038 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 1.2039 esac 1.2040 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 1.2041 as_fn_append ac_file_inputs " '$ac_f'" 1.2042 @@ -32816,8 +32854,8 @@ 1.2043 esac 1.2044 1.2045 case $ac_tag in 1.2046 - *:-:* | *:-) cat >"$tmp/stdin" \ 1.2047 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 1.2048 + *:-:* | *:-) cat >"$ac_tmp/stdin" \ 1.2049 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 1.2050 esac 1.2051 ;; 1.2052 esac 1.2053 @@ -32942,21 +32980,22 @@ 1.2054 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t 1.2055 $ac_datarootdir_hack 1.2056 " 1.2057 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 1.2058 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2059 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ 1.2060 + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2061 1.2062 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 1.2063 - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 1.2064 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 1.2065 + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 1.2066 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 1.2067 + "$ac_tmp/out"`; test -z "$ac_out"; } && 1.2068 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 1.2069 which seems to be undefined. Please make sure it is defined" >&5 1.2070 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 1.2071 which seems to be undefined. Please make sure it is defined" >&2;} 1.2072 1.2073 - rm -f "$tmp/stdin" 1.2074 + rm -f "$ac_tmp/stdin" 1.2075 case $ac_file in 1.2076 - -) cat "$tmp/out" && rm -f "$tmp/out";; 1.2077 - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 1.2078 + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 1.2079 + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 1.2080 esac \ 1.2081 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2082 ;; 1.2083 @@ -32967,20 +33006,20 @@ 1.2084 if test x"$ac_file" != x-; then 1.2085 { 1.2086 $as_echo "/* $configure_input */" \ 1.2087 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 1.2088 - } >"$tmp/config.h" \ 1.2089 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 1.2090 + } >"$ac_tmp/config.h" \ 1.2091 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2092 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 1.2093 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 1.2094 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 1.2095 $as_echo "$as_me: $ac_file is unchanged" >&6;} 1.2096 else 1.2097 rm -f "$ac_file" 1.2098 - mv "$tmp/config.h" "$ac_file" \ 1.2099 + mv "$ac_tmp/config.h" "$ac_file" \ 1.2100 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 1.2101 fi 1.2102 else 1.2103 $as_echo "/* $configure_input */" \ 1.2104 - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 1.2105 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 1.2106 || as_fn_error $? "could not create -" "$LINENO" 5 1.2107 fi 1.2108 ;;
2.1 --- a/common/autoconf/jdk-options.m4 Tue Jan 08 13:14:22 2013 -0800 2.2 +++ b/common/autoconf/jdk-options.m4 Tue Jan 08 16:23:45 2013 -0800 2.3 @@ -382,24 +382,38 @@ 2.4 AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone], 2.5 [Set milestone value for build @<:@internal@:>@])]) 2.6 if test "x$with_milestone" = xyes; then 2.7 - AC_MSG_ERROR([Milestone must have a value]) 2.8 + AC_MSG_ERROR([Milestone must have a value]) 2.9 elif test "x$with_milestone" != x; then 2.10 MILESTONE="$with_milestone" 2.11 else 2.12 - MILESTONE=internal 2.13 + MILESTONE=internal 2.14 fi 2.15 2.16 AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], 2.17 [Set build number value for build @<:@b00@:>@])]) 2.18 if test "x$with_build_number" = xyes; then 2.19 - AC_MSG_ERROR([Build number must have a value]) 2.20 + AC_MSG_ERROR([Build number must have a value]) 2.21 elif test "x$with_build_number" != x; then 2.22 - JDK_BUILD_NUMBER="$with_build_number" 2.23 + JDK_BUILD_NUMBER="$with_build_number" 2.24 fi 2.25 if test "x$JDK_BUILD_NUMBER" = x; then 2.26 - JDK_BUILD_NUMBER=b00 2.27 + JDK_BUILD_NUMBER=b00 2.28 fi 2.29 2.30 +AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], 2.31 + [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])]) 2.32 +if test "x$with_user_release_suffix" = xyes; then 2.33 + AC_MSG_ERROR([Release suffix must have a value]) 2.34 +elif test "x$with_user_release_suffix" != x; then 2.35 + USER_RELEASE_SUFFIX="$with_user_release_suffix" 2.36 +else 2.37 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 2.38 + # Avoid [:alnum:] since it depends on the locale. 2.39 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 2.40 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 2.41 +fi 2.42 +AC_SUBST(USER_RELEASE_SUFFIX) 2.43 + 2.44 # Now set the JDK version, milestone, build number etc. 2.45 AC_SUBST(JDK_MAJOR_VERSION) 2.46 AC_SUBST(JDK_MINOR_VERSION) 2.47 @@ -419,18 +433,12 @@ 2.48 AC_SUBST(COPYRIGHT_YEAR) 2.49 2.50 if test "x$JDK_UPDATE_VERSION" != x; then 2.51 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 2.52 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 2.53 else 2.54 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 2.55 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 2.56 fi 2.57 AC_SUBST(JDK_VERSION) 2.58 2.59 -BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 2.60 -# Avoid [:alnum:] since it depends on the locale. 2.61 -CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 2.62 -USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 2.63 -AC_SUBST(USER_RELEASE_SUFFIX) 2.64 - 2.65 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` 2.66 AC_SUBST(COOKED_BUILD_NUMBER) 2.67 ]) 2.68 @@ -443,7 +451,7 @@ 2.69 # The name of the Service Agent jar. 2.70 SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}" 2.71 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 2.72 - SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" 2.73 + SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" 2.74 fi 2.75 AC_SUBST(SALIB_NAME) 2.76
