1.1 --- a/common/autoconf/generated-configure.sh Fri Jan 18 11:31:33 2013 -0800
1.2 +++ b/common/autoconf/generated-configure.sh Mon Jan 28 14:23:20 2013 +0100
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.68 for OpenJDK jdk8.
1.7 +# Generated by GNU Autoconf 2.67 for OpenJDK jdk8.
1.8 #
1.9 # Report bugs to <build-dev@openjdk.java.net>.
1.10 #
1.11 @@ -91,7 +91,6 @@
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 @@ -217,18 +216,11 @@
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 - case $- in # ((((
1.29 - *v*x* | *x*v* ) as_opts=-vx ;;
1.30 - *v* ) as_opts=-v ;;
1.31 - *x* ) as_opts=-x ;;
1.32 - * ) as_opts= ;;
1.33 - esac
1.34 - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
1.35 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
1.36 fi
1.37
1.38 if test x$as_have_required = xno; then :
1.39 @@ -760,10 +752,7 @@
1.40 JAVA_CHECK
1.41 JAVAC_CHECK
1.42 COOKED_BUILD_NUMBER
1.43 -FULL_VERSION
1.44 -RELEASE
1.45 JDK_VERSION
1.46 -RUNTIME_NAME
1.47 COPYRIGHT_YEAR
1.48 MACOSX_BUNDLE_ID_BASE
1.49 MACOSX_BUNDLE_NAME_BASE
1.50 @@ -778,6 +767,7 @@
1.51 JDK_MICRO_VERSION
1.52 JDK_MINOR_VERSION
1.53 JDK_MAJOR_VERSION
1.54 +USER_RELEASE_SUFFIX
1.55 COMPRESS_JARS
1.56 UNLIMITED_CRYPTO
1.57 CACERTS_FILE
1.58 @@ -785,14 +775,12 @@
1.59 BUILD_HEADLESS
1.60 SUPPORT_HEADFUL
1.61 SUPPORT_HEADLESS
1.62 -SET_OPENJDK
1.63 BDEPS_FTP
1.64 BDEPS_UNZIP
1.65 OS_VERSION_MICRO
1.66 OS_VERSION_MINOR
1.67 OS_VERSION_MAJOR
1.68 PKG_CONFIG
1.69 -COMM
1.70 TIME
1.71 STAT
1.72 HG
1.73 @@ -825,6 +813,7 @@
1.74 JVM_VARIANT_SERVER
1.75 JVM_VARIANTS
1.76 JDK_VARIANT
1.77 +SET_OPENJDK
1.78 BUILD_LOG_WRAPPER
1.79 BUILD_LOG_PREVIOUS
1.80 BUILD_LOG
1.81 @@ -908,7 +897,9 @@
1.82 DIFF
1.83 DATE
1.84 CUT
1.85 +CPIO
1.86 CP
1.87 +COMM
1.88 CMP
1.89 CHMOD
1.90 CAT
1.91 @@ -963,6 +954,7 @@
1.92 with_sys_root
1.93 with_tools_dir
1.94 with_devkit
1.95 +enable_openjdk_only
1.96 with_jdk_variant
1.97 with_jvm_variants
1.98 enable_debug
1.99 @@ -972,11 +964,13 @@
1.100 with_builddeps_server
1.101 with_builddeps_dir
1.102 with_builddeps_group
1.103 -enable_openjdk_only
1.104 enable_headful
1.105 enable_hotspot_test_in_build
1.106 with_cacerts_file
1.107 enable_unlimited_crypto
1.108 +with_milestone
1.109 +with_build_number
1.110 +with_user_release_suffix
1.111 with_boot_jdk
1.112 with_boot_jdk_jvmargs
1.113 with_add_source_root
1.114 @@ -1439,7 +1433,7 @@
1.115 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1.116 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1.117 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1.118 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
1.119 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
1.120 ;;
1.121
1.122 esac
1.123 @@ -1655,10 +1649,10 @@
1.124 --disable-option-checking ignore unrecognized --enable/--with options
1.125 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1.126 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1.127 + --enable-openjdk-only suppress building custom source even if present
1.128 + [disabled]
1.129 --enable-debug set the debug level to fastdebug (shorthand for
1.130 --with-debug-level=fastdebug) [disabled]
1.131 - --enable-openjdk-only supress building closed source even if present
1.132 - [disabled]
1.133 --disable-headful disable building headful support (graphical UI
1.134 support) [enabled]
1.135 --enable-hotspot-test-in-build
1.136 @@ -1706,6 +1700,11 @@
1.137 --with-builddeps-group chgrp the downloaded build dependencies to this
1.138 group
1.139 --with-cacerts-file specify alternative cacerts file
1.140 + --with-milestone Set milestone value for build [internal]
1.141 + --with-build-number Set build number value for build [b00]
1.142 + --with-user-release-suffix
1.143 + Add a custom string to the version string if build
1.144 + number isn't set.[username_builddateb00]
1.145 --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed]
1.146 --with-boot-jdk-jvmargs specify JVM arguments to be passed to all
1.147 invocations of the Boot JDK, overriding the default
1.148 @@ -1859,7 +1858,7 @@
1.149 if $ac_init_version; then
1.150 cat <<\_ACEOF
1.151 OpenJDK configure jdk8
1.152 -generated by GNU Autoconf 2.68
1.153 +generated by GNU Autoconf 2.67
1.154
1.155 Copyright (C) 2010 Free Software Foundation, Inc.
1.156 This configure script is free software; the Free Software Foundation
1.157 @@ -1905,7 +1904,7 @@
1.158
1.159 ac_retval=1
1.160 fi
1.161 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.162 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.163 as_fn_set_status $ac_retval
1.164
1.165 } # ac_fn_c_try_compile
1.166 @@ -1943,7 +1942,7 @@
1.167
1.168 ac_retval=1
1.169 fi
1.170 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.171 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.172 as_fn_set_status $ac_retval
1.173
1.174 } # ac_fn_cxx_try_compile
1.175 @@ -1981,7 +1980,7 @@
1.176
1.177 ac_retval=1
1.178 fi
1.179 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.180 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.181 as_fn_set_status $ac_retval
1.182
1.183 } # ac_fn_objc_try_compile
1.184 @@ -2018,7 +2017,7 @@
1.185
1.186 ac_retval=1
1.187 fi
1.188 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.189 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.190 as_fn_set_status $ac_retval
1.191
1.192 } # ac_fn_c_try_cpp
1.193 @@ -2055,7 +2054,7 @@
1.194
1.195 ac_retval=1
1.196 fi
1.197 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.198 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.199 as_fn_set_status $ac_retval
1.200
1.201 } # ac_fn_cxx_try_cpp
1.202 @@ -2068,10 +2067,10 @@
1.203 ac_fn_cxx_check_header_mongrel ()
1.204 {
1.205 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.206 - if eval \${$3+:} false; then :
1.207 + if eval "test \"\${$3+set}\"" = set; then :
1.208 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.209 $as_echo_n "checking for $2... " >&6; }
1.210 -if eval \${$3+:} false; then :
1.211 +if eval "test \"\${$3+set}\"" = set; then :
1.212 $as_echo_n "(cached) " >&6
1.213 fi
1.214 eval ac_res=\$$3
1.215 @@ -2138,7 +2137,7 @@
1.216 esac
1.217 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.218 $as_echo_n "checking for $2... " >&6; }
1.219 -if eval \${$3+:} false; then :
1.220 +if eval "test \"\${$3+set}\"" = set; then :
1.221 $as_echo_n "(cached) " >&6
1.222 else
1.223 eval "$3=\$ac_header_compiler"
1.224 @@ -2147,7 +2146,7 @@
1.225 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.226 $as_echo "$ac_res" >&6; }
1.227 fi
1.228 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.229 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.230
1.231 } # ac_fn_cxx_check_header_mongrel
1.232
1.233 @@ -2188,7 +2187,7 @@
1.234 ac_retval=$ac_status
1.235 fi
1.236 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1.237 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.238 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.239 as_fn_set_status $ac_retval
1.240
1.241 } # ac_fn_cxx_try_run
1.242 @@ -2202,7 +2201,7 @@
1.243 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.244 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.245 $as_echo_n "checking for $2... " >&6; }
1.246 -if eval \${$3+:} false; then :
1.247 +if eval "test \"\${$3+set}\"" = set; then :
1.248 $as_echo_n "(cached) " >&6
1.249 else
1.250 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.251 @@ -2220,7 +2219,7 @@
1.252 eval ac_res=\$$3
1.253 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.254 $as_echo "$ac_res" >&6; }
1.255 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.256 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.257
1.258 } # ac_fn_cxx_check_header_compile
1.259
1.260 @@ -2397,7 +2396,7 @@
1.261 rm -f conftest.val
1.262
1.263 fi
1.264 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.265 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.266 as_fn_set_status $ac_retval
1.267
1.268 } # ac_fn_cxx_compute_int
1.269 @@ -2443,7 +2442,7 @@
1.270 # interfere with the next link command; also delete a directory that is
1.271 # left behind by Apple's compiler. We do this before executing the actions.
1.272 rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1.273 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.274 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.275 as_fn_set_status $ac_retval
1.276
1.277 } # ac_fn_cxx_try_link
1.278 @@ -2456,7 +2455,7 @@
1.279 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.280 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.281 $as_echo_n "checking for $2... " >&6; }
1.282 -if eval \${$3+:} false; then :
1.283 +if eval "test \"\${$3+set}\"" = set; then :
1.284 $as_echo_n "(cached) " >&6
1.285 else
1.286 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.287 @@ -2511,7 +2510,7 @@
1.288 eval ac_res=\$$3
1.289 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.290 $as_echo "$ac_res" >&6; }
1.291 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.292 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.293
1.294 } # ac_fn_cxx_check_func
1.295
1.296 @@ -2524,7 +2523,7 @@
1.297 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.298 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.299 $as_echo_n "checking for $2... " >&6; }
1.300 -if eval \${$3+:} false; then :
1.301 +if eval "test \"\${$3+set}\"" = set; then :
1.302 $as_echo_n "(cached) " >&6
1.303 else
1.304 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.305 @@ -2542,7 +2541,7 @@
1.306 eval ac_res=\$$3
1.307 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.308 $as_echo "$ac_res" >&6; }
1.309 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.310 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.311
1.312 } # ac_fn_c_check_header_compile
1.313 cat >config.log <<_ACEOF
1.314 @@ -2550,7 +2549,7 @@
1.315 running configure, to aid debugging if configure makes a mistake.
1.316
1.317 It was created by OpenJDK $as_me jdk8, which was
1.318 -generated by GNU Autoconf 2.68. Invocation command line was
1.319 +generated by GNU Autoconf 2.67. Invocation command line was
1.320
1.321 $ $0 $@
1.322
1.323 @@ -2808,7 +2807,7 @@
1.324 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.325 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.326 as_fn_error $? "failed to load site script $ac_site_file
1.327 -See \`config.log' for more details" "$LINENO" 5; }
1.328 +See \`config.log' for more details" "$LINENO" 5 ; }
1.329 fi
1.330 done
1.331
1.332 @@ -2928,6 +2927,32 @@
1.333
1.334
1.335 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
1.336 +
1.337 +#
1.338 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
1.339 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.340 +#
1.341 +# This code is free software; you can redistribute it and/or modify it
1.342 +# under the terms of the GNU General Public License version 2 only, as
1.343 +# published by the Free Software Foundation. Oracle designates this
1.344 +# particular file as subject to the "Classpath" exception as provided
1.345 +# by Oracle in the LICENSE file that accompanied this code.
1.346 +#
1.347 +# This code is distributed in the hope that it will be useful, but WITHOUT
1.348 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1.349 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
1.350 +# version 2 for more details (a copy is included in the LICENSE file that
1.351 +# accompanied this code).
1.352 +#
1.353 +# You should have received a copy of the GNU General Public License version
1.354 +# 2 along with this work; if not, write to the Free Software Foundation,
1.355 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
1.356 +#
1.357 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
1.358 +# or visit www.oracle.com if you need additional information or have any
1.359 +# questions.
1.360 +#
1.361 +
1.362 #
1.363 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1.364 #
1.365 @@ -2991,7 +3016,7 @@
1.366
1.367 # Include these first...
1.368 #
1.369 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.370 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
1.371 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.372 #
1.373 # This code is free software; you can redistribute it and/or modify it
1.374 @@ -3088,6 +3113,10 @@
1.375 # Argument 3: what to do otherwise (remote disk or failure)
1.376
1.377
1.378 +# Check that source files have basic read permissions set. This might
1.379 +# not be the case in cygwin in certain conditions.
1.380 +
1.381 +
1.382
1.383
1.384 #
1.385 @@ -3402,7 +3431,7 @@
1.386
1.387
1.388 #
1.389 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.390 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
1.391 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.392 #
1.393 # This code is free software; you can redistribute it and/or modify it
1.394 @@ -3433,7 +3462,18 @@
1.395
1.396
1.397
1.398 -
1.399 +###############################################################################
1.400 +#
1.401 +# Should we build only OpenJDK even if closed sources are present?
1.402 +#
1.403 +
1.404 +
1.405 +
1.406 +
1.407 +###############################################################################
1.408 +#
1.409 +# Setup version numbers
1.410 +#
1.411
1.412
1.413
1.414 @@ -3683,7 +3723,7 @@
1.415 #CUSTOM_AUTOCONF_INCLUDE
1.416
1.417 # Do not change or remove the following line, it is needed for consistency checks:
1.418 -DATE_WHEN_GENERATED=1355963953
1.419 +DATE_WHEN_GENERATED=1359376859
1.420
1.421 ###############################################################################
1.422 #
1.423 @@ -3721,7 +3761,7 @@
1.424 set dummy $ac_prog; ac_word=$2
1.425 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.426 $as_echo_n "checking for $ac_word... " >&6; }
1.427 -if ${ac_cv_path_BASENAME+:} false; then :
1.428 +if test "${ac_cv_path_BASENAME+set}" = set; then :
1.429 $as_echo_n "(cached) " >&6
1.430 else
1.431 case $BASENAME in
1.432 @@ -3780,7 +3820,7 @@
1.433 set dummy $ac_prog; ac_word=$2
1.434 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.435 $as_echo_n "checking for $ac_word... " >&6; }
1.436 -if ${ac_cv_path_BASH+:} false; then :
1.437 +if test "${ac_cv_path_BASH+set}" = set; then :
1.438 $as_echo_n "(cached) " >&6
1.439 else
1.440 case $BASH in
1.441 @@ -3839,7 +3879,7 @@
1.442 set dummy $ac_prog; ac_word=$2
1.443 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.444 $as_echo_n "checking for $ac_word... " >&6; }
1.445 -if ${ac_cv_path_CAT+:} false; then :
1.446 +if test "${ac_cv_path_CAT+set}" = set; then :
1.447 $as_echo_n "(cached) " >&6
1.448 else
1.449 case $CAT in
1.450 @@ -3898,7 +3938,7 @@
1.451 set dummy $ac_prog; ac_word=$2
1.452 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.453 $as_echo_n "checking for $ac_word... " >&6; }
1.454 -if ${ac_cv_path_CHMOD+:} false; then :
1.455 +if test "${ac_cv_path_CHMOD+set}" = set; then :
1.456 $as_echo_n "(cached) " >&6
1.457 else
1.458 case $CHMOD in
1.459 @@ -3957,7 +3997,7 @@
1.460 set dummy $ac_prog; ac_word=$2
1.461 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.462 $as_echo_n "checking for $ac_word... " >&6; }
1.463 -if ${ac_cv_path_CMP+:} false; then :
1.464 +if test "${ac_cv_path_CMP+set}" = set; then :
1.465 $as_echo_n "(cached) " >&6
1.466 else
1.467 case $CMP in
1.468 @@ -4010,13 +4050,72 @@
1.469
1.470
1.471
1.472 + for ac_prog in comm
1.473 +do
1.474 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.475 +set dummy $ac_prog; ac_word=$2
1.476 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.477 +$as_echo_n "checking for $ac_word... " >&6; }
1.478 +if test "${ac_cv_path_COMM+set}" = set; then :
1.479 + $as_echo_n "(cached) " >&6
1.480 +else
1.481 + case $COMM in
1.482 + [\\/]* | ?:[\\/]*)
1.483 + ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
1.484 + ;;
1.485 + *)
1.486 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.487 +for as_dir in $PATH
1.488 +do
1.489 + IFS=$as_save_IFS
1.490 + test -z "$as_dir" && as_dir=.
1.491 + for ac_exec_ext in '' $ac_executable_extensions; do
1.492 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.493 + ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
1.494 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.495 + break 2
1.496 + fi
1.497 +done
1.498 + done
1.499 +IFS=$as_save_IFS
1.500 +
1.501 + ;;
1.502 +esac
1.503 +fi
1.504 +COMM=$ac_cv_path_COMM
1.505 +if test -n "$COMM"; then
1.506 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
1.507 +$as_echo "$COMM" >&6; }
1.508 +else
1.509 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.510 +$as_echo "no" >&6; }
1.511 +fi
1.512 +
1.513 +
1.514 + test -n "$COMM" && break
1.515 +done
1.516 +
1.517 +
1.518 + if test "x$COMM" = x; then
1.519 + if test "xcomm" = x; then
1.520 + PROG_NAME=comm
1.521 + else
1.522 + PROG_NAME=comm
1.523 + fi
1.524 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.525 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.526 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.527 + fi
1.528 +
1.529 +
1.530 +
1.531 for ac_prog in cp
1.532 do
1.533 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.534 set dummy $ac_prog; ac_word=$2
1.535 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.536 $as_echo_n "checking for $ac_word... " >&6; }
1.537 -if ${ac_cv_path_CP+:} false; then :
1.538 +if test "${ac_cv_path_CP+set}" = set; then :
1.539 $as_echo_n "(cached) " >&6
1.540 else
1.541 case $CP in
1.542 @@ -4069,13 +4168,72 @@
1.543
1.544
1.545
1.546 + for ac_prog in cpio
1.547 +do
1.548 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.549 +set dummy $ac_prog; ac_word=$2
1.550 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.551 +$as_echo_n "checking for $ac_word... " >&6; }
1.552 +if test "${ac_cv_path_CPIO+set}" = set; then :
1.553 + $as_echo_n "(cached) " >&6
1.554 +else
1.555 + case $CPIO in
1.556 + [\\/]* | ?:[\\/]*)
1.557 + ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
1.558 + ;;
1.559 + *)
1.560 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.561 +for as_dir in $PATH
1.562 +do
1.563 + IFS=$as_save_IFS
1.564 + test -z "$as_dir" && as_dir=.
1.565 + for ac_exec_ext in '' $ac_executable_extensions; do
1.566 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.567 + ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
1.568 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.569 + break 2
1.570 + fi
1.571 +done
1.572 + done
1.573 +IFS=$as_save_IFS
1.574 +
1.575 + ;;
1.576 +esac
1.577 +fi
1.578 +CPIO=$ac_cv_path_CPIO
1.579 +if test -n "$CPIO"; then
1.580 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
1.581 +$as_echo "$CPIO" >&6; }
1.582 +else
1.583 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.584 +$as_echo "no" >&6; }
1.585 +fi
1.586 +
1.587 +
1.588 + test -n "$CPIO" && break
1.589 +done
1.590 +
1.591 +
1.592 + if test "x$CPIO" = x; then
1.593 + if test "xcpio" = x; then
1.594 + PROG_NAME=cpio
1.595 + else
1.596 + PROG_NAME=cpio
1.597 + fi
1.598 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.599 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.600 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.601 + fi
1.602 +
1.603 +
1.604 +
1.605 for ac_prog in cut
1.606 do
1.607 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.608 set dummy $ac_prog; ac_word=$2
1.609 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.610 $as_echo_n "checking for $ac_word... " >&6; }
1.611 -if ${ac_cv_path_CUT+:} false; then :
1.612 +if test "${ac_cv_path_CUT+set}" = set; then :
1.613 $as_echo_n "(cached) " >&6
1.614 else
1.615 case $CUT in
1.616 @@ -4134,7 +4292,7 @@
1.617 set dummy $ac_prog; ac_word=$2
1.618 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.619 $as_echo_n "checking for $ac_word... " >&6; }
1.620 -if ${ac_cv_path_DATE+:} false; then :
1.621 +if test "${ac_cv_path_DATE+set}" = set; then :
1.622 $as_echo_n "(cached) " >&6
1.623 else
1.624 case $DATE in
1.625 @@ -4193,7 +4351,7 @@
1.626 set dummy $ac_prog; ac_word=$2
1.627 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.628 $as_echo_n "checking for $ac_word... " >&6; }
1.629 -if ${ac_cv_path_DIFF+:} false; then :
1.630 +if test "${ac_cv_path_DIFF+set}" = set; then :
1.631 $as_echo_n "(cached) " >&6
1.632 else
1.633 case $DIFF in
1.634 @@ -4252,7 +4410,7 @@
1.635 set dummy $ac_prog; ac_word=$2
1.636 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.637 $as_echo_n "checking for $ac_word... " >&6; }
1.638 -if ${ac_cv_path_DIRNAME+:} false; then :
1.639 +if test "${ac_cv_path_DIRNAME+set}" = set; then :
1.640 $as_echo_n "(cached) " >&6
1.641 else
1.642 case $DIRNAME in
1.643 @@ -4311,7 +4469,7 @@
1.644 set dummy $ac_prog; ac_word=$2
1.645 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.646 $as_echo_n "checking for $ac_word... " >&6; }
1.647 -if ${ac_cv_path_ECHO+:} false; then :
1.648 +if test "${ac_cv_path_ECHO+set}" = set; then :
1.649 $as_echo_n "(cached) " >&6
1.650 else
1.651 case $ECHO in
1.652 @@ -4370,7 +4528,7 @@
1.653 set dummy $ac_prog; ac_word=$2
1.654 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.655 $as_echo_n "checking for $ac_word... " >&6; }
1.656 -if ${ac_cv_path_EXPR+:} false; then :
1.657 +if test "${ac_cv_path_EXPR+set}" = set; then :
1.658 $as_echo_n "(cached) " >&6
1.659 else
1.660 case $EXPR in
1.661 @@ -4429,7 +4587,7 @@
1.662 set dummy $ac_prog; ac_word=$2
1.663 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.664 $as_echo_n "checking for $ac_word... " >&6; }
1.665 -if ${ac_cv_path_FILE+:} false; then :
1.666 +if test "${ac_cv_path_FILE+set}" = set; then :
1.667 $as_echo_n "(cached) " >&6
1.668 else
1.669 case $FILE in
1.670 @@ -4488,7 +4646,7 @@
1.671 set dummy $ac_prog; ac_word=$2
1.672 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.673 $as_echo_n "checking for $ac_word... " >&6; }
1.674 -if ${ac_cv_path_FIND+:} false; then :
1.675 +if test "${ac_cv_path_FIND+set}" = set; then :
1.676 $as_echo_n "(cached) " >&6
1.677 else
1.678 case $FIND in
1.679 @@ -4547,7 +4705,7 @@
1.680 set dummy $ac_prog; ac_word=$2
1.681 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.682 $as_echo_n "checking for $ac_word... " >&6; }
1.683 -if ${ac_cv_path_HEAD+:} false; then :
1.684 +if test "${ac_cv_path_HEAD+set}" = set; then :
1.685 $as_echo_n "(cached) " >&6
1.686 else
1.687 case $HEAD in
1.688 @@ -4606,7 +4764,7 @@
1.689 set dummy $ac_prog; ac_word=$2
1.690 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.691 $as_echo_n "checking for $ac_word... " >&6; }
1.692 -if ${ac_cv_path_LN+:} false; then :
1.693 +if test "${ac_cv_path_LN+set}" = set; then :
1.694 $as_echo_n "(cached) " >&6
1.695 else
1.696 case $LN in
1.697 @@ -4665,7 +4823,7 @@
1.698 set dummy $ac_prog; ac_word=$2
1.699 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.700 $as_echo_n "checking for $ac_word... " >&6; }
1.701 -if ${ac_cv_path_LS+:} false; then :
1.702 +if test "${ac_cv_path_LS+set}" = set; then :
1.703 $as_echo_n "(cached) " >&6
1.704 else
1.705 case $LS in
1.706 @@ -4724,7 +4882,7 @@
1.707 set dummy $ac_prog; ac_word=$2
1.708 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.709 $as_echo_n "checking for $ac_word... " >&6; }
1.710 -if ${ac_cv_path_MKDIR+:} false; then :
1.711 +if test "${ac_cv_path_MKDIR+set}" = set; then :
1.712 $as_echo_n "(cached) " >&6
1.713 else
1.714 case $MKDIR in
1.715 @@ -4783,7 +4941,7 @@
1.716 set dummy $ac_prog; ac_word=$2
1.717 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.718 $as_echo_n "checking for $ac_word... " >&6; }
1.719 -if ${ac_cv_path_MKTEMP+:} false; then :
1.720 +if test "${ac_cv_path_MKTEMP+set}" = set; then :
1.721 $as_echo_n "(cached) " >&6
1.722 else
1.723 case $MKTEMP in
1.724 @@ -4842,7 +5000,7 @@
1.725 set dummy $ac_prog; ac_word=$2
1.726 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.727 $as_echo_n "checking for $ac_word... " >&6; }
1.728 -if ${ac_cv_path_MV+:} false; then :
1.729 +if test "${ac_cv_path_MV+set}" = set; then :
1.730 $as_echo_n "(cached) " >&6
1.731 else
1.732 case $MV in
1.733 @@ -4901,7 +5059,7 @@
1.734 set dummy $ac_prog; ac_word=$2
1.735 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.736 $as_echo_n "checking for $ac_word... " >&6; }
1.737 -if ${ac_cv_path_PRINTF+:} false; then :
1.738 +if test "${ac_cv_path_PRINTF+set}" = set; then :
1.739 $as_echo_n "(cached) " >&6
1.740 else
1.741 case $PRINTF in
1.742 @@ -4960,7 +5118,7 @@
1.743 set dummy $ac_prog; ac_word=$2
1.744 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.745 $as_echo_n "checking for $ac_word... " >&6; }
1.746 -if ${ac_cv_path_THEPWDCMD+:} false; then :
1.747 +if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
1.748 $as_echo_n "(cached) " >&6
1.749 else
1.750 case $THEPWDCMD in
1.751 @@ -5019,7 +5177,7 @@
1.752 set dummy $ac_prog; ac_word=$2
1.753 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.754 $as_echo_n "checking for $ac_word... " >&6; }
1.755 -if ${ac_cv_path_RM+:} false; then :
1.756 +if test "${ac_cv_path_RM+set}" = set; then :
1.757 $as_echo_n "(cached) " >&6
1.758 else
1.759 case $RM in
1.760 @@ -5078,7 +5236,7 @@
1.761 set dummy $ac_prog; ac_word=$2
1.762 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.763 $as_echo_n "checking for $ac_word... " >&6; }
1.764 -if ${ac_cv_path_SH+:} false; then :
1.765 +if test "${ac_cv_path_SH+set}" = set; then :
1.766 $as_echo_n "(cached) " >&6
1.767 else
1.768 case $SH in
1.769 @@ -5137,7 +5295,7 @@
1.770 set dummy $ac_prog; ac_word=$2
1.771 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.772 $as_echo_n "checking for $ac_word... " >&6; }
1.773 -if ${ac_cv_path_SORT+:} false; then :
1.774 +if test "${ac_cv_path_SORT+set}" = set; then :
1.775 $as_echo_n "(cached) " >&6
1.776 else
1.777 case $SORT in
1.778 @@ -5196,7 +5354,7 @@
1.779 set dummy $ac_prog; ac_word=$2
1.780 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.781 $as_echo_n "checking for $ac_word... " >&6; }
1.782 -if ${ac_cv_path_TAIL+:} false; then :
1.783 +if test "${ac_cv_path_TAIL+set}" = set; then :
1.784 $as_echo_n "(cached) " >&6
1.785 else
1.786 case $TAIL in
1.787 @@ -5255,7 +5413,7 @@
1.788 set dummy $ac_prog; ac_word=$2
1.789 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.790 $as_echo_n "checking for $ac_word... " >&6; }
1.791 -if ${ac_cv_path_TAR+:} false; then :
1.792 +if test "${ac_cv_path_TAR+set}" = set; then :
1.793 $as_echo_n "(cached) " >&6
1.794 else
1.795 case $TAR in
1.796 @@ -5314,7 +5472,7 @@
1.797 set dummy $ac_prog; ac_word=$2
1.798 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.799 $as_echo_n "checking for $ac_word... " >&6; }
1.800 -if ${ac_cv_path_TEE+:} false; then :
1.801 +if test "${ac_cv_path_TEE+set}" = set; then :
1.802 $as_echo_n "(cached) " >&6
1.803 else
1.804 case $TEE in
1.805 @@ -5373,7 +5531,7 @@
1.806 set dummy $ac_prog; ac_word=$2
1.807 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.808 $as_echo_n "checking for $ac_word... " >&6; }
1.809 -if ${ac_cv_path_TOUCH+:} false; then :
1.810 +if test "${ac_cv_path_TOUCH+set}" = set; then :
1.811 $as_echo_n "(cached) " >&6
1.812 else
1.813 case $TOUCH in
1.814 @@ -5432,7 +5590,7 @@
1.815 set dummy $ac_prog; ac_word=$2
1.816 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.817 $as_echo_n "checking for $ac_word... " >&6; }
1.818 -if ${ac_cv_path_TR+:} false; then :
1.819 +if test "${ac_cv_path_TR+set}" = set; then :
1.820 $as_echo_n "(cached) " >&6
1.821 else
1.822 case $TR in
1.823 @@ -5491,7 +5649,7 @@
1.824 set dummy $ac_prog; ac_word=$2
1.825 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.826 $as_echo_n "checking for $ac_word... " >&6; }
1.827 -if ${ac_cv_path_UNAME+:} false; then :
1.828 +if test "${ac_cv_path_UNAME+set}" = set; then :
1.829 $as_echo_n "(cached) " >&6
1.830 else
1.831 case $UNAME in
1.832 @@ -5550,7 +5708,7 @@
1.833 set dummy $ac_prog; ac_word=$2
1.834 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.835 $as_echo_n "checking for $ac_word... " >&6; }
1.836 -if ${ac_cv_path_UNIQ+:} false; then :
1.837 +if test "${ac_cv_path_UNIQ+set}" = set; then :
1.838 $as_echo_n "(cached) " >&6
1.839 else
1.840 case $UNIQ in
1.841 @@ -5609,7 +5767,7 @@
1.842 set dummy $ac_prog; ac_word=$2
1.843 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.844 $as_echo_n "checking for $ac_word... " >&6; }
1.845 -if ${ac_cv_path_WC+:} false; then :
1.846 +if test "${ac_cv_path_WC+set}" = set; then :
1.847 $as_echo_n "(cached) " >&6
1.848 else
1.849 case $WC in
1.850 @@ -5668,7 +5826,7 @@
1.851 set dummy $ac_prog; ac_word=$2
1.852 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.853 $as_echo_n "checking for $ac_word... " >&6; }
1.854 -if ${ac_cv_path_WHICH+:} false; then :
1.855 +if test "${ac_cv_path_WHICH+set}" = set; then :
1.856 $as_echo_n "(cached) " >&6
1.857 else
1.858 case $WHICH in
1.859 @@ -5727,7 +5885,7 @@
1.860 set dummy $ac_prog; ac_word=$2
1.861 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.862 $as_echo_n "checking for $ac_word... " >&6; }
1.863 -if ${ac_cv_path_XARGS+:} false; then :
1.864 +if test "${ac_cv_path_XARGS+set}" = set; then :
1.865 $as_echo_n "(cached) " >&6
1.866 else
1.867 case $XARGS in
1.868 @@ -5787,7 +5945,7 @@
1.869 set dummy $ac_prog; ac_word=$2
1.870 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.871 $as_echo_n "checking for $ac_word... " >&6; }
1.872 -if ${ac_cv_prog_AWK+:} false; then :
1.873 +if test "${ac_cv_prog_AWK+set}" = set; then :
1.874 $as_echo_n "(cached) " >&6
1.875 else
1.876 if test -n "$AWK"; then
1.877 @@ -5837,7 +5995,7 @@
1.878
1.879 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
1.880 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
1.881 -if ${ac_cv_path_GREP+:} false; then :
1.882 +if test "${ac_cv_path_GREP+set}" = set; then :
1.883 $as_echo_n "(cached) " >&6
1.884 else
1.885 if test -z "$GREP"; then
1.886 @@ -5912,7 +6070,7 @@
1.887
1.888 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
1.889 $as_echo_n "checking for egrep... " >&6; }
1.890 -if ${ac_cv_path_EGREP+:} false; then :
1.891 +if test "${ac_cv_path_EGREP+set}" = set; then :
1.892 $as_echo_n "(cached) " >&6
1.893 else
1.894 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
1.895 @@ -5991,7 +6149,7 @@
1.896
1.897 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
1.898 $as_echo_n "checking for fgrep... " >&6; }
1.899 -if ${ac_cv_path_FGREP+:} false; then :
1.900 +if test "${ac_cv_path_FGREP+set}" = set; then :
1.901 $as_echo_n "(cached) " >&6
1.902 else
1.903 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
1.904 @@ -6070,7 +6228,7 @@
1.905
1.906 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
1.907 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
1.908 -if ${ac_cv_path_SED+:} false; then :
1.909 +if test "${ac_cv_path_SED+set}" = set; then :
1.910 $as_echo_n "(cached) " >&6
1.911 else
1.912 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
1.913 @@ -6156,7 +6314,7 @@
1.914 set dummy $ac_prog; ac_word=$2
1.915 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.916 $as_echo_n "checking for $ac_word... " >&6; }
1.917 -if ${ac_cv_path_NAWK+:} false; then :
1.918 +if test "${ac_cv_path_NAWK+set}" = set; then :
1.919 $as_echo_n "(cached) " >&6
1.920 else
1.921 case $NAWK in
1.922 @@ -6216,7 +6374,7 @@
1.923 set dummy cygpath; ac_word=$2
1.924 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.925 $as_echo_n "checking for $ac_word... " >&6; }
1.926 -if ${ac_cv_path_CYGPATH+:} false; then :
1.927 +if test "${ac_cv_path_CYGPATH+set}" = set; then :
1.928 $as_echo_n "(cached) " >&6
1.929 else
1.930 case $CYGPATH in
1.931 @@ -6256,7 +6414,7 @@
1.932 set dummy readlink; ac_word=$2
1.933 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.934 $as_echo_n "checking for $ac_word... " >&6; }
1.935 -if ${ac_cv_path_READLINK+:} false; then :
1.936 +if test "${ac_cv_path_READLINK+set}" = set; then :
1.937 $as_echo_n "(cached) " >&6
1.938 else
1.939 case $READLINK in
1.940 @@ -6296,7 +6454,7 @@
1.941 set dummy df; ac_word=$2
1.942 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.943 $as_echo_n "checking for $ac_word... " >&6; }
1.944 -if ${ac_cv_path_DF+:} false; then :
1.945 +if test "${ac_cv_path_DF+set}" = set; then :
1.946 $as_echo_n "(cached) " >&6
1.947 else
1.948 case $DF in
1.949 @@ -6336,7 +6494,7 @@
1.950 set dummy SetFile; ac_word=$2
1.951 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.952 $as_echo_n "checking for $ac_word... " >&6; }
1.953 -if ${ac_cv_path_SETFILE+:} false; then :
1.954 +if test "${ac_cv_path_SETFILE+set}" = set; then :
1.955 $as_echo_n "(cached) " >&6
1.956 else
1.957 case $SETFILE in
1.958 @@ -6382,7 +6540,7 @@
1.959
1.960 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
1.961 $as_echo_n "checking build system type... " >&6; }
1.962 -if ${ac_cv_build+:} false; then :
1.963 +if test "${ac_cv_build+set}" = set; then :
1.964 $as_echo_n "(cached) " >&6
1.965 else
1.966 ac_build_alias=$build_alias
1.967 @@ -6398,7 +6556,7 @@
1.968 $as_echo "$ac_cv_build" >&6; }
1.969 case $ac_cv_build in
1.970 *-*-*) ;;
1.971 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
1.972 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
1.973 esac
1.974 build=$ac_cv_build
1.975 ac_save_IFS=$IFS; IFS='-'
1.976 @@ -6416,7 +6574,7 @@
1.977
1.978 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
1.979 $as_echo_n "checking host system type... " >&6; }
1.980 -if ${ac_cv_host+:} false; then :
1.981 +if test "${ac_cv_host+set}" = set; then :
1.982 $as_echo_n "(cached) " >&6
1.983 else
1.984 if test "x$host_alias" = x; then
1.985 @@ -6431,7 +6589,7 @@
1.986 $as_echo "$ac_cv_host" >&6; }
1.987 case $ac_cv_host in
1.988 *-*-*) ;;
1.989 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
1.990 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
1.991 esac
1.992 host=$ac_cv_host
1.993 ac_save_IFS=$IFS; IFS='-'
1.994 @@ -6449,7 +6607,7 @@
1.995
1.996 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
1.997 $as_echo_n "checking target system type... " >&6; }
1.998 -if ${ac_cv_target+:} false; then :
1.999 +if test "${ac_cv_target+set}" = set; then :
1.1000 $as_echo_n "(cached) " >&6
1.1001 else
1.1002 if test "x$target_alias" = x; then
1.1003 @@ -6464,7 +6622,7 @@
1.1004 $as_echo "$ac_cv_target" >&6; }
1.1005 case $ac_cv_target in
1.1006 *-*-*) ;;
1.1007 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
1.1008 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
1.1009 esac
1.1010 target=$ac_cv_target
1.1011 ac_save_IFS=$IFS; IFS='-'
1.1012 @@ -7355,6 +7513,53 @@
1.1013
1.1014
1.1015
1.1016 +# Check if it's a pure open build or if custom sources are to be used.
1.1017 +
1.1018 + # Check whether --enable-openjdk-only was given.
1.1019 +if test "${enable_openjdk_only+set}" = set; then :
1.1020 + enableval=$enable_openjdk_only;
1.1021 +else
1.1022 + enable_openjdk_only="no"
1.1023 +fi
1.1024 +
1.1025 +
1.1026 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for presence of closed sources" >&5
1.1027 +$as_echo_n "checking for presence of closed sources... " >&6; }
1.1028 + if test -d "$SRC_ROOT/jdk/src/closed"; then
1.1029 + CLOSED_SOURCE_PRESENT=yes
1.1030 + else
1.1031 + CLOSED_SOURCE_PRESENT=no
1.1032 + fi
1.1033 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOSED_SOURCE_PRESENT" >&5
1.1034 +$as_echo "$CLOSED_SOURCE_PRESENT" >&6; }
1.1035 +
1.1036 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if closed source is suppressed (openjdk-only)" >&5
1.1037 +$as_echo_n "checking if closed source is suppressed (openjdk-only)... " >&6; }
1.1038 + SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only"
1.1039 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUPPRESS_CLOSED_SOURCE" >&5
1.1040 +$as_echo "$SUPPRESS_CLOSED_SOURCE" >&6; }
1.1041 +
1.1042 + if test "x$CLOSED_SOURCE_PRESENT" = xno; then
1.1043 + OPENJDK=true
1.1044 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
1.1045 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&5
1.1046 +$as_echo "$as_me: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&2;}
1.1047 + fi
1.1048 + else
1.1049 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then
1.1050 + OPENJDK=true
1.1051 + else
1.1052 + OPENJDK=false
1.1053 + fi
1.1054 + fi
1.1055 +
1.1056 + if test "x$OPENJDK" = "xtrue"; then
1.1057 + SET_OPENJDK="OPENJDK=true"
1.1058 + fi
1.1059 +
1.1060 +
1.1061 +
1.1062 +
1.1063 # These are needed to be able to create a configuration name (and thus the output directory)
1.1064
1.1065 ###############################################################################
1.1066 @@ -7584,7 +7789,7 @@
1.1067 # from configure, but only server is valid anyway. Fix this
1.1068 # when hotspot makefiles are rewritten.
1.1069 if test "x$MACOSX_UNIVERSAL" = xtrue; then
1.1070 - HOTSPOT_TARGET=universal_product
1.1071 + HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
1.1072 fi
1.1073
1.1074 #####
1.1075 @@ -7883,7 +8088,7 @@
1.1076 set dummy $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 ${ac_cv_prog_PKGHANDLER+:} false; then :
1.1080 +if test "${ac_cv_prog_PKGHANDLER+set}" = set; then :
1.1081 $as_echo_n "(cached) " >&6
1.1082 else
1.1083 if test -n "$PKGHANDLER"; then
1.1084 @@ -7985,7 +8190,7 @@
1.1085 # bat and cmd files are not always considered executable in cygwin causing which
1.1086 # to not find them
1.1087 if test "x$new_path" = x \
1.1088 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1089 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1090 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1091 new_path=`$CYGPATH -u "$path"`
1.1092 fi
1.1093 @@ -8001,7 +8206,7 @@
1.1094 # bat and cmd files are not always considered executable in cygwin causing which
1.1095 # to not find them
1.1096 if test "x$new_path" = x \
1.1097 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1098 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1099 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1100 new_path=`$CYGPATH -u "$path"`
1.1101 fi
1.1102 @@ -8248,7 +8453,7 @@
1.1103 set dummy $ac_prog; ac_word=$2
1.1104 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1105 $as_echo_n "checking for $ac_word... " >&6; }
1.1106 -if ${ac_cv_path_CHECK_GMAKE+:} false; then :
1.1107 +if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then :
1.1108 $as_echo_n "(cached) " >&6
1.1109 else
1.1110 case $CHECK_GMAKE in
1.1111 @@ -8342,7 +8547,7 @@
1.1112 # bat and cmd files are not always considered executable in cygwin causing which
1.1113 # to not find them
1.1114 if test "x$new_path" = x \
1.1115 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1116 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1117 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1118 new_path=`$CYGPATH -u "$path"`
1.1119 fi
1.1120 @@ -8358,7 +8563,7 @@
1.1121 # bat and cmd files are not always considered executable in cygwin causing which
1.1122 # to not find them
1.1123 if test "x$new_path" = x \
1.1124 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1125 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1126 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1127 new_path=`$CYGPATH -u "$path"`
1.1128 fi
1.1129 @@ -8602,7 +8807,7 @@
1.1130 set dummy $ac_prog; ac_word=$2
1.1131 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1132 $as_echo_n "checking for $ac_word... " >&6; }
1.1133 -if ${ac_cv_path_CHECK_MAKE+:} false; then :
1.1134 +if test "${ac_cv_path_CHECK_MAKE+set}" = set; then :
1.1135 $as_echo_n "(cached) " >&6
1.1136 else
1.1137 case $CHECK_MAKE in
1.1138 @@ -8696,7 +8901,7 @@
1.1139 # bat and cmd files are not always considered executable in cygwin causing which
1.1140 # to not find them
1.1141 if test "x$new_path" = x \
1.1142 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1143 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1144 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1145 new_path=`$CYGPATH -u "$path"`
1.1146 fi
1.1147 @@ -8712,7 +8917,7 @@
1.1148 # bat and cmd files are not always considered executable in cygwin causing which
1.1149 # to not find them
1.1150 if test "x$new_path" = x \
1.1151 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1152 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1153 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1154 new_path=`$CYGPATH -u "$path"`
1.1155 fi
1.1156 @@ -8961,7 +9166,7 @@
1.1157 set dummy $ac_prog; ac_word=$2
1.1158 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1159 $as_echo_n "checking for $ac_word... " >&6; }
1.1160 -if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then :
1.1161 +if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then :
1.1162 $as_echo_n "(cached) " >&6
1.1163 else
1.1164 case $CHECK_TOOLSDIR_GMAKE in
1.1165 @@ -9055,7 +9260,7 @@
1.1166 # bat and cmd files are not always considered executable in cygwin causing which
1.1167 # to not find them
1.1168 if test "x$new_path" = x \
1.1169 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1170 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1171 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1172 new_path=`$CYGPATH -u "$path"`
1.1173 fi
1.1174 @@ -9071,7 +9276,7 @@
1.1175 # bat and cmd files are not always considered executable in cygwin causing which
1.1176 # to not find them
1.1177 if test "x$new_path" = x \
1.1178 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1179 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1180 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1181 new_path=`$CYGPATH -u "$path"`
1.1182 fi
1.1183 @@ -9314,7 +9519,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 ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then :
1.1188 +if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then :
1.1189 $as_echo_n "(cached) " >&6
1.1190 else
1.1191 case $CHECK_TOOLSDIR_MAKE in
1.1192 @@ -9408,7 +9613,7 @@
1.1193 # bat and cmd files are not always considered executable in cygwin causing which
1.1194 # to not find them
1.1195 if test "x$new_path" = x \
1.1196 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1197 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1198 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1199 new_path=`$CYGPATH -u "$path"`
1.1200 fi
1.1201 @@ -9424,7 +9629,7 @@
1.1202 # bat and cmd files are not always considered executable in cygwin causing which
1.1203 # to not find them
1.1204 if test "x$new_path" = x \
1.1205 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1206 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1207 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1208 new_path=`$CYGPATH -u "$path"`
1.1209 fi
1.1210 @@ -9710,7 +9915,7 @@
1.1211 set dummy $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 ${ac_cv_path_UNZIP+:} false; then :
1.1215 +if test "${ac_cv_path_UNZIP+set}" = set; then :
1.1216 $as_echo_n "(cached) " >&6
1.1217 else
1.1218 case $UNZIP in
1.1219 @@ -9769,7 +9974,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 ${ac_cv_path_ZIP+:} false; then :
1.1224 +if test "${ac_cv_path_ZIP+set}" = set; then :
1.1225 $as_echo_n "(cached) " >&6
1.1226 else
1.1227 case $ZIP in
1.1228 @@ -9828,7 +10033,7 @@
1.1229 set dummy ldd; ac_word=$2
1.1230 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1231 $as_echo_n "checking for $ac_word... " >&6; }
1.1232 -if ${ac_cv_path_LDD+:} false; then :
1.1233 +if test "${ac_cv_path_LDD+set}" = set; then :
1.1234 $as_echo_n "(cached) " >&6
1.1235 else
1.1236 case $LDD in
1.1237 @@ -9874,7 +10079,7 @@
1.1238 set dummy otool; ac_word=$2
1.1239 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1240 $as_echo_n "checking for $ac_word... " >&6; }
1.1241 -if ${ac_cv_path_OTOOL+:} false; then :
1.1242 +if test "${ac_cv_path_OTOOL+set}" = set; then :
1.1243 $as_echo_n "(cached) " >&6
1.1244 else
1.1245 case $OTOOL in
1.1246 @@ -9919,7 +10124,7 @@
1.1247 set dummy $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 ${ac_cv_path_READELF+:} false; then :
1.1251 +if test "${ac_cv_path_READELF+set}" = set; then :
1.1252 $as_echo_n "(cached) " >&6
1.1253 else
1.1254 case $READELF in
1.1255 @@ -9962,7 +10167,7 @@
1.1256 set dummy hg; 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 ${ac_cv_path_HG+:} false; then :
1.1260 +if test "${ac_cv_path_HG+set}" = set; then :
1.1261 $as_echo_n "(cached) " >&6
1.1262 else
1.1263 case $HG in
1.1264 @@ -10002,7 +10207,7 @@
1.1265 set dummy stat; ac_word=$2
1.1266 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1267 $as_echo_n "checking for $ac_word... " >&6; }
1.1268 -if ${ac_cv_path_STAT+:} false; then :
1.1269 +if test "${ac_cv_path_STAT+set}" = set; then :
1.1270 $as_echo_n "(cached) " >&6
1.1271 else
1.1272 case $STAT in
1.1273 @@ -10042,7 +10247,7 @@
1.1274 set dummy time; ac_word=$2
1.1275 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1276 $as_echo_n "checking for $ac_word... " >&6; }
1.1277 -if ${ac_cv_path_TIME+:} false; then :
1.1278 +if test "${ac_cv_path_TIME+set}" = set; then :
1.1279 $as_echo_n "(cached) " >&6
1.1280 else
1.1281 case $TIME in
1.1282 @@ -10087,7 +10292,7 @@
1.1283 set dummy $ac_prog; 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 ${ac_cv_path_COMM+:} false; then :
1.1287 +if test "${ac_cv_path_COMM+set}" = set; then :
1.1288 $as_echo_n "(cached) " >&6
1.1289 else
1.1290 case $COMM in
1.1291 @@ -10151,7 +10356,7 @@
1.1292 set dummy ${ac_tool_prefix}pkg-config; 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 ${ac_cv_path_PKG_CONFIG+:} false; then :
1.1296 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
1.1297 $as_echo_n "(cached) " >&6
1.1298 else
1.1299 case $PKG_CONFIG in
1.1300 @@ -10194,7 +10399,7 @@
1.1301 set dummy pkg-config; 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 ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
1.1305 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
1.1306 $as_echo_n "(cached) " >&6
1.1307 else
1.1308 case $ac_pt_PKG_CONFIG in
1.1309 @@ -10367,7 +10572,7 @@
1.1310 set dummy $ac_prog; 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 ${ac_cv_prog_BDEPS_UNZIP+:} false; then :
1.1314 +if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then :
1.1315 $as_echo_n "(cached) " >&6
1.1316 else
1.1317 if test -n "$BDEPS_UNZIP"; then
1.1318 @@ -10413,7 +10618,7 @@
1.1319 set dummy $ac_prog; 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 ${ac_cv_prog_BDEPS_FTP+:} false; then :
1.1323 +if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then :
1.1324 $as_echo_n "(cached) " >&6
1.1325 else
1.1326 if test -n "$BDEPS_FTP"; then
1.1327 @@ -10462,54 +10667,6 @@
1.1328
1.1329 ###############################################################################
1.1330 #
1.1331 -# Should we build only OpenJDK even if closed sources are present?
1.1332 -#
1.1333 -# Check whether --enable-openjdk-only was given.
1.1334 -if test "${enable_openjdk_only+set}" = set; then :
1.1335 - enableval=$enable_openjdk_only;
1.1336 -else
1.1337 - enable_openjdk_only="no"
1.1338 -fi
1.1339 -
1.1340 -
1.1341 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for presence of closed sources" >&5
1.1342 -$as_echo_n "checking for presence of closed sources... " >&6; }
1.1343 -if test -d "$SRC_ROOT/jdk/src/closed"; then
1.1344 - CLOSED_SOURCE_PRESENT=yes
1.1345 -else
1.1346 - CLOSED_SOURCE_PRESENT=no
1.1347 -fi
1.1348 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOSED_SOURCE_PRESENT" >&5
1.1349 -$as_echo "$CLOSED_SOURCE_PRESENT" >&6; }
1.1350 -
1.1351 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if closed source is supressed (openjdk-only)" >&5
1.1352 -$as_echo_n "checking if closed source is supressed (openjdk-only)... " >&6; }
1.1353 -SUPRESS_CLOSED_SOURCE="$enable_openjdk_only"
1.1354 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUPRESS_CLOSED_SOURCE" >&5
1.1355 -$as_echo "$SUPRESS_CLOSED_SOURCE" >&6; }
1.1356 -
1.1357 -if test "x$CLOSED_SOURCE_PRESENT" = xno; then
1.1358 - OPENJDK=true
1.1359 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
1.1360 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&5
1.1361 -$as_echo "$as_me: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&2;}
1.1362 - fi
1.1363 -else
1.1364 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then
1.1365 - OPENJDK=true
1.1366 - else
1.1367 - OPENJDK=false
1.1368 - fi
1.1369 -fi
1.1370 -
1.1371 -if test "x$OPENJDK" = "xtrue"; then
1.1372 - SET_OPENJDK="OPENJDK=true"
1.1373 -fi
1.1374 -
1.1375 -
1.1376 -
1.1377 -###############################################################################
1.1378 -#
1.1379 # Should we build a JDK/JVM with headful support (ie a graphical ui)?
1.1380 # We always build headless support.
1.1381 #
1.1382 @@ -10608,10 +10765,56 @@
1.1383
1.1384
1.1385 # Source the version numbers
1.1386 -. $AUTOCONF_DIR/version.numbers
1.1387 -if test "x$OPENJDK" = "xfalse"; then
1.1388 - . $AUTOCONF_DIR/closed.version.numbers
1.1389 -fi
1.1390 +. $AUTOCONF_DIR/version-numbers
1.1391 +
1.1392 +# Get the settings from parameters
1.1393 +
1.1394 +# Check whether --with-milestone was given.
1.1395 +if test "${with_milestone+set}" = set; then :
1.1396 + withval=$with_milestone;
1.1397 +fi
1.1398 +
1.1399 +if test "x$with_milestone" = xyes; then
1.1400 + as_fn_error $? "Milestone must have a value" "$LINENO" 5
1.1401 +elif test "x$with_milestone" != x; then
1.1402 + MILESTONE="$with_milestone"
1.1403 +else
1.1404 + MILESTONE=internal
1.1405 +fi
1.1406 +
1.1407 +
1.1408 +# Check whether --with-build-number was given.
1.1409 +if test "${with_build_number+set}" = set; then :
1.1410 + withval=$with_build_number;
1.1411 +fi
1.1412 +
1.1413 +if test "x$with_build_number" = xyes; then
1.1414 + as_fn_error $? "Build number must have a value" "$LINENO" 5
1.1415 +elif test "x$with_build_number" != x; then
1.1416 + JDK_BUILD_NUMBER="$with_build_number"
1.1417 +fi
1.1418 +if test "x$JDK_BUILD_NUMBER" = x; then
1.1419 + JDK_BUILD_NUMBER=b00
1.1420 +fi
1.1421 +
1.1422 +
1.1423 +# Check whether --with-user-release-suffix was given.
1.1424 +if test "${with_user_release_suffix+set}" = set; then :
1.1425 + withval=$with_user_release_suffix;
1.1426 +fi
1.1427 +
1.1428 +if test "x$with_user_release_suffix" = xyes; then
1.1429 + as_fn_error $? "Release suffix must have a value" "$LINENO" 5
1.1430 +elif test "x$with_user_release_suffix" != x; then
1.1431 + USER_RELEASE_SUFFIX="$with_user_release_suffix"
1.1432 +else
1.1433 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.1434 + # Avoid [:alnum:] since it depends on the locale.
1.1435 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.1436 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1437 +fi
1.1438 +
1.1439 +
1.1440 # Now set the JDK version, milestone, build number etc.
1.1441
1.1442
1.1443 @@ -10630,33 +10833,12 @@
1.1444 COPYRIGHT_YEAR=`date +'%Y'`
1.1445
1.1446
1.1447 -RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX"
1.1448 -
1.1449 -
1.1450 if test "x$JDK_UPDATE_VERSION" != x; then
1.1451 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.1452 -else
1.1453 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
1.1454 -fi
1.1455 -
1.1456 -
1.1457 -if test "x$MILESTONE" != x; then
1.1458 - RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}"
1.1459 -else
1.1460 - RELEASE="${JDK_VERSION}${BUILD_VARIANT_RELEASE}"
1.1461 -fi
1.1462 -
1.1463 -
1.1464 -if test "x$JDK_BUILD_NUMBER" != x; then
1.1465 - FULL_VERSION="${RELEASE}-${JDK_BUILD_NUMBER}"
1.1466 -else
1.1467 - JDK_BUILD_NUMBER=b00
1.1468 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
1.1469 - # Avoid [:alnum:] since it depends on the locale.
1.1470 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
1.1471 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1.1472 - FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}"
1.1473 -fi
1.1474 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.1475 +else
1.1476 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
1.1477 +fi
1.1478 +
1.1479
1.1480 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
1.1481
1.1482 @@ -11702,7 +11884,7 @@
1.1483 set dummy javac; ac_word=$2
1.1484 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1485 $as_echo_n "checking for $ac_word... " >&6; }
1.1486 -if ${ac_cv_path_JAVAC_CHECK+:} false; then :
1.1487 +if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then :
1.1488 $as_echo_n "(cached) " >&6
1.1489 else
1.1490 case $JAVAC_CHECK in
1.1491 @@ -11742,7 +11924,7 @@
1.1492 set dummy java; ac_word=$2
1.1493 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1494 $as_echo_n "checking for $ac_word... " >&6; }
1.1495 -if ${ac_cv_path_JAVA_CHECK+:} false; then :
1.1496 +if test "${ac_cv_path_JAVA_CHECK+set}" = set; then :
1.1497 $as_echo_n "(cached) " >&6
1.1498 else
1.1499 case $JAVA_CHECK in
1.1500 @@ -15801,7 +15983,7 @@
1.1501 set dummy link; ac_word=$2
1.1502 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1503 $as_echo_n "checking for $ac_word... " >&6; }
1.1504 -if ${ac_cv_path_CYGWIN_LINK+:} false; then :
1.1505 +if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then :
1.1506 $as_echo_n "(cached) " >&6
1.1507 else
1.1508 case $CYGWIN_LINK in
1.1509 @@ -16248,7 +16430,7 @@
1.1510 # bat and cmd files are not always considered executable in cygwin causing which
1.1511 # to not find them
1.1512 if test "x$new_path" = x \
1.1513 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1514 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1515 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1516 new_path=`$CYGPATH -u "$path"`
1.1517 fi
1.1518 @@ -16264,7 +16446,7 @@
1.1519 # bat and cmd files are not always considered executable in cygwin causing which
1.1520 # to not find them
1.1521 if test "x$new_path" = x \
1.1522 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1523 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1524 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1525 new_path=`$CYGPATH -u "$path"`
1.1526 fi
1.1527 @@ -16790,7 +16972,7 @@
1.1528 set dummy $ac_prog; ac_word=$2
1.1529 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1530 $as_echo_n "checking for $ac_word... " >&6; }
1.1531 -if ${ac_cv_path_BUILD_CC+:} false; then :
1.1532 +if test "${ac_cv_path_BUILD_CC+set}" = set; then :
1.1533 $as_echo_n "(cached) " >&6
1.1534 else
1.1535 case $BUILD_CC in
1.1536 @@ -16848,7 +17030,7 @@
1.1537 # bat and cmd files are not always considered executable in cygwin causing which
1.1538 # to not find them
1.1539 if test "x$new_path" = x \
1.1540 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1541 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1542 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1543 new_path=`$CYGPATH -u "$path"`
1.1544 fi
1.1545 @@ -16864,7 +17046,7 @@
1.1546 # bat and cmd files are not always considered executable in cygwin causing which
1.1547 # to not find them
1.1548 if test "x$new_path" = x \
1.1549 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1550 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1551 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1552 new_path=`$CYGPATH -u "$path"`
1.1553 fi
1.1554 @@ -17101,7 +17283,7 @@
1.1555 set dummy $ac_prog; ac_word=$2
1.1556 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1557 $as_echo_n "checking for $ac_word... " >&6; }
1.1558 -if ${ac_cv_path_BUILD_CXX+:} false; then :
1.1559 +if test "${ac_cv_path_BUILD_CXX+set}" = set; then :
1.1560 $as_echo_n "(cached) " >&6
1.1561 else
1.1562 case $BUILD_CXX in
1.1563 @@ -17159,7 +17341,7 @@
1.1564 # bat and cmd files are not always considered executable in cygwin causing which
1.1565 # to not find them
1.1566 if test "x$new_path" = x \
1.1567 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1568 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1569 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1570 new_path=`$CYGPATH -u "$path"`
1.1571 fi
1.1572 @@ -17175,7 +17357,7 @@
1.1573 # bat and cmd files are not always considered executable in cygwin causing which
1.1574 # to not find them
1.1575 if test "x$new_path" = x \
1.1576 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1577 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1578 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1579 new_path=`$CYGPATH -u "$path"`
1.1580 fi
1.1581 @@ -17410,7 +17592,7 @@
1.1582 set dummy ld; ac_word=$2
1.1583 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1584 $as_echo_n "checking for $ac_word... " >&6; }
1.1585 -if ${ac_cv_path_BUILD_LD+:} false; then :
1.1586 +if test "${ac_cv_path_BUILD_LD+set}" = set; then :
1.1587 $as_echo_n "(cached) " >&6
1.1588 else
1.1589 case $BUILD_LD in
1.1590 @@ -17465,7 +17647,7 @@
1.1591 # bat and cmd files are not always considered executable in cygwin causing which
1.1592 # to not find them
1.1593 if test "x$new_path" = x \
1.1594 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1595 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1596 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1597 new_path=`$CYGPATH -u "$path"`
1.1598 fi
1.1599 @@ -17481,7 +17663,7 @@
1.1600 # bat and cmd files are not always considered executable in cygwin causing which
1.1601 # to not find them
1.1602 if test "x$new_path" = x \
1.1603 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1604 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1605 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1606 new_path=`$CYGPATH -u "$path"`
1.1607 fi
1.1608 @@ -17922,7 +18104,7 @@
1.1609 set dummy $ac_prog; ac_word=$2
1.1610 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1611 $as_echo_n "checking for $ac_word... " >&6; }
1.1612 -if ${ac_cv_path_TOOLS_DIR_CC+:} false; then :
1.1613 +if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then :
1.1614 $as_echo_n "(cached) " >&6
1.1615 else
1.1616 case $TOOLS_DIR_CC in
1.1617 @@ -17974,7 +18156,7 @@
1.1618 set dummy $ac_prog; ac_word=$2
1.1619 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1620 $as_echo_n "checking for $ac_word... " >&6; }
1.1621 -if ${ac_cv_path_POTENTIAL_CC+:} false; then :
1.1622 +if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then :
1.1623 $as_echo_n "(cached) " >&6
1.1624 else
1.1625 case $POTENTIAL_CC in
1.1626 @@ -18063,7 +18245,7 @@
1.1627 # bat and cmd files are not always considered executable in cygwin causing which
1.1628 # to not find them
1.1629 if test "x$new_path" = x \
1.1630 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1631 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1632 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1633 new_path=`$CYGPATH -u "$path"`
1.1634 fi
1.1635 @@ -18079,7 +18261,7 @@
1.1636 # bat and cmd files are not always considered executable in cygwin causing which
1.1637 # to not find them
1.1638 if test "x$new_path" = x \
1.1639 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1640 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1641 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1642 new_path=`$CYGPATH -u "$path"`
1.1643 fi
1.1644 @@ -18387,7 +18569,7 @@
1.1645 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.1646 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1647 $as_echo_n "checking for $ac_word... " >&6; }
1.1648 -if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then :
1.1649 +if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then :
1.1650 $as_echo_n "(cached) " >&6
1.1651 else
1.1652 if test -n "$PROPER_COMPILER_CC"; then
1.1653 @@ -18431,7 +18613,7 @@
1.1654 set dummy $ac_prog; ac_word=$2
1.1655 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1656 $as_echo_n "checking for $ac_word... " >&6; }
1.1657 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then :
1.1658 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then :
1.1659 $as_echo_n "(cached) " >&6
1.1660 else
1.1661 if test -n "$ac_ct_PROPER_COMPILER_CC"; then
1.1662 @@ -18499,7 +18681,7 @@
1.1663 # bat and cmd files are not always considered executable in cygwin causing which
1.1664 # to not find them
1.1665 if test "x$new_path" = x \
1.1666 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1667 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1668 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1669 new_path=`$CYGPATH -u "$path"`
1.1670 fi
1.1671 @@ -18515,7 +18697,7 @@
1.1672 # bat and cmd files are not always considered executable in cygwin causing which
1.1673 # to not find them
1.1674 if test "x$new_path" = x \
1.1675 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1676 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1677 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1678 new_path=`$CYGPATH -u "$path"`
1.1679 fi
1.1680 @@ -18881,7 +19063,7 @@
1.1681 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.1682 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1683 $as_echo_n "checking for $ac_word... " >&6; }
1.1684 -if ${ac_cv_prog_CC+:} false; then :
1.1685 +if test "${ac_cv_prog_CC+set}" = set; then :
1.1686 $as_echo_n "(cached) " >&6
1.1687 else
1.1688 if test -n "$CC"; then
1.1689 @@ -18925,7 +19107,7 @@
1.1690 set dummy $ac_prog; ac_word=$2
1.1691 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1692 $as_echo_n "checking for $ac_word... " >&6; }
1.1693 -if ${ac_cv_prog_ac_ct_CC+:} false; then :
1.1694 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
1.1695 $as_echo_n "(cached) " >&6
1.1696 else
1.1697 if test -n "$ac_ct_CC"; then
1.1698 @@ -18978,7 +19160,7 @@
1.1699 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.1700 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.1701 as_fn_error $? "no acceptable C compiler found in \$PATH
1.1702 -See \`config.log' for more details" "$LINENO" 5; }
1.1703 +See \`config.log' for more details" "$LINENO" 5 ; }
1.1704
1.1705 # Provide some information about the compiler.
1.1706 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
1.1707 @@ -19093,7 +19275,7 @@
1.1708 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.1709 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.1710 as_fn_error 77 "C compiler cannot create executables
1.1711 -See \`config.log' for more details" "$LINENO" 5; }
1.1712 +See \`config.log' for more details" "$LINENO" 5 ; }
1.1713 else
1.1714 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1.1715 $as_echo "yes" >&6; }
1.1716 @@ -19136,7 +19318,7 @@
1.1717 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.1718 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.1719 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
1.1720 -See \`config.log' for more details" "$LINENO" 5; }
1.1721 +See \`config.log' for more details" "$LINENO" 5 ; }
1.1722 fi
1.1723 rm -f conftest conftest$ac_cv_exeext
1.1724 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
1.1725 @@ -19195,7 +19377,7 @@
1.1726 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.1727 as_fn_error $? "cannot run C compiled programs.
1.1728 If you meant to cross compile, use \`--host'.
1.1729 -See \`config.log' for more details" "$LINENO" 5; }
1.1730 +See \`config.log' for more details" "$LINENO" 5 ; }
1.1731 fi
1.1732 fi
1.1733 fi
1.1734 @@ -19206,7 +19388,7 @@
1.1735 ac_clean_files=$ac_clean_files_save
1.1736 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
1.1737 $as_echo_n "checking for suffix of object files... " >&6; }
1.1738 -if ${ac_cv_objext+:} false; then :
1.1739 +if test "${ac_cv_objext+set}" = set; then :
1.1740 $as_echo_n "(cached) " >&6
1.1741 else
1.1742 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.1743 @@ -19247,7 +19429,7 @@
1.1744 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.1745 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.1746 as_fn_error $? "cannot compute suffix of object files: cannot compile
1.1747 -See \`config.log' for more details" "$LINENO" 5; }
1.1748 +See \`config.log' for more details" "$LINENO" 5 ; }
1.1749 fi
1.1750 rm -f conftest.$ac_cv_objext conftest.$ac_ext
1.1751 fi
1.1752 @@ -19257,7 +19439,7 @@
1.1753 ac_objext=$OBJEXT
1.1754 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
1.1755 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1.1756 -if ${ac_cv_c_compiler_gnu+:} false; then :
1.1757 +if test "${ac_cv_c_compiler_gnu+set}" = set; then :
1.1758 $as_echo_n "(cached) " >&6
1.1759 else
1.1760 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.1761 @@ -19294,7 +19476,7 @@
1.1762 ac_save_CFLAGS=$CFLAGS
1.1763 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
1.1764 $as_echo_n "checking whether $CC accepts -g... " >&6; }
1.1765 -if ${ac_cv_prog_cc_g+:} false; then :
1.1766 +if test "${ac_cv_prog_cc_g+set}" = set; then :
1.1767 $as_echo_n "(cached) " >&6
1.1768 else
1.1769 ac_save_c_werror_flag=$ac_c_werror_flag
1.1770 @@ -19372,7 +19554,7 @@
1.1771 fi
1.1772 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
1.1773 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
1.1774 -if ${ac_cv_prog_cc_c89+:} false; then :
1.1775 +if test "${ac_cv_prog_cc_c89+set}" = set; then :
1.1776 $as_echo_n "(cached) " >&6
1.1777 else
1.1778 ac_cv_prog_cc_c89=no
1.1779 @@ -19491,7 +19673,7 @@
1.1780 set dummy $ac_prog; ac_word=$2
1.1781 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1782 $as_echo_n "checking for $ac_word... " >&6; }
1.1783 -if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then :
1.1784 +if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then :
1.1785 $as_echo_n "(cached) " >&6
1.1786 else
1.1787 case $TOOLS_DIR_CXX in
1.1788 @@ -19543,7 +19725,7 @@
1.1789 set dummy $ac_prog; ac_word=$2
1.1790 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1791 $as_echo_n "checking for $ac_word... " >&6; }
1.1792 -if ${ac_cv_path_POTENTIAL_CXX+:} false; then :
1.1793 +if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then :
1.1794 $as_echo_n "(cached) " >&6
1.1795 else
1.1796 case $POTENTIAL_CXX in
1.1797 @@ -19632,7 +19814,7 @@
1.1798 # bat and cmd files are not always considered executable in cygwin causing which
1.1799 # to not find them
1.1800 if test "x$new_path" = x \
1.1801 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1802 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1803 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1804 new_path=`$CYGPATH -u "$path"`
1.1805 fi
1.1806 @@ -19648,7 +19830,7 @@
1.1807 # bat and cmd files are not always considered executable in cygwin causing which
1.1808 # to not find them
1.1809 if test "x$new_path" = x \
1.1810 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1811 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1812 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1813 new_path=`$CYGPATH -u "$path"`
1.1814 fi
1.1815 @@ -19956,7 +20138,7 @@
1.1816 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.1817 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1818 $as_echo_n "checking for $ac_word... " >&6; }
1.1819 -if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then :
1.1820 +if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then :
1.1821 $as_echo_n "(cached) " >&6
1.1822 else
1.1823 if test -n "$PROPER_COMPILER_CXX"; then
1.1824 @@ -20000,7 +20182,7 @@
1.1825 set dummy $ac_prog; ac_word=$2
1.1826 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1827 $as_echo_n "checking for $ac_word... " >&6; }
1.1828 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then :
1.1829 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then :
1.1830 $as_echo_n "(cached) " >&6
1.1831 else
1.1832 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then
1.1833 @@ -20068,7 +20250,7 @@
1.1834 # bat and cmd files are not always considered executable in cygwin causing which
1.1835 # to not find them
1.1836 if test "x$new_path" = x \
1.1837 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1838 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1839 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1840 new_path=`$CYGPATH -u "$path"`
1.1841 fi
1.1842 @@ -20084,7 +20266,7 @@
1.1843 # bat and cmd files are not always considered executable in cygwin causing which
1.1844 # to not find them
1.1845 if test "x$new_path" = x \
1.1846 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1847 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1848 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1849 new_path=`$CYGPATH -u "$path"`
1.1850 fi
1.1851 @@ -20454,7 +20636,7 @@
1.1852 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.1853 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1854 $as_echo_n "checking for $ac_word... " >&6; }
1.1855 -if ${ac_cv_prog_CXX+:} false; then :
1.1856 +if test "${ac_cv_prog_CXX+set}" = set; then :
1.1857 $as_echo_n "(cached) " >&6
1.1858 else
1.1859 if test -n "$CXX"; then
1.1860 @@ -20498,7 +20680,7 @@
1.1861 set dummy $ac_prog; ac_word=$2
1.1862 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1863 $as_echo_n "checking for $ac_word... " >&6; }
1.1864 -if ${ac_cv_prog_ac_ct_CXX+:} false; then :
1.1865 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
1.1866 $as_echo_n "(cached) " >&6
1.1867 else
1.1868 if test -n "$ac_ct_CXX"; then
1.1869 @@ -20576,7 +20758,7 @@
1.1870
1.1871 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
1.1872 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
1.1873 -if ${ac_cv_cxx_compiler_gnu+:} false; then :
1.1874 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
1.1875 $as_echo_n "(cached) " >&6
1.1876 else
1.1877 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.1878 @@ -20613,7 +20795,7 @@
1.1879 ac_save_CXXFLAGS=$CXXFLAGS
1.1880 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
1.1881 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
1.1882 -if ${ac_cv_prog_cxx_g+:} false; then :
1.1883 +if test "${ac_cv_prog_cxx_g+set}" = set; then :
1.1884 $as_echo_n "(cached) " >&6
1.1885 else
1.1886 ac_save_cxx_werror_flag=$ac_cxx_werror_flag
1.1887 @@ -20711,7 +20893,7 @@
1.1888 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.1889 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1890 $as_echo_n "checking for $ac_word... " >&6; }
1.1891 -if ${ac_cv_prog_OBJC+:} false; then :
1.1892 +if test "${ac_cv_prog_OBJC+set}" = set; then :
1.1893 $as_echo_n "(cached) " >&6
1.1894 else
1.1895 if test -n "$OBJC"; then
1.1896 @@ -20755,7 +20937,7 @@
1.1897 set dummy $ac_prog; ac_word=$2
1.1898 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1899 $as_echo_n "checking for $ac_word... " >&6; }
1.1900 -if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
1.1901 +if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then :
1.1902 $as_echo_n "(cached) " >&6
1.1903 else
1.1904 if test -n "$ac_ct_OBJC"; then
1.1905 @@ -20831,7 +21013,7 @@
1.1906
1.1907 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
1.1908 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
1.1909 -if ${ac_cv_objc_compiler_gnu+:} false; then :
1.1910 +if test "${ac_cv_objc_compiler_gnu+set}" = set; then :
1.1911 $as_echo_n "(cached) " >&6
1.1912 else
1.1913 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.1914 @@ -20868,7 +21050,7 @@
1.1915 ac_save_OBJCFLAGS=$OBJCFLAGS
1.1916 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
1.1917 $as_echo_n "checking whether $OBJC accepts -g... " >&6; }
1.1918 -if ${ac_cv_prog_objc_g+:} false; then :
1.1919 +if test "${ac_cv_prog_objc_g+set}" = set; then :
1.1920 $as_echo_n "(cached) " >&6
1.1921 else
1.1922 ac_save_objc_werror_flag=$ac_objc_werror_flag
1.1923 @@ -20969,7 +21151,7 @@
1.1924 # bat and cmd files are not always considered executable in cygwin causing which
1.1925 # to not find them
1.1926 if test "x$new_path" = x \
1.1927 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1928 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1929 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1930 new_path=`$CYGPATH -u "$path"`
1.1931 fi
1.1932 @@ -20985,7 +21167,7 @@
1.1933 # bat and cmd files are not always considered executable in cygwin causing which
1.1934 # to not find them
1.1935 if test "x$new_path" = x \
1.1936 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1937 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1938 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1939 new_path=`$CYGPATH -u "$path"`
1.1940 fi
1.1941 @@ -21244,7 +21426,7 @@
1.1942 set dummy ${ac_tool_prefix}ar; ac_word=$2
1.1943 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1944 $as_echo_n "checking for $ac_word... " >&6; }
1.1945 -if ${ac_cv_prog_AR+:} false; then :
1.1946 +if test "${ac_cv_prog_AR+set}" = set; then :
1.1947 $as_echo_n "(cached) " >&6
1.1948 else
1.1949 if test -n "$AR"; then
1.1950 @@ -21284,7 +21466,7 @@
1.1951 set dummy ar; ac_word=$2
1.1952 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1953 $as_echo_n "checking for $ac_word... " >&6; }
1.1954 -if ${ac_cv_prog_ac_ct_AR+:} false; then :
1.1955 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
1.1956 $as_echo_n "(cached) " >&6
1.1957 else
1.1958 if test -n "$ac_ct_AR"; then
1.1959 @@ -21350,7 +21532,7 @@
1.1960 # bat and cmd files are not always considered executable in cygwin causing which
1.1961 # to not find them
1.1962 if test "x$new_path" = x \
1.1963 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1964 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1965 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1966 new_path=`$CYGPATH -u "$path"`
1.1967 fi
1.1968 @@ -21366,7 +21548,7 @@
1.1969 # bat and cmd files are not always considered executable in cygwin causing which
1.1970 # to not find them
1.1971 if test "x$new_path" = x \
1.1972 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1973 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1974 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1975 new_path=`$CYGPATH -u "$path"`
1.1976 fi
1.1977 @@ -21626,7 +21808,7 @@
1.1978 set dummy link; ac_word=$2
1.1979 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.1980 $as_echo_n "checking for $ac_word... " >&6; }
1.1981 -if ${ac_cv_prog_WINLD+:} false; then :
1.1982 +if test "${ac_cv_prog_WINLD+set}" = set; then :
1.1983 $as_echo_n "(cached) " >&6
1.1984 else
1.1985 if test -n "$WINLD"; then
1.1986 @@ -21697,7 +21879,7 @@
1.1987 # bat and cmd files are not always considered executable in cygwin causing which
1.1988 # to not find them
1.1989 if test "x$new_path" = x \
1.1990 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1991 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.1992 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.1993 new_path=`$CYGPATH -u "$path"`
1.1994 fi
1.1995 @@ -21713,7 +21895,7 @@
1.1996 # bat and cmd files are not always considered executable in cygwin causing which
1.1997 # to not find them
1.1998 if test "x$new_path" = x \
1.1999 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2000 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2001 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2002 new_path=`$CYGPATH -u "$path"`
1.2003 fi
1.2004 @@ -21965,7 +22147,7 @@
1.2005 set dummy mt; ac_word=$2
1.2006 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2007 $as_echo_n "checking for $ac_word... " >&6; }
1.2008 -if ${ac_cv_prog_MT+:} false; then :
1.2009 +if test "${ac_cv_prog_MT+set}" = set; then :
1.2010 $as_echo_n "(cached) " >&6
1.2011 else
1.2012 if test -n "$MT"; then
1.2013 @@ -22034,7 +22216,7 @@
1.2014 # bat and cmd files are not always considered executable in cygwin causing which
1.2015 # to not find them
1.2016 if test "x$new_path" = x \
1.2017 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2018 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2019 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2020 new_path=`$CYGPATH -u "$path"`
1.2021 fi
1.2022 @@ -22050,7 +22232,7 @@
1.2023 # bat and cmd files are not always considered executable in cygwin causing which
1.2024 # to not find them
1.2025 if test "x$new_path" = x \
1.2026 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2027 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2028 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2029 new_path=`$CYGPATH -u "$path"`
1.2030 fi
1.2031 @@ -22286,7 +22468,7 @@
1.2032 set dummy rc; ac_word=$2
1.2033 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2034 $as_echo_n "checking for $ac_word... " >&6; }
1.2035 -if ${ac_cv_prog_RC+:} false; then :
1.2036 +if test "${ac_cv_prog_RC+set}" = set; then :
1.2037 $as_echo_n "(cached) " >&6
1.2038 else
1.2039 if test -n "$RC"; then
1.2040 @@ -22355,7 +22537,7 @@
1.2041 # bat and cmd files are not always considered executable in cygwin causing which
1.2042 # to not find them
1.2043 if test "x$new_path" = x \
1.2044 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2045 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2046 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2047 new_path=`$CYGPATH -u "$path"`
1.2048 fi
1.2049 @@ -22371,7 +22553,7 @@
1.2050 # bat and cmd files are not always considered executable in cygwin causing which
1.2051 # to not find them
1.2052 if test "x$new_path" = x \
1.2053 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2054 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2055 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2056 new_path=`$CYGPATH -u "$path"`
1.2057 fi
1.2058 @@ -22677,7 +22859,7 @@
1.2059 set dummy lib; ac_word=$2
1.2060 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2061 $as_echo_n "checking for $ac_word... " >&6; }
1.2062 -if ${ac_cv_prog_WINAR+:} false; then :
1.2063 +if test "${ac_cv_prog_WINAR+set}" = set; then :
1.2064 $as_echo_n "(cached) " >&6
1.2065 else
1.2066 if test -n "$WINAR"; then
1.2067 @@ -22729,7 +22911,7 @@
1.2068 # bat and cmd files are not always considered executable in cygwin causing which
1.2069 # to not find them
1.2070 if test "x$new_path" = x \
1.2071 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2072 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2073 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2074 new_path=`$CYGPATH -u "$path"`
1.2075 fi
1.2076 @@ -22745,7 +22927,7 @@
1.2077 # bat and cmd files are not always considered executable in cygwin causing which
1.2078 # to not find them
1.2079 if test "x$new_path" = x \
1.2080 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2081 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2082 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2083 new_path=`$CYGPATH -u "$path"`
1.2084 fi
1.2085 @@ -22983,7 +23165,7 @@
1.2086 set dummy dumpbin; ac_word=$2
1.2087 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2088 $as_echo_n "checking for $ac_word... " >&6; }
1.2089 -if ${ac_cv_prog_DUMPBIN+:} false; then :
1.2090 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
1.2091 $as_echo_n "(cached) " >&6
1.2092 else
1.2093 if test -n "$DUMPBIN"; then
1.2094 @@ -23035,7 +23217,7 @@
1.2095 # bat and cmd files are not always considered executable in cygwin causing which
1.2096 # to not find them
1.2097 if test "x$new_path" = x \
1.2098 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2099 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2100 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2101 new_path=`$CYGPATH -u "$path"`
1.2102 fi
1.2103 @@ -23051,7 +23233,7 @@
1.2104 # bat and cmd files are not always considered executable in cygwin causing which
1.2105 # to not find them
1.2106 if test "x$new_path" = x \
1.2107 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2108 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2109 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2110 new_path=`$CYGPATH -u "$path"`
1.2111 fi
1.2112 @@ -23302,7 +23484,7 @@
1.2113 CPP=
1.2114 fi
1.2115 if test -z "$CPP"; then
1.2116 - if ${ac_cv_prog_CPP+:} false; then :
1.2117 + if test "${ac_cv_prog_CPP+set}" = set; then :
1.2118 $as_echo_n "(cached) " >&6
1.2119 else
1.2120 # Double quotes because CPP needs to be expanded
1.2121 @@ -23418,7 +23600,7 @@
1.2122 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.2123 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.2124 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
1.2125 -See \`config.log' for more details" "$LINENO" 5; }
1.2126 +See \`config.log' for more details" "$LINENO" 5 ; }
1.2127 fi
1.2128
1.2129 ac_ext=cpp
1.2130 @@ -23446,7 +23628,7 @@
1.2131 # bat and cmd files are not always considered executable in cygwin causing which
1.2132 # to not find them
1.2133 if test "x$new_path" = x \
1.2134 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2135 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2136 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2137 new_path=`$CYGPATH -u "$path"`
1.2138 fi
1.2139 @@ -23462,7 +23644,7 @@
1.2140 # bat and cmd files are not always considered executable in cygwin causing which
1.2141 # to not find them
1.2142 if test "x$new_path" = x \
1.2143 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2144 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2145 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2146 new_path=`$CYGPATH -u "$path"`
1.2147 fi
1.2148 @@ -23702,7 +23884,7 @@
1.2149 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
1.2150 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
1.2151 if test -z "$CXXCPP"; then
1.2152 - if ${ac_cv_prog_CXXCPP+:} false; then :
1.2153 + if test "${ac_cv_prog_CXXCPP+set}" = set; then :
1.2154 $as_echo_n "(cached) " >&6
1.2155 else
1.2156 # Double quotes because CXXCPP needs to be expanded
1.2157 @@ -23818,7 +24000,7 @@
1.2158 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.2159 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.2160 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
1.2161 -See \`config.log' for more details" "$LINENO" 5; }
1.2162 +See \`config.log' for more details" "$LINENO" 5 ; }
1.2163 fi
1.2164
1.2165 ac_ext=cpp
1.2166 @@ -23846,7 +24028,7 @@
1.2167 # bat and cmd files are not always considered executable in cygwin causing which
1.2168 # to not find them
1.2169 if test "x$new_path" = x \
1.2170 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2171 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2172 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2173 new_path=`$CYGPATH -u "$path"`
1.2174 fi
1.2175 @@ -23862,7 +24044,7 @@
1.2176 # bat and cmd files are not always considered executable in cygwin causing which
1.2177 # to not find them
1.2178 if test "x$new_path" = x \
1.2179 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2180 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2181 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2182 new_path=`$CYGPATH -u "$path"`
1.2183 fi
1.2184 @@ -24120,7 +24302,7 @@
1.2185 set dummy as; ac_word=$2
1.2186 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2187 $as_echo_n "checking for $ac_word... " >&6; }
1.2188 -if ${ac_cv_path_AS+:} false; then :
1.2189 +if test "${ac_cv_path_AS+set}" = set; then :
1.2190 $as_echo_n "(cached) " >&6
1.2191 else
1.2192 case $AS in
1.2193 @@ -24175,7 +24357,7 @@
1.2194 # bat and cmd files are not always considered executable in cygwin causing which
1.2195 # to not find them
1.2196 if test "x$new_path" = x \
1.2197 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2198 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2199 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2200 new_path=`$CYGPATH -u "$path"`
1.2201 fi
1.2202 @@ -24191,7 +24373,7 @@
1.2203 # bat and cmd files are not always considered executable in cygwin causing which
1.2204 # to not find them
1.2205 if test "x$new_path" = x \
1.2206 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2207 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2208 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2209 new_path=`$CYGPATH -u "$path"`
1.2210 fi
1.2211 @@ -24434,7 +24616,7 @@
1.2212 set dummy $ac_prog; ac_word=$2
1.2213 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2214 $as_echo_n "checking for $ac_word... " >&6; }
1.2215 -if ${ac_cv_path_NM+:} false; then :
1.2216 +if test "${ac_cv_path_NM+set}" = set; then :
1.2217 $as_echo_n "(cached) " >&6
1.2218 else
1.2219 case $NM in
1.2220 @@ -24492,7 +24674,7 @@
1.2221 # bat and cmd files are not always considered executable in cygwin causing which
1.2222 # to not find them
1.2223 if test "x$new_path" = x \
1.2224 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2225 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2226 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2227 new_path=`$CYGPATH -u "$path"`
1.2228 fi
1.2229 @@ -24508,7 +24690,7 @@
1.2230 # bat and cmd files are not always considered executable in cygwin causing which
1.2231 # to not find them
1.2232 if test "x$new_path" = x \
1.2233 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2234 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2235 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2236 new_path=`$CYGPATH -u "$path"`
1.2237 fi
1.2238 @@ -24743,7 +24925,7 @@
1.2239 set dummy strip; ac_word=$2
1.2240 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2241 $as_echo_n "checking for $ac_word... " >&6; }
1.2242 -if ${ac_cv_path_STRIP+:} false; then :
1.2243 +if test "${ac_cv_path_STRIP+set}" = set; then :
1.2244 $as_echo_n "(cached) " >&6
1.2245 else
1.2246 case $STRIP in
1.2247 @@ -24798,7 +24980,7 @@
1.2248 # bat and cmd files are not always considered executable in cygwin causing which
1.2249 # to not find them
1.2250 if test "x$new_path" = x \
1.2251 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2252 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2253 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2254 new_path=`$CYGPATH -u "$path"`
1.2255 fi
1.2256 @@ -24814,7 +24996,7 @@
1.2257 # bat and cmd files are not always considered executable in cygwin causing which
1.2258 # to not find them
1.2259 if test "x$new_path" = x \
1.2260 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2261 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2262 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2263 new_path=`$CYGPATH -u "$path"`
1.2264 fi
1.2265 @@ -25049,7 +25231,7 @@
1.2266 set dummy mcs; ac_word=$2
1.2267 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2268 $as_echo_n "checking for $ac_word... " >&6; }
1.2269 -if ${ac_cv_path_MCS+:} false; then :
1.2270 +if test "${ac_cv_path_MCS+set}" = set; then :
1.2271 $as_echo_n "(cached) " >&6
1.2272 else
1.2273 case $MCS in
1.2274 @@ -25104,7 +25286,7 @@
1.2275 # bat and cmd files are not always considered executable in cygwin causing which
1.2276 # to not find them
1.2277 if test "x$new_path" = x \
1.2278 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2279 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2280 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2281 new_path=`$CYGPATH -u "$path"`
1.2282 fi
1.2283 @@ -25120,7 +25302,7 @@
1.2284 # bat and cmd files are not always considered executable in cygwin causing which
1.2285 # to not find them
1.2286 if test "x$new_path" = x \
1.2287 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2288 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2289 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2290 new_path=`$CYGPATH -u "$path"`
1.2291 fi
1.2292 @@ -25357,7 +25539,7 @@
1.2293 set dummy ${ac_tool_prefix}nm; ac_word=$2
1.2294 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2295 $as_echo_n "checking for $ac_word... " >&6; }
1.2296 -if ${ac_cv_prog_NM+:} false; then :
1.2297 +if test "${ac_cv_prog_NM+set}" = set; then :
1.2298 $as_echo_n "(cached) " >&6
1.2299 else
1.2300 if test -n "$NM"; then
1.2301 @@ -25397,7 +25579,7 @@
1.2302 set dummy nm; ac_word=$2
1.2303 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2304 $as_echo_n "checking for $ac_word... " >&6; }
1.2305 -if ${ac_cv_prog_ac_ct_NM+:} false; then :
1.2306 +if test "${ac_cv_prog_ac_ct_NM+set}" = set; then :
1.2307 $as_echo_n "(cached) " >&6
1.2308 else
1.2309 if test -n "$ac_ct_NM"; then
1.2310 @@ -25463,7 +25645,7 @@
1.2311 # bat and cmd files are not always considered executable in cygwin causing which
1.2312 # to not find them
1.2313 if test "x$new_path" = x \
1.2314 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2315 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2316 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2317 new_path=`$CYGPATH -u "$path"`
1.2318 fi
1.2319 @@ -25479,7 +25661,7 @@
1.2320 # bat and cmd files are not always considered executable in cygwin causing which
1.2321 # to not find them
1.2322 if test "x$new_path" = x \
1.2323 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2324 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2325 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2326 new_path=`$CYGPATH -u "$path"`
1.2327 fi
1.2328 @@ -25715,7 +25897,7 @@
1.2329 set dummy ${ac_tool_prefix}strip; ac_word=$2
1.2330 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2331 $as_echo_n "checking for $ac_word... " >&6; }
1.2332 -if ${ac_cv_prog_STRIP+:} false; then :
1.2333 +if test "${ac_cv_prog_STRIP+set}" = set; then :
1.2334 $as_echo_n "(cached) " >&6
1.2335 else
1.2336 if test -n "$STRIP"; then
1.2337 @@ -25755,7 +25937,7 @@
1.2338 set dummy strip; ac_word=$2
1.2339 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2340 $as_echo_n "checking for $ac_word... " >&6; }
1.2341 -if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
1.2342 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
1.2343 $as_echo_n "(cached) " >&6
1.2344 else
1.2345 if test -n "$ac_ct_STRIP"; then
1.2346 @@ -25821,7 +26003,7 @@
1.2347 # bat and cmd files are not always considered executable in cygwin causing which
1.2348 # to not find them
1.2349 if test "x$new_path" = x \
1.2350 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2351 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2352 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2353 new_path=`$CYGPATH -u "$path"`
1.2354 fi
1.2355 @@ -25837,7 +26019,7 @@
1.2356 # bat and cmd files are not always considered executable in cygwin causing which
1.2357 # to not find them
1.2358 if test "x$new_path" = x \
1.2359 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2360 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2361 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2362 new_path=`$CYGPATH -u "$path"`
1.2363 fi
1.2364 @@ -26080,7 +26262,7 @@
1.2365 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.2366 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2367 $as_echo_n "checking for $ac_word... " >&6; }
1.2368 -if ${ac_cv_prog_OBJCOPY+:} false; then :
1.2369 +if test "${ac_cv_prog_OBJCOPY+set}" = set; then :
1.2370 $as_echo_n "(cached) " >&6
1.2371 else
1.2372 if test -n "$OBJCOPY"; then
1.2373 @@ -26124,7 +26306,7 @@
1.2374 set dummy $ac_prog; ac_word=$2
1.2375 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2376 $as_echo_n "checking for $ac_word... " >&6; }
1.2377 -if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then :
1.2378 +if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then :
1.2379 $as_echo_n "(cached) " >&6
1.2380 else
1.2381 if test -n "$ac_ct_OBJCOPY"; then
1.2382 @@ -26194,7 +26376,7 @@
1.2383 # bat and cmd files are not always considered executable in cygwin causing which
1.2384 # to not find them
1.2385 if test "x$new_path" = x \
1.2386 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2387 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2388 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2389 new_path=`$CYGPATH -u "$path"`
1.2390 fi
1.2391 @@ -26210,7 +26392,7 @@
1.2392 # bat and cmd files are not always considered executable in cygwin causing which
1.2393 # to not find them
1.2394 if test "x$new_path" = x \
1.2395 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2396 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2397 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2398 new_path=`$CYGPATH -u "$path"`
1.2399 fi
1.2400 @@ -26451,7 +26633,7 @@
1.2401 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1.2402 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2403 $as_echo_n "checking for $ac_word... " >&6; }
1.2404 -if ${ac_cv_prog_OBJDUMP+:} false; then :
1.2405 +if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
1.2406 $as_echo_n "(cached) " >&6
1.2407 else
1.2408 if test -n "$OBJDUMP"; then
1.2409 @@ -26495,7 +26677,7 @@
1.2410 set dummy $ac_prog; ac_word=$2
1.2411 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2412 $as_echo_n "checking for $ac_word... " >&6; }
1.2413 -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
1.2414 +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
1.2415 $as_echo_n "(cached) " >&6
1.2416 else
1.2417 if test -n "$ac_ct_OBJDUMP"; then
1.2418 @@ -26565,7 +26747,7 @@
1.2419 # bat and cmd files are not always considered executable in cygwin causing which
1.2420 # to not find them
1.2421 if test "x$new_path" = x \
1.2422 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2423 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2424 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2425 new_path=`$CYGPATH -u "$path"`
1.2426 fi
1.2427 @@ -26581,7 +26763,7 @@
1.2428 # bat and cmd files are not always considered executable in cygwin causing which
1.2429 # to not find them
1.2430 if test "x$new_path" = x \
1.2431 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2432 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2433 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2434 new_path=`$CYGPATH -u "$path"`
1.2435 fi
1.2436 @@ -26819,7 +27001,7 @@
1.2437 set dummy lipo; ac_word=$2
1.2438 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2439 $as_echo_n "checking for $ac_word... " >&6; }
1.2440 -if ${ac_cv_path_LIPO+:} false; then :
1.2441 +if test "${ac_cv_path_LIPO+set}" = set; then :
1.2442 $as_echo_n "(cached) " >&6
1.2443 else
1.2444 case $LIPO in
1.2445 @@ -26874,7 +27056,7 @@
1.2446 # bat and cmd files are not always considered executable in cygwin causing which
1.2447 # to not find them
1.2448 if test "x$new_path" = x \
1.2449 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2450 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2451 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2452 new_path=`$CYGPATH -u "$path"`
1.2453 fi
1.2454 @@ -26890,7 +27072,7 @@
1.2455 # bat and cmd files are not always considered executable in cygwin causing which
1.2456 # to not find them
1.2457 if test "x$new_path" = x \
1.2458 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2459 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \
1.2460 && test "x`$LS \"$path\" 2>/dev/null`" != x; then
1.2461 new_path=`$CYGPATH -u "$path"`
1.2462 fi
1.2463 @@ -27134,7 +27316,7 @@
1.2464
1.2465 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
1.2466 $as_echo_n "checking for ANSI C header files... " >&6; }
1.2467 -if ${ac_cv_header_stdc+:} false; then :
1.2468 +if test "${ac_cv_header_stdc+set}" = set; then :
1.2469 $as_echo_n "(cached) " >&6
1.2470 else
1.2471 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.2472 @@ -27310,7 +27492,7 @@
1.2473 for ac_header in stdio.h
1.2474 do :
1.2475 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
1.2476 -if test "x$ac_cv_header_stdio_h" = xyes; then :
1.2477 +if test "x$ac_cv_header_stdio_h" = x""yes; then :
1.2478 cat >>confdefs.h <<_ACEOF
1.2479 #define HAVE_STDIO_H 1
1.2480 _ACEOF
1.2481 @@ -27339,7 +27521,7 @@
1.2482 # This bug is HP SR number 8606223364.
1.2483 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5
1.2484 $as_echo_n "checking size of int *... " >&6; }
1.2485 -if ${ac_cv_sizeof_int_p+:} false; then :
1.2486 +if test "${ac_cv_sizeof_int_p+set}" = set; then :
1.2487 $as_echo_n "(cached) " >&6
1.2488 else
1.2489 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then :
1.2490 @@ -27349,7 +27531,7 @@
1.2491 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1.2492 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1.2493 as_fn_error 77 "cannot compute sizeof (int *)
1.2494 -See \`config.log' for more details" "$LINENO" 5; }
1.2495 +See \`config.log' for more details" "$LINENO" 5 ; }
1.2496 else
1.2497 ac_cv_sizeof_int_p=0
1.2498 fi
1.2499 @@ -27396,7 +27578,7 @@
1.2500 #
1.2501 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
1.2502 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
1.2503 -if ${ac_cv_c_bigendian+:} false; then :
1.2504 +if test "${ac_cv_c_bigendian+set}" = set; then :
1.2505 $as_echo_n "(cached) " >&6
1.2506 else
1.2507 ac_cv_c_bigendian=unknown
1.2508 @@ -28396,8 +28578,8 @@
1.2509 have_x=disabled
1.2510 else
1.2511 case $x_includes,$x_libraries in #(
1.2512 - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
1.2513 - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
1.2514 + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
1.2515 + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
1.2516 $as_echo_n "(cached) " >&6
1.2517 else
1.2518 # One or both of the vars are not set, and there is no cached value.
1.2519 @@ -28674,7 +28856,7 @@
1.2520 else
1.2521 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
1.2522 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
1.2523 -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
1.2524 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
1.2525 $as_echo_n "(cached) " >&6
1.2526 else
1.2527 ac_check_lib_save_LIBS=$LIBS
1.2528 @@ -28708,14 +28890,14 @@
1.2529 fi
1.2530 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
1.2531 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
1.2532 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
1.2533 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
1.2534 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
1.2535 fi
1.2536
1.2537 if test $ac_cv_lib_dnet_dnet_ntoa = no; then
1.2538 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
1.2539 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
1.2540 -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then :
1.2541 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
1.2542 $as_echo_n "(cached) " >&6
1.2543 else
1.2544 ac_check_lib_save_LIBS=$LIBS
1.2545 @@ -28749,7 +28931,7 @@
1.2546 fi
1.2547 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
1.2548 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
1.2549 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then :
1.2550 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
1.2551 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
1.2552 fi
1.2553
1.2554 @@ -28768,14 +28950,14 @@
1.2555 # The functions gethostbyname, getservbyname, and inet_addr are
1.2556 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
1.2557 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
1.2558 -if test "x$ac_cv_func_gethostbyname" = xyes; then :
1.2559 +if test "x$ac_cv_func_gethostbyname" = x""yes; then :
1.2560
1.2561 fi
1.2562
1.2563 if test $ac_cv_func_gethostbyname = no; then
1.2564 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
1.2565 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
1.2566 -if ${ac_cv_lib_nsl_gethostbyname+:} false; then :
1.2567 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
1.2568 $as_echo_n "(cached) " >&6
1.2569 else
1.2570 ac_check_lib_save_LIBS=$LIBS
1.2571 @@ -28809,14 +28991,14 @@
1.2572 fi
1.2573 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
1.2574 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
1.2575 -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then :
1.2576 +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
1.2577 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
1.2578 fi
1.2579
1.2580 if test $ac_cv_lib_nsl_gethostbyname = no; then
1.2581 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
1.2582 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
1.2583 -if ${ac_cv_lib_bsd_gethostbyname+:} false; then :
1.2584 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
1.2585 $as_echo_n "(cached) " >&6
1.2586 else
1.2587 ac_check_lib_save_LIBS=$LIBS
1.2588 @@ -28850,7 +29032,7 @@
1.2589 fi
1.2590 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
1.2591 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
1.2592 -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then :
1.2593 +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
1.2594 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
1.2595 fi
1.2596
1.2597 @@ -28865,14 +29047,14 @@
1.2598 # must be given before -lnsl if both are needed. We assume that
1.2599 # if connect needs -lnsl, so does gethostbyname.
1.2600 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect"
1.2601 -if test "x$ac_cv_func_connect" = xyes; then :
1.2602 +if test "x$ac_cv_func_connect" = x""yes; then :
1.2603
1.2604 fi
1.2605
1.2606 if test $ac_cv_func_connect = no; then
1.2607 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
1.2608 $as_echo_n "checking for connect in -lsocket... " >&6; }
1.2609 -if ${ac_cv_lib_socket_connect+:} false; then :
1.2610 +if test "${ac_cv_lib_socket_connect+set}" = set; then :
1.2611 $as_echo_n "(cached) " >&6
1.2612 else
1.2613 ac_check_lib_save_LIBS=$LIBS
1.2614 @@ -28906,7 +29088,7 @@
1.2615 fi
1.2616 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
1.2617 $as_echo "$ac_cv_lib_socket_connect" >&6; }
1.2618 -if test "x$ac_cv_lib_socket_connect" = xyes; then :
1.2619 +if test "x$ac_cv_lib_socket_connect" = x""yes; then :
1.2620 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
1.2621 fi
1.2622
1.2623 @@ -28914,14 +29096,14 @@
1.2624
1.2625 # Guillermo Gomez says -lposix is necessary on A/UX.
1.2626 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove"
1.2627 -if test "x$ac_cv_func_remove" = xyes; then :
1.2628 +if test "x$ac_cv_func_remove" = x""yes; then :
1.2629
1.2630 fi
1.2631
1.2632 if test $ac_cv_func_remove = no; then
1.2633 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
1.2634 $as_echo_n "checking for remove in -lposix... " >&6; }
1.2635 -if ${ac_cv_lib_posix_remove+:} false; then :
1.2636 +if test "${ac_cv_lib_posix_remove+set}" = set; then :
1.2637 $as_echo_n "(cached) " >&6
1.2638 else
1.2639 ac_check_lib_save_LIBS=$LIBS
1.2640 @@ -28955,7 +29137,7 @@
1.2641 fi
1.2642 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
1.2643 $as_echo "$ac_cv_lib_posix_remove" >&6; }
1.2644 -if test "x$ac_cv_lib_posix_remove" = xyes; then :
1.2645 +if test "x$ac_cv_lib_posix_remove" = x""yes; then :
1.2646 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
1.2647 fi
1.2648
1.2649 @@ -28963,14 +29145,14 @@
1.2650
1.2651 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
1.2652 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
1.2653 -if test "x$ac_cv_func_shmat" = xyes; then :
1.2654 +if test "x$ac_cv_func_shmat" = x""yes; then :
1.2655
1.2656 fi
1.2657
1.2658 if test $ac_cv_func_shmat = no; then
1.2659 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
1.2660 $as_echo_n "checking for shmat in -lipc... " >&6; }
1.2661 -if ${ac_cv_lib_ipc_shmat+:} false; then :
1.2662 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
1.2663 $as_echo_n "(cached) " >&6
1.2664 else
1.2665 ac_check_lib_save_LIBS=$LIBS
1.2666 @@ -29004,7 +29186,7 @@
1.2667 fi
1.2668 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
1.2669 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
1.2670 -if test "x$ac_cv_lib_ipc_shmat" = xyes; then :
1.2671 +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
1.2672 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
1.2673 fi
1.2674
1.2675 @@ -29022,7 +29204,7 @@
1.2676 # John Interrante, Karl Berry
1.2677 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
1.2678 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
1.2679 -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then :
1.2680 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
1.2681 $as_echo_n "(cached) " >&6
1.2682 else
1.2683 ac_check_lib_save_LIBS=$LIBS
1.2684 @@ -29056,7 +29238,7 @@
1.2685 fi
1.2686 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
1.2687 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
1.2688 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then :
1.2689 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
1.2690 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
1.2691 fi
1.2692
1.2693 @@ -30063,7 +30245,7 @@
1.2694 LDFLAGS="$FREETYPE2_LIBS"
1.2695 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5
1.2696 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; }
1.2697 -if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
1.2698 +if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then :
1.2699 $as_echo_n "(cached) " >&6
1.2700 else
1.2701 ac_check_lib_save_LIBS=$LIBS
1.2702 @@ -30097,7 +30279,7 @@
1.2703 fi
1.2704 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
1.2705 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
1.2706 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then :
1.2707 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then :
1.2708 FREETYPE2_FOUND=true
1.2709 else
1.2710 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5
1.2711 @@ -30385,7 +30567,7 @@
1.2712 for ac_header in alsa/asoundlib.h
1.2713 do :
1.2714 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default"
1.2715 -if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
1.2716 +if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then :
1.2717 cat >>confdefs.h <<_ACEOF
1.2718 #define HAVE_ALSA_ASOUNDLIB_H 1
1.2719 _ACEOF
1.2720 @@ -30444,7 +30626,7 @@
1.2721 USE_EXTERNAL_LIBJPEG=true
1.2722 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5
1.2723 $as_echo_n "checking for main in -ljpeg... " >&6; }
1.2724 -if ${ac_cv_lib_jpeg_main+:} false; then :
1.2725 +if test "${ac_cv_lib_jpeg_main+set}" = set; then :
1.2726 $as_echo_n "(cached) " >&6
1.2727 else
1.2728 ac_check_lib_save_LIBS=$LIBS
1.2729 @@ -30472,7 +30654,7 @@
1.2730 fi
1.2731 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5
1.2732 $as_echo "$ac_cv_lib_jpeg_main" >&6; }
1.2733 -if test "x$ac_cv_lib_jpeg_main" = xyes; then :
1.2734 +if test "x$ac_cv_lib_jpeg_main" = x""yes; then :
1.2735 cat >>confdefs.h <<_ACEOF
1.2736 #define HAVE_LIBJPEG 1
1.2737 _ACEOF
1.2738 @@ -30496,7 +30678,7 @@
1.2739 USE_EXTERNAL_LIBJPEG=true
1.2740 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5
1.2741 $as_echo_n "checking for main in -lgif... " >&6; }
1.2742 -if ${ac_cv_lib_gif_main+:} false; then :
1.2743 +if test "${ac_cv_lib_gif_main+set}" = set; then :
1.2744 $as_echo_n "(cached) " >&6
1.2745 else
1.2746 ac_check_lib_save_LIBS=$LIBS
1.2747 @@ -30524,7 +30706,7 @@
1.2748 fi
1.2749 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5
1.2750 $as_echo "$ac_cv_lib_gif_main" >&6; }
1.2751 -if test "x$ac_cv_lib_gif_main" = xyes; then :
1.2752 +if test "x$ac_cv_lib_gif_main" = x""yes; then :
1.2753 cat >>confdefs.h <<_ACEOF
1.2754 #define HAVE_LIBGIF 1
1.2755 _ACEOF
1.2756 @@ -30554,7 +30736,7 @@
1.2757
1.2758 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
1.2759 $as_echo_n "checking for compress in -lz... " >&6; }
1.2760 -if ${ac_cv_lib_z_compress+:} false; then :
1.2761 +if test "${ac_cv_lib_z_compress+set}" = set; then :
1.2762 $as_echo_n "(cached) " >&6
1.2763 else
1.2764 ac_check_lib_save_LIBS=$LIBS
1.2765 @@ -30588,7 +30770,7 @@
1.2766 fi
1.2767 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
1.2768 $as_echo "$ac_cv_lib_z_compress" >&6; }
1.2769 -if test "x$ac_cv_lib_z_compress" = xyes; then :
1.2770 +if test "x$ac_cv_lib_z_compress" = x""yes; then :
1.2771 ZLIB_FOUND=yes
1.2772 else
1.2773 ZLIB_FOUND=no
1.2774 @@ -30681,7 +30863,7 @@
1.2775
1.2776 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5
1.2777 $as_echo_n "checking for cos in -lm... " >&6; }
1.2778 -if ${ac_cv_lib_m_cos+:} false; then :
1.2779 +if test "${ac_cv_lib_m_cos+set}" = set; then :
1.2780 $as_echo_n "(cached) " >&6
1.2781 else
1.2782 ac_check_lib_save_LIBS=$LIBS
1.2783 @@ -30715,7 +30897,7 @@
1.2784 fi
1.2785 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5
1.2786 $as_echo "$ac_cv_lib_m_cos" >&6; }
1.2787 -if test "x$ac_cv_lib_m_cos" = xyes; then :
1.2788 +if test "x$ac_cv_lib_m_cos" = x""yes; then :
1.2789 cat >>confdefs.h <<_ACEOF
1.2790 #define HAVE_LIBM 1
1.2791 _ACEOF
1.2792 @@ -30739,7 +30921,7 @@
1.2793 LIBS=""
1.2794 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
1.2795 $as_echo_n "checking for dlopen in -ldl... " >&6; }
1.2796 -if ${ac_cv_lib_dl_dlopen+:} false; then :
1.2797 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
1.2798 $as_echo_n "(cached) " >&6
1.2799 else
1.2800 ac_check_lib_save_LIBS=$LIBS
1.2801 @@ -30773,7 +30955,7 @@
1.2802 fi
1.2803 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
1.2804 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
1.2805 -if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
1.2806 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
1.2807 cat >>confdefs.h <<_ACEOF
1.2808 #define HAVE_LIBDL 1
1.2809 _ACEOF
1.2810 @@ -31010,7 +31192,7 @@
1.2811 # The name of the Service Agent jar.
1.2812 SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
1.2813 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.2814 - SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
1.2815 + SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
1.2816 fi
1.2817
1.2818
1.2819 @@ -31417,7 +31599,7 @@
1.2820 set dummy ccache; ac_word=$2
1.2821 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.2822 $as_echo_n "checking for $ac_word... " >&6; }
1.2823 -if ${ac_cv_path_CCACHE+:} false; then :
1.2824 +if test "${ac_cv_path_CCACHE+set}" = set; then :
1.2825 $as_echo_n "(cached) " >&6
1.2826 else
1.2827 case $CCACHE in
1.2828 @@ -31546,6 +31728,14 @@
1.2829
1.2830 # Check for some common pitfalls
1.2831
1.2832 + if test x"$OPENJDK_BUILD_OS" = xwindows; then
1.2833 + file_to_test="$SRC_ROOT/LICENSE"
1.2834 + if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
1.2835 + as_fn_error $? "Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin." "$LINENO" 5
1.2836 + fi
1.2837 + fi
1.2838 +
1.2839 +
1.2840
1.2841 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if build directory is on local disk" >&5
1.2842 $as_echo_n "checking if build directory is on local disk... " >&6; }
1.2843 @@ -31576,6 +31766,8 @@
1.2844 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_DIR_IS_LOCAL" >&5
1.2845 $as_echo "$OUTPUT_DIR_IS_LOCAL" >&6; }
1.2846
1.2847 +
1.2848 +
1.2849 # Check if the user has any old-style ALT_ variables set.
1.2850 FOUND_ALT_VARIABLES=`env | grep ^ALT_`
1.2851
1.2852 @@ -31668,21 +31860,10 @@
1.2853 :end' >>confcache
1.2854 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
1.2855 if test -w "$cache_file"; then
1.2856 - if test "x$cache_file" != "x/dev/null"; then
1.2857 + test "x$cache_file" != "x/dev/null" &&
1.2858 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
1.2859 $as_echo "$as_me: updating cache $cache_file" >&6;}
1.2860 - if test ! -f "$cache_file" || test -h "$cache_file"; then
1.2861 - cat confcache >"$cache_file"
1.2862 - else
1.2863 - case $cache_file in #(
1.2864 - */* | ?:*)
1.2865 - mv -f confcache "$cache_file"$$ &&
1.2866 - mv -f "$cache_file"$$ "$cache_file" ;; #(
1.2867 - *)
1.2868 - mv -f confcache "$cache_file" ;;
1.2869 - esac
1.2870 - fi
1.2871 - fi
1.2872 + cat confcache >$cache_file
1.2873 else
1.2874 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
1.2875 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
1.2876 @@ -31714,7 +31895,7 @@
1.2877
1.2878
1.2879
1.2880 -: "${CONFIG_STATUS=./config.status}"
1.2881 +: ${CONFIG_STATUS=./config.status}
1.2882 ac_write_fail=0
1.2883 ac_clean_files_save=$ac_clean_files
1.2884 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
1.2885 @@ -31815,7 +31996,6 @@
1.2886 IFS=" "" $as_nl"
1.2887
1.2888 # Find who we are. Look in the path if we contain no directory separator.
1.2889 -as_myself=
1.2890 case $0 in #((
1.2891 *[\\/]* ) as_myself=$0 ;;
1.2892 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.2893 @@ -32123,7 +32303,7 @@
1.2894 # values after options handling.
1.2895 ac_log="
1.2896 This file was extended by OpenJDK $as_me jdk8, which was
1.2897 -generated by GNU Autoconf 2.68. Invocation command line was
1.2898 +generated by GNU Autoconf 2.67. Invocation command line was
1.2899
1.2900 CONFIG_FILES = $CONFIG_FILES
1.2901 CONFIG_HEADERS = $CONFIG_HEADERS
1.2902 @@ -32186,7 +32366,7 @@
1.2903 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1.2904 ac_cs_version="\\
1.2905 OpenJDK config.status jdk8
1.2906 -configured by $0, generated by GNU Autoconf 2.68,
1.2907 +configured by $0, generated by GNU Autoconf 2.67,
1.2908 with options \\"\$ac_cs_config\\"
1.2909
1.2910 Copyright (C) 2010 Free Software Foundation, Inc.
1.2911 @@ -32315,7 +32495,7 @@
1.2912 "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;;
1.2913 "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;;
1.2914
1.2915 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
1.2916 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
1.2917 esac
1.2918 done
1.2919
1.2920 @@ -32337,10 +32517,9 @@
1.2921 # after its creation but before its name has been assigned to `$tmp'.
1.2922 $debug ||
1.2923 {
1.2924 - tmp= ac_tmp=
1.2925 + tmp=
1.2926 trap 'exit_status=$?
1.2927 - : "${ac_tmp:=$tmp}"
1.2928 - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
1.2929 + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
1.2930 ' 0
1.2931 trap 'as_fn_exit 1' 1 2 13 15
1.2932 }
1.2933 @@ -32348,13 +32527,12 @@
1.2934
1.2935 {
1.2936 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
1.2937 - test -d "$tmp"
1.2938 + test -n "$tmp" && test -d "$tmp"
1.2939 } ||
1.2940 {
1.2941 tmp=./conf$$-$RANDOM
1.2942 (umask 077 && mkdir "$tmp")
1.2943 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
1.2944 -ac_tmp=$tmp
1.2945
1.2946 # Set up the scripts for CONFIG_FILES section.
1.2947 # No need to generate them if there are no CONFIG_FILES.
1.2948 @@ -32376,7 +32554,7 @@
1.2949 ac_cs_awk_cr=$ac_cr
1.2950 fi
1.2951
1.2952 -echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
1.2953 +echo 'BEGIN {' >"$tmp/subs1.awk" &&
1.2954 _ACEOF
1.2955
1.2956
1.2957 @@ -32404,7 +32582,7 @@
1.2958 rm -f conf$$subs.sh
1.2959
1.2960 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.2961 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
1.2962 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
1.2963 _ACEOF
1.2964 sed -n '
1.2965 h
1.2966 @@ -32452,7 +32630,7 @@
1.2967 rm -f conf$$subs.awk
1.2968 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1.2969 _ACAWK
1.2970 -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
1.2971 +cat >>"\$tmp/subs1.awk" <<_ACAWK &&
1.2972 for (key in S) S_is_set[key] = 1
1.2973 FS = ""
1.2974
1.2975 @@ -32484,7 +32662,7 @@
1.2976 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
1.2977 else
1.2978 cat
1.2979 -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
1.2980 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
1.2981 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
1.2982 _ACEOF
1.2983
1.2984 @@ -32518,7 +32696,7 @@
1.2985 # No need to generate them if there are no CONFIG_HEADERS.
1.2986 # This happens for instance with `./config.status Makefile'.
1.2987 if test -n "$CONFIG_HEADERS"; then
1.2988 -cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
1.2989 +cat >"$tmp/defines.awk" <<\_ACAWK ||
1.2990 BEGIN {
1.2991 _ACEOF
1.2992
1.2993 @@ -32530,8 +32708,8 @@
1.2994 # handling of long lines.
1.2995 ac_delim='%!_!# '
1.2996 for ac_last_try in false false :; do
1.2997 - ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
1.2998 - if test -z "$ac_tt"; then
1.2999 + ac_t=`sed -n "/$ac_delim/p" confdefs.h`
1.3000 + if test -z "$ac_t"; then
1.3001 break
1.3002 elif $ac_last_try; then
1.3003 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
1.3004 @@ -32632,7 +32810,7 @@
1.3005 esac
1.3006 case $ac_mode$ac_tag in
1.3007 :[FHL]*:*);;
1.3008 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
1.3009 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
1.3010 :[FH]-) ac_tag=-:-;;
1.3011 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
1.3012 esac
1.3013 @@ -32651,7 +32829,7 @@
1.3014 for ac_f
1.3015 do
1.3016 case $ac_f in
1.3017 - -) ac_f="$ac_tmp/stdin";;
1.3018 + -) ac_f="$tmp/stdin";;
1.3019 *) # Look for the file first in the build tree, then in the source tree
1.3020 # (if the path is not absolute). The absolute path cannot be DOS-style,
1.3021 # because $ac_f cannot contain `:'.
1.3022 @@ -32660,7 +32838,7 @@
1.3023 [\\/$]*) false;;
1.3024 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
1.3025 esac ||
1.3026 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
1.3027 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
1.3028 esac
1.3029 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
1.3030 as_fn_append ac_file_inputs " '$ac_f'"
1.3031 @@ -32686,8 +32864,8 @@
1.3032 esac
1.3033
1.3034 case $ac_tag in
1.3035 - *:-:* | *:-) cat >"$ac_tmp/stdin" \
1.3036 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
1.3037 + *:-:* | *:-) cat >"$tmp/stdin" \
1.3038 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
1.3039 esac
1.3040 ;;
1.3041 esac
1.3042 @@ -32812,22 +32990,21 @@
1.3043 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
1.3044 $ac_datarootdir_hack
1.3045 "
1.3046 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
1.3047 - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.3048 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
1.3049 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.3050
1.3051 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
1.3052 - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
1.3053 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \
1.3054 - "$ac_tmp/out"`; test -z "$ac_out"; } &&
1.3055 + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
1.3056 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
1.3057 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1.3058 which seems to be undefined. Please make sure it is defined" >&5
1.3059 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
1.3060 which seems to be undefined. Please make sure it is defined" >&2;}
1.3061
1.3062 - rm -f "$ac_tmp/stdin"
1.3063 + rm -f "$tmp/stdin"
1.3064 case $ac_file in
1.3065 - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
1.3066 - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
1.3067 + -) cat "$tmp/out" && rm -f "$tmp/out";;
1.3068 + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
1.3069 esac \
1.3070 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.3071 ;;
1.3072 @@ -32838,20 +33015,20 @@
1.3073 if test x"$ac_file" != x-; then
1.3074 {
1.3075 $as_echo "/* $configure_input */" \
1.3076 - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
1.3077 - } >"$ac_tmp/config.h" \
1.3078 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
1.3079 + } >"$tmp/config.h" \
1.3080 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.3081 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
1.3082 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
1.3083 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
1.3084 $as_echo "$as_me: $ac_file is unchanged" >&6;}
1.3085 else
1.3086 rm -f "$ac_file"
1.3087 - mv "$ac_tmp/config.h" "$ac_file" \
1.3088 + mv "$tmp/config.h" "$ac_file" \
1.3089 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
1.3090 fi
1.3091 else
1.3092 $as_echo "/* $configure_input */" \
1.3093 - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
1.3094 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
1.3095 || as_fn_error $? "could not create -" "$LINENO" 5
1.3096 fi
1.3097 ;;
