1.1 --- a/common/autoconf/generated-configure.sh Tue Dec 18 09:57:01 2012 +0100
1.2 +++ b/common/autoconf/generated-configure.sh Tue Dec 18 17:54:39 2012 +0100
1.3 @@ -3674,7 +3674,7 @@
1.4 #CUSTOM_AUTOCONF_INCLUDE
1.5
1.6 # Do not change or remove the following line, it is needed for consistency checks:
1.7 -DATE_WHEN_GENERATED=1355221914
1.8 +DATE_WHEN_GENERATED=1355849613
1.9
1.10 ###############################################################################
1.11 #
1.12 @@ -8165,14 +8165,26 @@
1.13 tmp="$complete EOL"
1.14 arguments="${tmp#* }"
1.15
1.16 - new_path=`$WHICH $path 2> /dev/null`
1.17 - if test "x$new_path" = x; then
1.18 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.19 - if test "x$is_absolute_path" != x; then
1.20 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5
1.21 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;}
1.22 - new_path="$path"
1.23 - else
1.24 + # Cannot rely on the command "which" here since it doesn't always work.
1.25 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.26 + if test -z "$is_absolute_path"; then
1.27 + # Path to executable is not absolute. Find it.
1.28 + IFS_save="$IFS"
1.29 + IFS=:
1.30 + for p in $PATH; do
1.31 + if test -f "$p/$path" && test -x "$p/$path"; then
1.32 + new_path="$p/$path"
1.33 + break
1.34 + fi
1.35 + done
1.36 + IFS="$IFS_save"
1.37 + else
1.38 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
1.39 +$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
1.40 + new_path="$path"
1.41 + fi
1.42 +
1.43 + if test "x$new_path" = x; then
1.44 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.45 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
1.46 has_space=`$ECHO "$complete" | $GREP " "`
1.47 @@ -8182,21 +8194,20 @@
1.48 fi
1.49 as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.50 fi
1.51 - fi
1.52 - fi
1.53 -
1.54 - # Now join together the path and the arguments once again
1.55 - if test "x$arguments" != xEOL; then
1.56 - new_complete="$new_path ${arguments% *}"
1.57 - else
1.58 - new_complete="$new_path"
1.59 - fi
1.60 + fi
1.61 +
1.62 + # Now join together the path and the arguments once again
1.63 + if test "x$arguments" != xEOL; then
1.64 + new_complete="$new_path ${arguments% *}"
1.65 + else
1.66 + new_complete="$new_path"
1.67 + fi
1.68
1.69 if test "x$complete" != "x$new_complete"; then
1.70 - FOUND_MAKE="$new_complete"
1.71 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.72 + FOUND_MAKE="$new_complete"
1.73 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.74 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
1.75 - fi
1.76 + fi
1.77
1.78 fi
1.79 fi
1.80 @@ -8511,14 +8522,26 @@
1.81 tmp="$complete EOL"
1.82 arguments="${tmp#* }"
1.83
1.84 - new_path=`$WHICH $path 2> /dev/null`
1.85 - if test "x$new_path" = x; then
1.86 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.87 - if test "x$is_absolute_path" != x; then
1.88 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5
1.89 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;}
1.90 - new_path="$path"
1.91 - else
1.92 + # Cannot rely on the command "which" here since it doesn't always work.
1.93 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.94 + if test -z "$is_absolute_path"; then
1.95 + # Path to executable is not absolute. Find it.
1.96 + IFS_save="$IFS"
1.97 + IFS=:
1.98 + for p in $PATH; do
1.99 + if test -f "$p/$path" && test -x "$p/$path"; then
1.100 + new_path="$p/$path"
1.101 + break
1.102 + fi
1.103 + done
1.104 + IFS="$IFS_save"
1.105 + else
1.106 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
1.107 +$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
1.108 + new_path="$path"
1.109 + fi
1.110 +
1.111 + if test "x$new_path" = x; then
1.112 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.113 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
1.114 has_space=`$ECHO "$complete" | $GREP " "`
1.115 @@ -8528,21 +8551,20 @@
1.116 fi
1.117 as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.118 fi
1.119 - fi
1.120 - fi
1.121 -
1.122 - # Now join together the path and the arguments once again
1.123 - if test "x$arguments" != xEOL; then
1.124 - new_complete="$new_path ${arguments% *}"
1.125 - else
1.126 - new_complete="$new_path"
1.127 - fi
1.128 + fi
1.129 +
1.130 + # Now join together the path and the arguments once again
1.131 + if test "x$arguments" != xEOL; then
1.132 + new_complete="$new_path ${arguments% *}"
1.133 + else
1.134 + new_complete="$new_path"
1.135 + fi
1.136
1.137 if test "x$complete" != "x$new_complete"; then
1.138 - FOUND_MAKE="$new_complete"
1.139 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.140 + FOUND_MAKE="$new_complete"
1.141 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.142 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
1.143 - fi
1.144 + fi
1.145
1.146 fi
1.147 fi
1.148 @@ -8854,14 +8876,26 @@
1.149 tmp="$complete EOL"
1.150 arguments="${tmp#* }"
1.151
1.152 - new_path=`$WHICH $path 2> /dev/null`
1.153 - if test "x$new_path" = x; then
1.154 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.155 - if test "x$is_absolute_path" != x; then
1.156 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5
1.157 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;}
1.158 - new_path="$path"
1.159 - else
1.160 + # Cannot rely on the command "which" here since it doesn't always work.
1.161 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.162 + if test -z "$is_absolute_path"; then
1.163 + # Path to executable is not absolute. Find it.
1.164 + IFS_save="$IFS"
1.165 + IFS=:
1.166 + for p in $PATH; do
1.167 + if test -f "$p/$path" && test -x "$p/$path"; then
1.168 + new_path="$p/$path"
1.169 + break
1.170 + fi
1.171 + done
1.172 + IFS="$IFS_save"
1.173 + else
1.174 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
1.175 +$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
1.176 + new_path="$path"
1.177 + fi
1.178 +
1.179 + if test "x$new_path" = x; then
1.180 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.181 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
1.182 has_space=`$ECHO "$complete" | $GREP " "`
1.183 @@ -8871,21 +8905,20 @@
1.184 fi
1.185 as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.186 fi
1.187 - fi
1.188 - fi
1.189 -
1.190 - # Now join together the path and the arguments once again
1.191 - if test "x$arguments" != xEOL; then
1.192 - new_complete="$new_path ${arguments% *}"
1.193 - else
1.194 - new_complete="$new_path"
1.195 - fi
1.196 + fi
1.197 +
1.198 + # Now join together the path and the arguments once again
1.199 + if test "x$arguments" != xEOL; then
1.200 + new_complete="$new_path ${arguments% *}"
1.201 + else
1.202 + new_complete="$new_path"
1.203 + fi
1.204
1.205 if test "x$complete" != "x$new_complete"; then
1.206 - FOUND_MAKE="$new_complete"
1.207 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.208 + FOUND_MAKE="$new_complete"
1.209 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.210 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
1.211 - fi
1.212 + fi
1.213
1.214 fi
1.215 fi
1.216 @@ -9202,14 +9235,26 @@
1.217 tmp="$complete EOL"
1.218 arguments="${tmp#* }"
1.219
1.220 - new_path=`$WHICH $path 2> /dev/null`
1.221 - if test "x$new_path" = x; then
1.222 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.223 - if test "x$is_absolute_path" != x; then
1.224 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5
1.225 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;}
1.226 - new_path="$path"
1.227 - else
1.228 + # Cannot rely on the command "which" here since it doesn't always work.
1.229 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.230 + if test -z "$is_absolute_path"; then
1.231 + # Path to executable is not absolute. Find it.
1.232 + IFS_save="$IFS"
1.233 + IFS=:
1.234 + for p in $PATH; do
1.235 + if test -f "$p/$path" && test -x "$p/$path"; then
1.236 + new_path="$p/$path"
1.237 + break
1.238 + fi
1.239 + done
1.240 + IFS="$IFS_save"
1.241 + else
1.242 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
1.243 +$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
1.244 + new_path="$path"
1.245 + fi
1.246 +
1.247 + if test "x$new_path" = x; then
1.248 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.249 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
1.250 has_space=`$ECHO "$complete" | $GREP " "`
1.251 @@ -9219,21 +9264,20 @@
1.252 fi
1.253 as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.254 fi
1.255 - fi
1.256 - fi
1.257 -
1.258 - # Now join together the path and the arguments once again
1.259 - if test "x$arguments" != xEOL; then
1.260 - new_complete="$new_path ${arguments% *}"
1.261 - else
1.262 - new_complete="$new_path"
1.263 - fi
1.264 + fi
1.265 +
1.266 + # Now join together the path and the arguments once again
1.267 + if test "x$arguments" != xEOL; then
1.268 + new_complete="$new_path ${arguments% *}"
1.269 + else
1.270 + new_complete="$new_path"
1.271 + fi
1.272
1.273 if test "x$complete" != "x$new_complete"; then
1.274 - FOUND_MAKE="$new_complete"
1.275 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.276 + FOUND_MAKE="$new_complete"
1.277 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.278 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
1.279 - fi
1.280 + fi
1.281
1.282 fi
1.283 fi
1.284 @@ -9544,14 +9588,26 @@
1.285 tmp="$complete EOL"
1.286 arguments="${tmp#* }"
1.287
1.288 - new_path=`$WHICH $path 2> /dev/null`
1.289 - if test "x$new_path" = x; then
1.290 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.291 - if test "x$is_absolute_path" != x; then
1.292 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&5
1.293 -$as_echo "$as_me: Resolving FOUND_MAKE (as $path) with 'which' failed, using $path directly." >&6;}
1.294 - new_path="$path"
1.295 - else
1.296 + # Cannot rely on the command "which" here since it doesn't always work.
1.297 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.298 + if test -z "$is_absolute_path"; then
1.299 + # Path to executable is not absolute. Find it.
1.300 + IFS_save="$IFS"
1.301 + IFS=:
1.302 + for p in $PATH; do
1.303 + if test -f "$p/$path" && test -x "$p/$path"; then
1.304 + new_path="$p/$path"
1.305 + break
1.306 + fi
1.307 + done
1.308 + IFS="$IFS_save"
1.309 + else
1.310 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&5
1.311 +$as_echo "$as_me: Resolving FOUND_MAKE (as $path) failed, using $path directly." >&6;}
1.312 + new_path="$path"
1.313 + fi
1.314 +
1.315 + if test "x$new_path" = x; then
1.316 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&5
1.317 $as_echo "$as_me: The path of FOUND_MAKE, which resolves as \"$complete\", is not found." >&6;}
1.318 has_space=`$ECHO "$complete" | $GREP " "`
1.319 @@ -9561,21 +9617,20 @@
1.320 fi
1.321 as_fn_error $? "Cannot locate the the path of FOUND_MAKE" "$LINENO" 5
1.322 fi
1.323 - fi
1.324 - fi
1.325 -
1.326 - # Now join together the path and the arguments once again
1.327 - if test "x$arguments" != xEOL; then
1.328 - new_complete="$new_path ${arguments% *}"
1.329 - else
1.330 - new_complete="$new_path"
1.331 - fi
1.332 + fi
1.333 +
1.334 + # Now join together the path and the arguments once again
1.335 + if test "x$arguments" != xEOL; then
1.336 + new_complete="$new_path ${arguments% *}"
1.337 + else
1.338 + new_complete="$new_path"
1.339 + fi
1.340
1.341 if test "x$complete" != "x$new_complete"; then
1.342 - FOUND_MAKE="$new_complete"
1.343 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.344 + FOUND_MAKE="$new_complete"
1.345 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting FOUND_MAKE to \"$new_complete\"" >&5
1.346 $as_echo "$as_me: Rewriting FOUND_MAKE to \"$new_complete\"" >&6;}
1.347 - fi
1.348 + fi
1.349
1.350 fi
1.351 fi
1.352 @@ -16373,14 +16428,26 @@
1.353 tmp="$complete EOL"
1.354 arguments="${tmp#* }"
1.355
1.356 - new_path=`$WHICH $path 2> /dev/null`
1.357 - if test "x$new_path" = x; then
1.358 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.359 - if test "x$is_absolute_path" != x; then
1.360 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving VS_ENV_CMD (as $path) with 'which' failed, using $path directly." >&5
1.361 -$as_echo "$as_me: Resolving VS_ENV_CMD (as $path) with 'which' failed, using $path directly." >&6;}
1.362 - new_path="$path"
1.363 - else
1.364 + # Cannot rely on the command "which" here since it doesn't always work.
1.365 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.366 + if test -z "$is_absolute_path"; then
1.367 + # Path to executable is not absolute. Find it.
1.368 + IFS_save="$IFS"
1.369 + IFS=:
1.370 + for p in $PATH; do
1.371 + if test -f "$p/$path" && test -x "$p/$path"; then
1.372 + new_path="$p/$path"
1.373 + break
1.374 + fi
1.375 + done
1.376 + IFS="$IFS_save"
1.377 + else
1.378 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving VS_ENV_CMD (as $path) failed, using $path directly." >&5
1.379 +$as_echo "$as_me: Resolving VS_ENV_CMD (as $path) failed, using $path directly." >&6;}
1.380 + new_path="$path"
1.381 + fi
1.382 +
1.383 + if test "x$new_path" = x; then
1.384 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&5
1.385 $as_echo "$as_me: The path of VS_ENV_CMD, which resolves as \"$complete\", is not found." >&6;}
1.386 has_space=`$ECHO "$complete" | $GREP " "`
1.387 @@ -16390,21 +16457,20 @@
1.388 fi
1.389 as_fn_error $? "Cannot locate the the path of VS_ENV_CMD" "$LINENO" 5
1.390 fi
1.391 - fi
1.392 - fi
1.393 -
1.394 - # Now join together the path and the arguments once again
1.395 - if test "x$arguments" != xEOL; then
1.396 - new_complete="$new_path ${arguments% *}"
1.397 - else
1.398 - new_complete="$new_path"
1.399 - fi
1.400 + fi
1.401 +
1.402 + # Now join together the path and the arguments once again
1.403 + if test "x$arguments" != xEOL; then
1.404 + new_complete="$new_path ${arguments% *}"
1.405 + else
1.406 + new_complete="$new_path"
1.407 + fi
1.408
1.409 if test "x$complete" != "x$new_complete"; then
1.410 - VS_ENV_CMD="$new_complete"
1.411 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting VS_ENV_CMD to \"$new_complete\"" >&5
1.412 + VS_ENV_CMD="$new_complete"
1.413 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting VS_ENV_CMD to \"$new_complete\"" >&5
1.414 $as_echo "$as_me: Rewriting VS_ENV_CMD to \"$new_complete\"" >&6;}
1.415 - fi
1.416 + fi
1.417
1.418
1.419 # Lets extract the variables that are set by vcvarsall.bat/vsvars32.bat/vsvars64.bat
1.420 @@ -16962,14 +17028,26 @@
1.421 tmp="$complete EOL"
1.422 arguments="${tmp#* }"
1.423
1.424 - new_path=`$WHICH $path 2> /dev/null`
1.425 - if test "x$new_path" = x; then
1.426 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.427 - if test "x$is_absolute_path" != x; then
1.428 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CC (as $path) with 'which' failed, using $path directly." >&5
1.429 -$as_echo "$as_me: Resolving BUILD_CC (as $path) with 'which' failed, using $path directly." >&6;}
1.430 - new_path="$path"
1.431 - else
1.432 + # Cannot rely on the command "which" here since it doesn't always work.
1.433 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.434 + if test -z "$is_absolute_path"; then
1.435 + # Path to executable is not absolute. Find it.
1.436 + IFS_save="$IFS"
1.437 + IFS=:
1.438 + for p in $PATH; do
1.439 + if test -f "$p/$path" && test -x "$p/$path"; then
1.440 + new_path="$p/$path"
1.441 + break
1.442 + fi
1.443 + done
1.444 + IFS="$IFS_save"
1.445 + else
1.446 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CC (as $path) failed, using $path directly." >&5
1.447 +$as_echo "$as_me: Resolving BUILD_CC (as $path) failed, using $path directly." >&6;}
1.448 + new_path="$path"
1.449 + fi
1.450 +
1.451 + if test "x$new_path" = x; then
1.452 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&5
1.453 $as_echo "$as_me: The path of BUILD_CC, which resolves as \"$complete\", is not found." >&6;}
1.454 has_space=`$ECHO "$complete" | $GREP " "`
1.455 @@ -16979,21 +17057,20 @@
1.456 fi
1.457 as_fn_error $? "Cannot locate the the path of BUILD_CC" "$LINENO" 5
1.458 fi
1.459 - fi
1.460 - fi
1.461 -
1.462 - # Now join together the path and the arguments once again
1.463 - if test "x$arguments" != xEOL; then
1.464 - new_complete="$new_path ${arguments% *}"
1.465 - else
1.466 - new_complete="$new_path"
1.467 - fi
1.468 + fi
1.469 +
1.470 + # Now join together the path and the arguments once again
1.471 + if test "x$arguments" != xEOL; then
1.472 + new_complete="$new_path ${arguments% *}"
1.473 + else
1.474 + new_complete="$new_path"
1.475 + fi
1.476
1.477 if test "x$complete" != "x$new_complete"; then
1.478 - BUILD_CC="$new_complete"
1.479 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CC to \"$new_complete\"" >&5
1.480 + BUILD_CC="$new_complete"
1.481 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CC to \"$new_complete\"" >&5
1.482 $as_echo "$as_me: Rewriting BUILD_CC to \"$new_complete\"" >&6;}
1.483 - fi
1.484 + fi
1.485
1.486 for ac_prog in cl CC g++
1.487 do
1.488 @@ -17262,14 +17339,26 @@
1.489 tmp="$complete EOL"
1.490 arguments="${tmp#* }"
1.491
1.492 - new_path=`$WHICH $path 2> /dev/null`
1.493 - if test "x$new_path" = x; then
1.494 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.495 - if test "x$is_absolute_path" != x; then
1.496 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CXX (as $path) with 'which' failed, using $path directly." >&5
1.497 -$as_echo "$as_me: Resolving BUILD_CXX (as $path) with 'which' failed, using $path directly." >&6;}
1.498 - new_path="$path"
1.499 - else
1.500 + # Cannot rely on the command "which" here since it doesn't always work.
1.501 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.502 + if test -z "$is_absolute_path"; then
1.503 + # Path to executable is not absolute. Find it.
1.504 + IFS_save="$IFS"
1.505 + IFS=:
1.506 + for p in $PATH; do
1.507 + if test -f "$p/$path" && test -x "$p/$path"; then
1.508 + new_path="$p/$path"
1.509 + break
1.510 + fi
1.511 + done
1.512 + IFS="$IFS_save"
1.513 + else
1.514 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_CXX (as $path) failed, using $path directly." >&5
1.515 +$as_echo "$as_me: Resolving BUILD_CXX (as $path) failed, using $path directly." >&6;}
1.516 + new_path="$path"
1.517 + fi
1.518 +
1.519 + if test "x$new_path" = x; then
1.520 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&5
1.521 $as_echo "$as_me: The path of BUILD_CXX, which resolves as \"$complete\", is not found." >&6;}
1.522 has_space=`$ECHO "$complete" | $GREP " "`
1.523 @@ -17279,21 +17368,20 @@
1.524 fi
1.525 as_fn_error $? "Cannot locate the the path of BUILD_CXX" "$LINENO" 5
1.526 fi
1.527 - fi
1.528 - fi
1.529 -
1.530 - # Now join together the path and the arguments once again
1.531 - if test "x$arguments" != xEOL; then
1.532 - new_complete="$new_path ${arguments% *}"
1.533 - else
1.534 - new_complete="$new_path"
1.535 - fi
1.536 + fi
1.537 +
1.538 + # Now join together the path and the arguments once again
1.539 + if test "x$arguments" != xEOL; then
1.540 + new_complete="$new_path ${arguments% *}"
1.541 + else
1.542 + new_complete="$new_path"
1.543 + fi
1.544
1.545 if test "x$complete" != "x$new_complete"; then
1.546 - BUILD_CXX="$new_complete"
1.547 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CXX to \"$new_complete\"" >&5
1.548 + BUILD_CXX="$new_complete"
1.549 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_CXX to \"$new_complete\"" >&5
1.550 $as_echo "$as_me: Rewriting BUILD_CXX to \"$new_complete\"" >&6;}
1.551 - fi
1.552 + fi
1.553
1.554 # Extract the first word of "ld", so it can be a program name with args.
1.555 set dummy ld; ac_word=$2
1.556 @@ -17557,14 +17645,26 @@
1.557 tmp="$complete EOL"
1.558 arguments="${tmp#* }"
1.559
1.560 - new_path=`$WHICH $path 2> /dev/null`
1.561 - if test "x$new_path" = x; then
1.562 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.563 - if test "x$is_absolute_path" != x; then
1.564 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_LD (as $path) with 'which' failed, using $path directly." >&5
1.565 -$as_echo "$as_me: Resolving BUILD_LD (as $path) with 'which' failed, using $path directly." >&6;}
1.566 - new_path="$path"
1.567 - else
1.568 + # Cannot rely on the command "which" here since it doesn't always work.
1.569 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.570 + if test -z "$is_absolute_path"; then
1.571 + # Path to executable is not absolute. Find it.
1.572 + IFS_save="$IFS"
1.573 + IFS=:
1.574 + for p in $PATH; do
1.575 + if test -f "$p/$path" && test -x "$p/$path"; then
1.576 + new_path="$p/$path"
1.577 + break
1.578 + fi
1.579 + done
1.580 + IFS="$IFS_save"
1.581 + else
1.582 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving BUILD_LD (as $path) failed, using $path directly." >&5
1.583 +$as_echo "$as_me: Resolving BUILD_LD (as $path) failed, using $path directly." >&6;}
1.584 + new_path="$path"
1.585 + fi
1.586 +
1.587 + if test "x$new_path" = x; then
1.588 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&5
1.589 $as_echo "$as_me: The path of BUILD_LD, which resolves as \"$complete\", is not found." >&6;}
1.590 has_space=`$ECHO "$complete" | $GREP " "`
1.591 @@ -17574,21 +17674,20 @@
1.592 fi
1.593 as_fn_error $? "Cannot locate the the path of BUILD_LD" "$LINENO" 5
1.594 fi
1.595 - fi
1.596 - fi
1.597 -
1.598 - # Now join together the path and the arguments once again
1.599 - if test "x$arguments" != xEOL; then
1.600 - new_complete="$new_path ${arguments% *}"
1.601 - else
1.602 - new_complete="$new_path"
1.603 - fi
1.604 + fi
1.605 +
1.606 + # Now join together the path and the arguments once again
1.607 + if test "x$arguments" != xEOL; then
1.608 + new_complete="$new_path ${arguments% *}"
1.609 + else
1.610 + new_complete="$new_path"
1.611 + fi
1.612
1.613 if test "x$complete" != "x$new_complete"; then
1.614 - BUILD_LD="$new_complete"
1.615 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_LD to \"$new_complete\"" >&5
1.616 + BUILD_LD="$new_complete"
1.617 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting BUILD_LD to \"$new_complete\"" >&5
1.618 $as_echo "$as_me: Rewriting BUILD_LD to \"$new_complete\"" >&6;}
1.619 - fi
1.620 + fi
1.621
1.622 fi
1.623
1.624 @@ -18144,14 +18243,26 @@
1.625 tmp="$complete EOL"
1.626 arguments="${tmp#* }"
1.627
1.628 - new_path=`$WHICH $path 2> /dev/null`
1.629 - if test "x$new_path" = x; then
1.630 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.631 - if test "x$is_absolute_path" != x; then
1.632 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CC (as $path) with 'which' failed, using $path directly." >&5
1.633 -$as_echo "$as_me: Resolving CC (as $path) with 'which' failed, using $path directly." >&6;}
1.634 - new_path="$path"
1.635 - else
1.636 + # Cannot rely on the command "which" here since it doesn't always work.
1.637 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.638 + if test -z "$is_absolute_path"; then
1.639 + # Path to executable is not absolute. Find it.
1.640 + IFS_save="$IFS"
1.641 + IFS=:
1.642 + for p in $PATH; do
1.643 + if test -f "$p/$path" && test -x "$p/$path"; then
1.644 + new_path="$p/$path"
1.645 + break
1.646 + fi
1.647 + done
1.648 + IFS="$IFS_save"
1.649 + else
1.650 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CC (as $path) failed, using $path directly." >&5
1.651 +$as_echo "$as_me: Resolving CC (as $path) failed, using $path directly." >&6;}
1.652 + new_path="$path"
1.653 + fi
1.654 +
1.655 + if test "x$new_path" = x; then
1.656 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CC, which resolves as \"$complete\", is not found." >&5
1.657 $as_echo "$as_me: The path of CC, which resolves as \"$complete\", is not found." >&6;}
1.658 has_space=`$ECHO "$complete" | $GREP " "`
1.659 @@ -18161,21 +18272,20 @@
1.660 fi
1.661 as_fn_error $? "Cannot locate the the path of CC" "$LINENO" 5
1.662 fi
1.663 - fi
1.664 - fi
1.665 -
1.666 - # Now join together the path and the arguments once again
1.667 - if test "x$arguments" != xEOL; then
1.668 - new_complete="$new_path ${arguments% *}"
1.669 - else
1.670 - new_complete="$new_path"
1.671 - fi
1.672 + fi
1.673 +
1.674 + # Now join together the path and the arguments once again
1.675 + if test "x$arguments" != xEOL; then
1.676 + new_complete="$new_path ${arguments% *}"
1.677 + else
1.678 + new_complete="$new_path"
1.679 + fi
1.680
1.681 if test "x$complete" != "x$new_complete"; then
1.682 - CC="$new_complete"
1.683 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CC to \"$new_complete\"" >&5
1.684 + CC="$new_complete"
1.685 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CC to \"$new_complete\"" >&5
1.686 $as_echo "$as_me: Rewriting CC to \"$new_complete\"" >&6;}
1.687 - fi
1.688 + fi
1.689
1.690 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CC" >&5
1.691 $as_echo_n "checking resolved symbolic links for CC... " >&6; }
1.692 @@ -18569,14 +18679,26 @@
1.693 tmp="$complete EOL"
1.694 arguments="${tmp#* }"
1.695
1.696 - new_path=`$WHICH $path 2> /dev/null`
1.697 - if test "x$new_path" = x; then
1.698 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.699 - if test "x$is_absolute_path" != x; then
1.700 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CC (as $path) with 'which' failed, using $path directly." >&5
1.701 -$as_echo "$as_me: Resolving PROPER_COMPILER_CC (as $path) with 'which' failed, using $path directly." >&6;}
1.702 - new_path="$path"
1.703 - else
1.704 + # Cannot rely on the command "which" here since it doesn't always work.
1.705 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.706 + if test -z "$is_absolute_path"; then
1.707 + # Path to executable is not absolute. Find it.
1.708 + IFS_save="$IFS"
1.709 + IFS=:
1.710 + for p in $PATH; do
1.711 + if test -f "$p/$path" && test -x "$p/$path"; then
1.712 + new_path="$p/$path"
1.713 + break
1.714 + fi
1.715 + done
1.716 + IFS="$IFS_save"
1.717 + else
1.718 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CC (as $path) failed, using $path directly." >&5
1.719 +$as_echo "$as_me: Resolving PROPER_COMPILER_CC (as $path) failed, using $path directly." >&6;}
1.720 + new_path="$path"
1.721 + fi
1.722 +
1.723 + if test "x$new_path" = x; then
1.724 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&5
1.725 $as_echo "$as_me: The path of PROPER_COMPILER_CC, which resolves as \"$complete\", is not found." >&6;}
1.726 has_space=`$ECHO "$complete" | $GREP " "`
1.727 @@ -18586,21 +18708,20 @@
1.728 fi
1.729 as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CC" "$LINENO" 5
1.730 fi
1.731 - fi
1.732 - fi
1.733 -
1.734 - # Now join together the path and the arguments once again
1.735 - if test "x$arguments" != xEOL; then
1.736 - new_complete="$new_path ${arguments% *}"
1.737 - else
1.738 - new_complete="$new_path"
1.739 - fi
1.740 + fi
1.741 +
1.742 + # Now join together the path and the arguments once again
1.743 + if test "x$arguments" != xEOL; then
1.744 + new_complete="$new_path ${arguments% *}"
1.745 + else
1.746 + new_complete="$new_path"
1.747 + fi
1.748
1.749 if test "x$complete" != "x$new_complete"; then
1.750 - PROPER_COMPILER_CC="$new_complete"
1.751 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&5
1.752 + PROPER_COMPILER_CC="$new_complete"
1.753 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&5
1.754 $as_echo "$as_me: Rewriting PROPER_COMPILER_CC to \"$new_complete\"" >&6;}
1.755 - fi
1.756 + fi
1.757
1.758 PATH="$RETRY_COMPILER_SAVED_PATH"
1.759
1.760 @@ -19691,14 +19812,26 @@
1.761 tmp="$complete EOL"
1.762 arguments="${tmp#* }"
1.763
1.764 - new_path=`$WHICH $path 2> /dev/null`
1.765 - if test "x$new_path" = x; then
1.766 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.767 - if test "x$is_absolute_path" != x; then
1.768 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXX (as $path) with 'which' failed, using $path directly." >&5
1.769 -$as_echo "$as_me: Resolving CXX (as $path) with 'which' failed, using $path directly." >&6;}
1.770 - new_path="$path"
1.771 - else
1.772 + # Cannot rely on the command "which" here since it doesn't always work.
1.773 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.774 + if test -z "$is_absolute_path"; then
1.775 + # Path to executable is not absolute. Find it.
1.776 + IFS_save="$IFS"
1.777 + IFS=:
1.778 + for p in $PATH; do
1.779 + if test -f "$p/$path" && test -x "$p/$path"; then
1.780 + new_path="$p/$path"
1.781 + break
1.782 + fi
1.783 + done
1.784 + IFS="$IFS_save"
1.785 + else
1.786 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXX (as $path) failed, using $path directly." >&5
1.787 +$as_echo "$as_me: Resolving CXX (as $path) failed, using $path directly." >&6;}
1.788 + new_path="$path"
1.789 + fi
1.790 +
1.791 + if test "x$new_path" = x; then
1.792 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXX, which resolves as \"$complete\", is not found." >&5
1.793 $as_echo "$as_me: The path of CXX, which resolves as \"$complete\", is not found." >&6;}
1.794 has_space=`$ECHO "$complete" | $GREP " "`
1.795 @@ -19708,21 +19841,20 @@
1.796 fi
1.797 as_fn_error $? "Cannot locate the the path of CXX" "$LINENO" 5
1.798 fi
1.799 - fi
1.800 - fi
1.801 -
1.802 - # Now join together the path and the arguments once again
1.803 - if test "x$arguments" != xEOL; then
1.804 - new_complete="$new_path ${arguments% *}"
1.805 - else
1.806 - new_complete="$new_path"
1.807 - fi
1.808 + fi
1.809 +
1.810 + # Now join together the path and the arguments once again
1.811 + if test "x$arguments" != xEOL; then
1.812 + new_complete="$new_path ${arguments% *}"
1.813 + else
1.814 + new_complete="$new_path"
1.815 + fi
1.816
1.817 if test "x$complete" != "x$new_complete"; then
1.818 - CXX="$new_complete"
1.819 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXX to \"$new_complete\"" >&5
1.820 + CXX="$new_complete"
1.821 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXX to \"$new_complete\"" >&5
1.822 $as_echo "$as_me: Rewriting CXX to \"$new_complete\"" >&6;}
1.823 - fi
1.824 + fi
1.825
1.826 { $as_echo "$as_me:${as_lineno-$LINENO}: checking resolved symbolic links for CXX" >&5
1.827 $as_echo_n "checking resolved symbolic links for CXX... " >&6; }
1.828 @@ -20116,14 +20248,26 @@
1.829 tmp="$complete EOL"
1.830 arguments="${tmp#* }"
1.831
1.832 - new_path=`$WHICH $path 2> /dev/null`
1.833 - if test "x$new_path" = x; then
1.834 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.835 - if test "x$is_absolute_path" != x; then
1.836 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CXX (as $path) with 'which' failed, using $path directly." >&5
1.837 -$as_echo "$as_me: Resolving PROPER_COMPILER_CXX (as $path) with 'which' failed, using $path directly." >&6;}
1.838 - new_path="$path"
1.839 - else
1.840 + # Cannot rely on the command "which" here since it doesn't always work.
1.841 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.842 + if test -z "$is_absolute_path"; then
1.843 + # Path to executable is not absolute. Find it.
1.844 + IFS_save="$IFS"
1.845 + IFS=:
1.846 + for p in $PATH; do
1.847 + if test -f "$p/$path" && test -x "$p/$path"; then
1.848 + new_path="$p/$path"
1.849 + break
1.850 + fi
1.851 + done
1.852 + IFS="$IFS_save"
1.853 + else
1.854 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving PROPER_COMPILER_CXX (as $path) failed, using $path directly." >&5
1.855 +$as_echo "$as_me: Resolving PROPER_COMPILER_CXX (as $path) failed, using $path directly." >&6;}
1.856 + new_path="$path"
1.857 + fi
1.858 +
1.859 + if test "x$new_path" = x; then
1.860 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&5
1.861 $as_echo "$as_me: The path of PROPER_COMPILER_CXX, which resolves as \"$complete\", is not found." >&6;}
1.862 has_space=`$ECHO "$complete" | $GREP " "`
1.863 @@ -20133,21 +20277,20 @@
1.864 fi
1.865 as_fn_error $? "Cannot locate the the path of PROPER_COMPILER_CXX" "$LINENO" 5
1.866 fi
1.867 - fi
1.868 - fi
1.869 -
1.870 - # Now join together the path and the arguments once again
1.871 - if test "x$arguments" != xEOL; then
1.872 - new_complete="$new_path ${arguments% *}"
1.873 - else
1.874 - new_complete="$new_path"
1.875 - fi
1.876 + fi
1.877 +
1.878 + # Now join together the path and the arguments once again
1.879 + if test "x$arguments" != xEOL; then
1.880 + new_complete="$new_path ${arguments% *}"
1.881 + else
1.882 + new_complete="$new_path"
1.883 + fi
1.884
1.885 if test "x$complete" != "x$new_complete"; then
1.886 - PROPER_COMPILER_CXX="$new_complete"
1.887 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&5
1.888 + PROPER_COMPILER_CXX="$new_complete"
1.889 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&5
1.890 $as_echo "$as_me: Rewriting PROPER_COMPILER_CXX to \"$new_complete\"" >&6;}
1.891 - fi
1.892 + fi
1.893
1.894 PATH="$RETRY_COMPILER_SAVED_PATH"
1.895
1.896 @@ -21006,14 +21149,26 @@
1.897 tmp="$complete EOL"
1.898 arguments="${tmp#* }"
1.899
1.900 - new_path=`$WHICH $path 2> /dev/null`
1.901 - if test "x$new_path" = x; then
1.902 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.903 - if test "x$is_absolute_path" != x; then
1.904 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJC (as $path) with 'which' failed, using $path directly." >&5
1.905 -$as_echo "$as_me: Resolving OBJC (as $path) with 'which' failed, using $path directly." >&6;}
1.906 - new_path="$path"
1.907 - else
1.908 + # Cannot rely on the command "which" here since it doesn't always work.
1.909 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.910 + if test -z "$is_absolute_path"; then
1.911 + # Path to executable is not absolute. Find it.
1.912 + IFS_save="$IFS"
1.913 + IFS=:
1.914 + for p in $PATH; do
1.915 + if test -f "$p/$path" && test -x "$p/$path"; then
1.916 + new_path="$p/$path"
1.917 + break
1.918 + fi
1.919 + done
1.920 + IFS="$IFS_save"
1.921 + else
1.922 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJC (as $path) failed, using $path directly." >&5
1.923 +$as_echo "$as_me: Resolving OBJC (as $path) failed, using $path directly." >&6;}
1.924 + new_path="$path"
1.925 + fi
1.926 +
1.927 + if test "x$new_path" = x; then
1.928 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJC, which resolves as \"$complete\", is not found." >&5
1.929 $as_echo "$as_me: The path of OBJC, which resolves as \"$complete\", is not found." >&6;}
1.930 has_space=`$ECHO "$complete" | $GREP " "`
1.931 @@ -21023,21 +21178,20 @@
1.932 fi
1.933 as_fn_error $? "Cannot locate the the path of OBJC" "$LINENO" 5
1.934 fi
1.935 - fi
1.936 - fi
1.937 -
1.938 - # Now join together the path and the arguments once again
1.939 - if test "x$arguments" != xEOL; then
1.940 - new_complete="$new_path ${arguments% *}"
1.941 - else
1.942 - new_complete="$new_path"
1.943 - fi
1.944 + fi
1.945 +
1.946 + # Now join together the path and the arguments once again
1.947 + if test "x$arguments" != xEOL; then
1.948 + new_complete="$new_path ${arguments% *}"
1.949 + else
1.950 + new_complete="$new_path"
1.951 + fi
1.952
1.953 if test "x$complete" != "x$new_complete"; then
1.954 - OBJC="$new_complete"
1.955 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJC to \"$new_complete\"" >&5
1.956 + OBJC="$new_complete"
1.957 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJC to \"$new_complete\"" >&5
1.958 $as_echo "$as_me: Rewriting OBJC to \"$new_complete\"" >&6;}
1.959 - fi
1.960 + fi
1.961
1.962 else
1.963 OBJC=
1.964 @@ -21376,14 +21530,26 @@
1.965 tmp="$complete EOL"
1.966 arguments="${tmp#* }"
1.967
1.968 - new_path=`$WHICH $path 2> /dev/null`
1.969 - if test "x$new_path" = x; then
1.970 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.971 - if test "x$is_absolute_path" != x; then
1.972 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AR (as $path) with 'which' failed, using $path directly." >&5
1.973 -$as_echo "$as_me: Resolving AR (as $path) with 'which' failed, using $path directly." >&6;}
1.974 - new_path="$path"
1.975 - else
1.976 + # Cannot rely on the command "which" here since it doesn't always work.
1.977 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.978 + if test -z "$is_absolute_path"; then
1.979 + # Path to executable is not absolute. Find it.
1.980 + IFS_save="$IFS"
1.981 + IFS=:
1.982 + for p in $PATH; do
1.983 + if test -f "$p/$path" && test -x "$p/$path"; then
1.984 + new_path="$p/$path"
1.985 + break
1.986 + fi
1.987 + done
1.988 + IFS="$IFS_save"
1.989 + else
1.990 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AR (as $path) failed, using $path directly." >&5
1.991 +$as_echo "$as_me: Resolving AR (as $path) failed, using $path directly." >&6;}
1.992 + new_path="$path"
1.993 + fi
1.994 +
1.995 + if test "x$new_path" = x; then
1.996 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AR, which resolves as \"$complete\", is not found." >&5
1.997 $as_echo "$as_me: The path of AR, which resolves as \"$complete\", is not found." >&6;}
1.998 has_space=`$ECHO "$complete" | $GREP " "`
1.999 @@ -21393,21 +21559,20 @@
1.1000 fi
1.1001 as_fn_error $? "Cannot locate the the path of AR" "$LINENO" 5
1.1002 fi
1.1003 - fi
1.1004 - fi
1.1005 -
1.1006 - # Now join together the path and the arguments once again
1.1007 - if test "x$arguments" != xEOL; then
1.1008 - new_complete="$new_path ${arguments% *}"
1.1009 - else
1.1010 - new_complete="$new_path"
1.1011 - fi
1.1012 + fi
1.1013 +
1.1014 + # Now join together the path and the arguments once again
1.1015 + if test "x$arguments" != xEOL; then
1.1016 + new_complete="$new_path ${arguments% *}"
1.1017 + else
1.1018 + new_complete="$new_path"
1.1019 + fi
1.1020
1.1021 if test "x$complete" != "x$new_complete"; then
1.1022 - AR="$new_complete"
1.1023 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AR to \"$new_complete\"" >&5
1.1024 + AR="$new_complete"
1.1025 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AR to \"$new_complete\"" >&5
1.1026 $as_echo "$as_me: Rewriting AR to \"$new_complete\"" >&6;}
1.1027 - fi
1.1028 + fi
1.1029
1.1030 fi
1.1031 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
1.1032 @@ -21712,14 +21877,26 @@
1.1033 tmp="$complete EOL"
1.1034 arguments="${tmp#* }"
1.1035
1.1036 - new_path=`$WHICH $path 2> /dev/null`
1.1037 - if test "x$new_path" = x; then
1.1038 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1039 - if test "x$is_absolute_path" != x; then
1.1040 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINLD (as $path) with 'which' failed, using $path directly." >&5
1.1041 -$as_echo "$as_me: Resolving WINLD (as $path) with 'which' failed, using $path directly." >&6;}
1.1042 - new_path="$path"
1.1043 - else
1.1044 + # Cannot rely on the command "which" here since it doesn't always work.
1.1045 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1046 + if test -z "$is_absolute_path"; then
1.1047 + # Path to executable is not absolute. Find it.
1.1048 + IFS_save="$IFS"
1.1049 + IFS=:
1.1050 + for p in $PATH; do
1.1051 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1052 + new_path="$p/$path"
1.1053 + break
1.1054 + fi
1.1055 + done
1.1056 + IFS="$IFS_save"
1.1057 + else
1.1058 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINLD (as $path) failed, using $path directly." >&5
1.1059 +$as_echo "$as_me: Resolving WINLD (as $path) failed, using $path directly." >&6;}
1.1060 + new_path="$path"
1.1061 + fi
1.1062 +
1.1063 + if test "x$new_path" = x; then
1.1064 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINLD, which resolves as \"$complete\", is not found." >&5
1.1065 $as_echo "$as_me: The path of WINLD, which resolves as \"$complete\", is not found." >&6;}
1.1066 has_space=`$ECHO "$complete" | $GREP " "`
1.1067 @@ -21729,21 +21906,20 @@
1.1068 fi
1.1069 as_fn_error $? "Cannot locate the the path of WINLD" "$LINENO" 5
1.1070 fi
1.1071 - fi
1.1072 - fi
1.1073 -
1.1074 - # Now join together the path and the arguments once again
1.1075 - if test "x$arguments" != xEOL; then
1.1076 - new_complete="$new_path ${arguments% *}"
1.1077 - else
1.1078 - new_complete="$new_path"
1.1079 - fi
1.1080 + fi
1.1081 +
1.1082 + # Now join together the path and the arguments once again
1.1083 + if test "x$arguments" != xEOL; then
1.1084 + new_complete="$new_path ${arguments% *}"
1.1085 + else
1.1086 + new_complete="$new_path"
1.1087 + fi
1.1088
1.1089 if test "x$complete" != "x$new_complete"; then
1.1090 - WINLD="$new_complete"
1.1091 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINLD to \"$new_complete\"" >&5
1.1092 + WINLD="$new_complete"
1.1093 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINLD to \"$new_complete\"" >&5
1.1094 $as_echo "$as_me: Rewriting WINLD to \"$new_complete\"" >&6;}
1.1095 - fi
1.1096 + fi
1.1097
1.1098 printf "Windows linker was found at $WINLD\n"
1.1099 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the found link.exe is actually the Visual Studio linker" >&5
1.1100 @@ -22038,14 +22214,26 @@
1.1101 tmp="$complete EOL"
1.1102 arguments="${tmp#* }"
1.1103
1.1104 - new_path=`$WHICH $path 2> /dev/null`
1.1105 - if test "x$new_path" = x; then
1.1106 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1107 - if test "x$is_absolute_path" != x; then
1.1108 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MT (as $path) with 'which' failed, using $path directly." >&5
1.1109 -$as_echo "$as_me: Resolving MT (as $path) with 'which' failed, using $path directly." >&6;}
1.1110 - new_path="$path"
1.1111 - else
1.1112 + # Cannot rely on the command "which" here since it doesn't always work.
1.1113 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1114 + if test -z "$is_absolute_path"; then
1.1115 + # Path to executable is not absolute. Find it.
1.1116 + IFS_save="$IFS"
1.1117 + IFS=:
1.1118 + for p in $PATH; do
1.1119 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1120 + new_path="$p/$path"
1.1121 + break
1.1122 + fi
1.1123 + done
1.1124 + IFS="$IFS_save"
1.1125 + else
1.1126 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MT (as $path) failed, using $path directly." >&5
1.1127 +$as_echo "$as_me: Resolving MT (as $path) failed, using $path directly." >&6;}
1.1128 + new_path="$path"
1.1129 + fi
1.1130 +
1.1131 + if test "x$new_path" = x; then
1.1132 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MT, which resolves as \"$complete\", is not found." >&5
1.1133 $as_echo "$as_me: The path of MT, which resolves as \"$complete\", is not found." >&6;}
1.1134 has_space=`$ECHO "$complete" | $GREP " "`
1.1135 @@ -22055,21 +22243,20 @@
1.1136 fi
1.1137 as_fn_error $? "Cannot locate the the path of MT" "$LINENO" 5
1.1138 fi
1.1139 - fi
1.1140 - fi
1.1141 -
1.1142 - # Now join together the path and the arguments once again
1.1143 - if test "x$arguments" != xEOL; then
1.1144 - new_complete="$new_path ${arguments% *}"
1.1145 - else
1.1146 - new_complete="$new_path"
1.1147 - fi
1.1148 + fi
1.1149 +
1.1150 + # Now join together the path and the arguments once again
1.1151 + if test "x$arguments" != xEOL; then
1.1152 + new_complete="$new_path ${arguments% *}"
1.1153 + else
1.1154 + new_complete="$new_path"
1.1155 + fi
1.1156
1.1157 if test "x$complete" != "x$new_complete"; then
1.1158 - MT="$new_complete"
1.1159 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MT to \"$new_complete\"" >&5
1.1160 + MT="$new_complete"
1.1161 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MT to \"$new_complete\"" >&5
1.1162 $as_echo "$as_me: Rewriting MT to \"$new_complete\"" >&6;}
1.1163 - fi
1.1164 + fi
1.1165
1.1166 # The resource compiler
1.1167 # Extract the first word of "rc", so it can be a program name with args.
1.1168 @@ -22348,14 +22535,26 @@
1.1169 tmp="$complete EOL"
1.1170 arguments="${tmp#* }"
1.1171
1.1172 - new_path=`$WHICH $path 2> /dev/null`
1.1173 - if test "x$new_path" = x; then
1.1174 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1175 - if test "x$is_absolute_path" != x; then
1.1176 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving RC (as $path) with 'which' failed, using $path directly." >&5
1.1177 -$as_echo "$as_me: Resolving RC (as $path) with 'which' failed, using $path directly." >&6;}
1.1178 - new_path="$path"
1.1179 - else
1.1180 + # Cannot rely on the command "which" here since it doesn't always work.
1.1181 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1182 + if test -z "$is_absolute_path"; then
1.1183 + # Path to executable is not absolute. Find it.
1.1184 + IFS_save="$IFS"
1.1185 + IFS=:
1.1186 + for p in $PATH; do
1.1187 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1188 + new_path="$p/$path"
1.1189 + break
1.1190 + fi
1.1191 + done
1.1192 + IFS="$IFS_save"
1.1193 + else
1.1194 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving RC (as $path) failed, using $path directly." >&5
1.1195 +$as_echo "$as_me: Resolving RC (as $path) failed, using $path directly." >&6;}
1.1196 + new_path="$path"
1.1197 + fi
1.1198 +
1.1199 + if test "x$new_path" = x; then
1.1200 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of RC, which resolves as \"$complete\", is not found." >&5
1.1201 $as_echo "$as_me: The path of RC, which resolves as \"$complete\", is not found." >&6;}
1.1202 has_space=`$ECHO "$complete" | $GREP " "`
1.1203 @@ -22365,21 +22564,20 @@
1.1204 fi
1.1205 as_fn_error $? "Cannot locate the the path of RC" "$LINENO" 5
1.1206 fi
1.1207 - fi
1.1208 - fi
1.1209 -
1.1210 - # Now join together the path and the arguments once again
1.1211 - if test "x$arguments" != xEOL; then
1.1212 - new_complete="$new_path ${arguments% *}"
1.1213 - else
1.1214 - new_complete="$new_path"
1.1215 - fi
1.1216 + fi
1.1217 +
1.1218 + # Now join together the path and the arguments once again
1.1219 + if test "x$arguments" != xEOL; then
1.1220 + new_complete="$new_path ${arguments% *}"
1.1221 + else
1.1222 + new_complete="$new_path"
1.1223 + fi
1.1224
1.1225 if test "x$complete" != "x$new_complete"; then
1.1226 - RC="$new_complete"
1.1227 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting RC to \"$new_complete\"" >&5
1.1228 + RC="$new_complete"
1.1229 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting RC to \"$new_complete\"" >&5
1.1230 $as_echo "$as_me: Rewriting RC to \"$new_complete\"" >&6;}
1.1231 - fi
1.1232 + fi
1.1233
1.1234
1.1235 # For hotspot, we need these in Windows mixed path,
1.1236 @@ -22711,14 +22909,26 @@
1.1237 tmp="$complete EOL"
1.1238 arguments="${tmp#* }"
1.1239
1.1240 - new_path=`$WHICH $path 2> /dev/null`
1.1241 - if test "x$new_path" = x; then
1.1242 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1243 - if test "x$is_absolute_path" != x; then
1.1244 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINAR (as $path) with 'which' failed, using $path directly." >&5
1.1245 -$as_echo "$as_me: Resolving WINAR (as $path) with 'which' failed, using $path directly." >&6;}
1.1246 - new_path="$path"
1.1247 - else
1.1248 + # Cannot rely on the command "which" here since it doesn't always work.
1.1249 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1250 + if test -z "$is_absolute_path"; then
1.1251 + # Path to executable is not absolute. Find it.
1.1252 + IFS_save="$IFS"
1.1253 + IFS=:
1.1254 + for p in $PATH; do
1.1255 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1256 + new_path="$p/$path"
1.1257 + break
1.1258 + fi
1.1259 + done
1.1260 + IFS="$IFS_save"
1.1261 + else
1.1262 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving WINAR (as $path) failed, using $path directly." >&5
1.1263 +$as_echo "$as_me: Resolving WINAR (as $path) failed, using $path directly." >&6;}
1.1264 + new_path="$path"
1.1265 + fi
1.1266 +
1.1267 + if test "x$new_path" = x; then
1.1268 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of WINAR, which resolves as \"$complete\", is not found." >&5
1.1269 $as_echo "$as_me: The path of WINAR, which resolves as \"$complete\", is not found." >&6;}
1.1270 has_space=`$ECHO "$complete" | $GREP " "`
1.1271 @@ -22728,21 +22938,20 @@
1.1272 fi
1.1273 as_fn_error $? "Cannot locate the the path of WINAR" "$LINENO" 5
1.1274 fi
1.1275 - fi
1.1276 - fi
1.1277 -
1.1278 - # Now join together the path and the arguments once again
1.1279 - if test "x$arguments" != xEOL; then
1.1280 - new_complete="$new_path ${arguments% *}"
1.1281 - else
1.1282 - new_complete="$new_path"
1.1283 - fi
1.1284 + fi
1.1285 +
1.1286 + # Now join together the path and the arguments once again
1.1287 + if test "x$arguments" != xEOL; then
1.1288 + new_complete="$new_path ${arguments% *}"
1.1289 + else
1.1290 + new_complete="$new_path"
1.1291 + fi
1.1292
1.1293 if test "x$complete" != "x$new_complete"; then
1.1294 - WINAR="$new_complete"
1.1295 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINAR to \"$new_complete\"" >&5
1.1296 + WINAR="$new_complete"
1.1297 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting WINAR to \"$new_complete\"" >&5
1.1298 $as_echo "$as_me: Rewriting WINAR to \"$new_complete\"" >&6;}
1.1299 - fi
1.1300 + fi
1.1301
1.1302 AR="$WINAR"
1.1303 ARFLAGS="-nologo -NODEFAULTLIB:MSVCRT"
1.1304 @@ -23006,14 +23215,26 @@
1.1305 tmp="$complete EOL"
1.1306 arguments="${tmp#* }"
1.1307
1.1308 - new_path=`$WHICH $path 2> /dev/null`
1.1309 - if test "x$new_path" = x; then
1.1310 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1311 - if test "x$is_absolute_path" != x; then
1.1312 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving DUMPBIN (as $path) with 'which' failed, using $path directly." >&5
1.1313 -$as_echo "$as_me: Resolving DUMPBIN (as $path) with 'which' failed, using $path directly." >&6;}
1.1314 - new_path="$path"
1.1315 - else
1.1316 + # Cannot rely on the command "which" here since it doesn't always work.
1.1317 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1318 + if test -z "$is_absolute_path"; then
1.1319 + # Path to executable is not absolute. Find it.
1.1320 + IFS_save="$IFS"
1.1321 + IFS=:
1.1322 + for p in $PATH; do
1.1323 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1324 + new_path="$p/$path"
1.1325 + break
1.1326 + fi
1.1327 + done
1.1328 + IFS="$IFS_save"
1.1329 + else
1.1330 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving DUMPBIN (as $path) failed, using $path directly." >&5
1.1331 +$as_echo "$as_me: Resolving DUMPBIN (as $path) failed, using $path directly." >&6;}
1.1332 + new_path="$path"
1.1333 + fi
1.1334 +
1.1335 + if test "x$new_path" = x; then
1.1336 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&5
1.1337 $as_echo "$as_me: The path of DUMPBIN, which resolves as \"$complete\", is not found." >&6;}
1.1338 has_space=`$ECHO "$complete" | $GREP " "`
1.1339 @@ -23023,21 +23244,20 @@
1.1340 fi
1.1341 as_fn_error $? "Cannot locate the the path of DUMPBIN" "$LINENO" 5
1.1342 fi
1.1343 - fi
1.1344 - fi
1.1345 -
1.1346 - # Now join together the path and the arguments once again
1.1347 - if test "x$arguments" != xEOL; then
1.1348 - new_complete="$new_path ${arguments% *}"
1.1349 - else
1.1350 - new_complete="$new_path"
1.1351 - fi
1.1352 + fi
1.1353 +
1.1354 + # Now join together the path and the arguments once again
1.1355 + if test "x$arguments" != xEOL; then
1.1356 + new_complete="$new_path ${arguments% *}"
1.1357 + else
1.1358 + new_complete="$new_path"
1.1359 + fi
1.1360
1.1361 if test "x$complete" != "x$new_complete"; then
1.1362 - DUMPBIN="$new_complete"
1.1363 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DUMPBIN to \"$new_complete\"" >&5
1.1364 + DUMPBIN="$new_complete"
1.1365 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting DUMPBIN to \"$new_complete\"" >&5
1.1366 $as_echo "$as_me: Rewriting DUMPBIN to \"$new_complete\"" >&6;}
1.1367 - fi
1.1368 + fi
1.1369
1.1370
1.1371 COMPILER_TYPE=CL
1.1372 @@ -23406,14 +23626,26 @@
1.1373 tmp="$complete EOL"
1.1374 arguments="${tmp#* }"
1.1375
1.1376 - new_path=`$WHICH $path 2> /dev/null`
1.1377 - if test "x$new_path" = x; then
1.1378 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1379 - if test "x$is_absolute_path" != x; then
1.1380 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CPP (as $path) with 'which' failed, using $path directly." >&5
1.1381 -$as_echo "$as_me: Resolving CPP (as $path) with 'which' failed, using $path directly." >&6;}
1.1382 - new_path="$path"
1.1383 - else
1.1384 + # Cannot rely on the command "which" here since it doesn't always work.
1.1385 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1386 + if test -z "$is_absolute_path"; then
1.1387 + # Path to executable is not absolute. Find it.
1.1388 + IFS_save="$IFS"
1.1389 + IFS=:
1.1390 + for p in $PATH; do
1.1391 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1392 + new_path="$p/$path"
1.1393 + break
1.1394 + fi
1.1395 + done
1.1396 + IFS="$IFS_save"
1.1397 + else
1.1398 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CPP (as $path) failed, using $path directly." >&5
1.1399 +$as_echo "$as_me: Resolving CPP (as $path) failed, using $path directly." >&6;}
1.1400 + new_path="$path"
1.1401 + fi
1.1402 +
1.1403 + if test "x$new_path" = x; then
1.1404 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CPP, which resolves as \"$complete\", is not found." >&5
1.1405 $as_echo "$as_me: The path of CPP, which resolves as \"$complete\", is not found." >&6;}
1.1406 has_space=`$ECHO "$complete" | $GREP " "`
1.1407 @@ -23423,21 +23655,20 @@
1.1408 fi
1.1409 as_fn_error $? "Cannot locate the the path of CPP" "$LINENO" 5
1.1410 fi
1.1411 - fi
1.1412 - fi
1.1413 -
1.1414 - # Now join together the path and the arguments once again
1.1415 - if test "x$arguments" != xEOL; then
1.1416 - new_complete="$new_path ${arguments% *}"
1.1417 - else
1.1418 - new_complete="$new_path"
1.1419 - fi
1.1420 + fi
1.1421 +
1.1422 + # Now join together the path and the arguments once again
1.1423 + if test "x$arguments" != xEOL; then
1.1424 + new_complete="$new_path ${arguments% *}"
1.1425 + else
1.1426 + new_complete="$new_path"
1.1427 + fi
1.1428
1.1429 if test "x$complete" != "x$new_complete"; then
1.1430 - CPP="$new_complete"
1.1431 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CPP to \"$new_complete\"" >&5
1.1432 + CPP="$new_complete"
1.1433 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CPP to \"$new_complete\"" >&5
1.1434 $as_echo "$as_me: Rewriting CPP to \"$new_complete\"" >&6;}
1.1435 - fi
1.1436 + fi
1.1437
1.1438
1.1439 ac_ext=cpp
1.1440 @@ -23795,14 +24026,26 @@
1.1441 tmp="$complete EOL"
1.1442 arguments="${tmp#* }"
1.1443
1.1444 - new_path=`$WHICH $path 2> /dev/null`
1.1445 - if test "x$new_path" = x; then
1.1446 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1447 - if test "x$is_absolute_path" != x; then
1.1448 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXXCPP (as $path) with 'which' failed, using $path directly." >&5
1.1449 -$as_echo "$as_me: Resolving CXXCPP (as $path) with 'which' failed, using $path directly." >&6;}
1.1450 - new_path="$path"
1.1451 - else
1.1452 + # Cannot rely on the command "which" here since it doesn't always work.
1.1453 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1454 + if test -z "$is_absolute_path"; then
1.1455 + # Path to executable is not absolute. Find it.
1.1456 + IFS_save="$IFS"
1.1457 + IFS=:
1.1458 + for p in $PATH; do
1.1459 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1460 + new_path="$p/$path"
1.1461 + break
1.1462 + fi
1.1463 + done
1.1464 + IFS="$IFS_save"
1.1465 + else
1.1466 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving CXXCPP (as $path) failed, using $path directly." >&5
1.1467 +$as_echo "$as_me: Resolving CXXCPP (as $path) failed, using $path directly." >&6;}
1.1468 + new_path="$path"
1.1469 + fi
1.1470 +
1.1471 + if test "x$new_path" = x; then
1.1472 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of CXXCPP, which resolves as \"$complete\", is not found." >&5
1.1473 $as_echo "$as_me: The path of CXXCPP, which resolves as \"$complete\", is not found." >&6;}
1.1474 has_space=`$ECHO "$complete" | $GREP " "`
1.1475 @@ -23812,21 +24055,20 @@
1.1476 fi
1.1477 as_fn_error $? "Cannot locate the the path of CXXCPP" "$LINENO" 5
1.1478 fi
1.1479 - fi
1.1480 - fi
1.1481 -
1.1482 - # Now join together the path and the arguments once again
1.1483 - if test "x$arguments" != xEOL; then
1.1484 - new_complete="$new_path ${arguments% *}"
1.1485 - else
1.1486 - new_complete="$new_path"
1.1487 - fi
1.1488 + fi
1.1489 +
1.1490 + # Now join together the path and the arguments once again
1.1491 + if test "x$arguments" != xEOL; then
1.1492 + new_complete="$new_path ${arguments% *}"
1.1493 + else
1.1494 + new_complete="$new_path"
1.1495 + fi
1.1496
1.1497 if test "x$complete" != "x$new_complete"; then
1.1498 - CXXCPP="$new_complete"
1.1499 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXXCPP to \"$new_complete\"" >&5
1.1500 + CXXCPP="$new_complete"
1.1501 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting CXXCPP to \"$new_complete\"" >&5
1.1502 $as_echo "$as_me: Rewriting CXXCPP to \"$new_complete\"" >&6;}
1.1503 - fi
1.1504 + fi
1.1505
1.1506
1.1507 if test "x$COMPILE_TYPE" != "xcross"; then
1.1508 @@ -24113,14 +24355,26 @@
1.1509 tmp="$complete EOL"
1.1510 arguments="${tmp#* }"
1.1511
1.1512 - new_path=`$WHICH $path 2> /dev/null`
1.1513 - if test "x$new_path" = x; then
1.1514 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1515 - if test "x$is_absolute_path" != x; then
1.1516 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AS (as $path) with 'which' failed, using $path directly." >&5
1.1517 -$as_echo "$as_me: Resolving AS (as $path) with 'which' failed, using $path directly." >&6;}
1.1518 - new_path="$path"
1.1519 - else
1.1520 + # Cannot rely on the command "which" here since it doesn't always work.
1.1521 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1522 + if test -z "$is_absolute_path"; then
1.1523 + # Path to executable is not absolute. Find it.
1.1524 + IFS_save="$IFS"
1.1525 + IFS=:
1.1526 + for p in $PATH; do
1.1527 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1528 + new_path="$p/$path"
1.1529 + break
1.1530 + fi
1.1531 + done
1.1532 + IFS="$IFS_save"
1.1533 + else
1.1534 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving AS (as $path) failed, using $path directly." >&5
1.1535 +$as_echo "$as_me: Resolving AS (as $path) failed, using $path directly." >&6;}
1.1536 + new_path="$path"
1.1537 + fi
1.1538 +
1.1539 + if test "x$new_path" = x; then
1.1540 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of AS, which resolves as \"$complete\", is not found." >&5
1.1541 $as_echo "$as_me: The path of AS, which resolves as \"$complete\", is not found." >&6;}
1.1542 has_space=`$ECHO "$complete" | $GREP " "`
1.1543 @@ -24130,21 +24384,20 @@
1.1544 fi
1.1545 as_fn_error $? "Cannot locate the the path of AS" "$LINENO" 5
1.1546 fi
1.1547 - fi
1.1548 - fi
1.1549 -
1.1550 - # Now join together the path and the arguments once again
1.1551 - if test "x$arguments" != xEOL; then
1.1552 - new_complete="$new_path ${arguments% *}"
1.1553 - else
1.1554 - new_complete="$new_path"
1.1555 - fi
1.1556 + fi
1.1557 +
1.1558 + # Now join together the path and the arguments once again
1.1559 + if test "x$arguments" != xEOL; then
1.1560 + new_complete="$new_path ${arguments% *}"
1.1561 + else
1.1562 + new_complete="$new_path"
1.1563 + fi
1.1564
1.1565 if test "x$complete" != "x$new_complete"; then
1.1566 - AS="$new_complete"
1.1567 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AS to \"$new_complete\"" >&5
1.1568 + AS="$new_complete"
1.1569 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting AS to \"$new_complete\"" >&5
1.1570 $as_echo "$as_me: Rewriting AS to \"$new_complete\"" >&6;}
1.1571 - fi
1.1572 + fi
1.1573
1.1574 else
1.1575 AS="$CC -c"
1.1576 @@ -24419,14 +24672,26 @@
1.1577 tmp="$complete EOL"
1.1578 arguments="${tmp#* }"
1.1579
1.1580 - new_path=`$WHICH $path 2> /dev/null`
1.1581 - if test "x$new_path" = x; then
1.1582 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1583 - if test "x$is_absolute_path" != x; then
1.1584 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) with 'which' failed, using $path directly." >&5
1.1585 -$as_echo "$as_me: Resolving NM (as $path) with 'which' failed, using $path directly." >&6;}
1.1586 - new_path="$path"
1.1587 - else
1.1588 + # Cannot rely on the command "which" here since it doesn't always work.
1.1589 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1590 + if test -z "$is_absolute_path"; then
1.1591 + # Path to executable is not absolute. Find it.
1.1592 + IFS_save="$IFS"
1.1593 + IFS=:
1.1594 + for p in $PATH; do
1.1595 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1596 + new_path="$p/$path"
1.1597 + break
1.1598 + fi
1.1599 + done
1.1600 + IFS="$IFS_save"
1.1601 + else
1.1602 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) failed, using $path directly." >&5
1.1603 +$as_echo "$as_me: Resolving NM (as $path) failed, using $path directly." >&6;}
1.1604 + new_path="$path"
1.1605 + fi
1.1606 +
1.1607 + if test "x$new_path" = x; then
1.1608 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.1609 $as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
1.1610 has_space=`$ECHO "$complete" | $GREP " "`
1.1611 @@ -24436,21 +24701,20 @@
1.1612 fi
1.1613 as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.1614 fi
1.1615 - fi
1.1616 - fi
1.1617 -
1.1618 - # Now join together the path and the arguments once again
1.1619 - if test "x$arguments" != xEOL; then
1.1620 - new_complete="$new_path ${arguments% *}"
1.1621 - else
1.1622 - new_complete="$new_path"
1.1623 - fi
1.1624 + fi
1.1625 +
1.1626 + # Now join together the path and the arguments once again
1.1627 + if test "x$arguments" != xEOL; then
1.1628 + new_complete="$new_path ${arguments% *}"
1.1629 + else
1.1630 + new_complete="$new_path"
1.1631 + fi
1.1632
1.1633 if test "x$complete" != "x$new_complete"; then
1.1634 - NM="$new_complete"
1.1635 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
1.1636 + NM="$new_complete"
1.1637 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
1.1638 $as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
1.1639 - fi
1.1640 + fi
1.1641
1.1642 # Extract the first word of "strip", so it can be a program name with args.
1.1643 set dummy strip; ac_word=$2
1.1644 @@ -24714,14 +24978,26 @@
1.1645 tmp="$complete EOL"
1.1646 arguments="${tmp#* }"
1.1647
1.1648 - new_path=`$WHICH $path 2> /dev/null`
1.1649 - if test "x$new_path" = x; then
1.1650 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1651 - if test "x$is_absolute_path" != x; then
1.1652 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&5
1.1653 -$as_echo "$as_me: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&6;}
1.1654 - new_path="$path"
1.1655 - else
1.1656 + # Cannot rely on the command "which" here since it doesn't always work.
1.1657 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1658 + if test -z "$is_absolute_path"; then
1.1659 + # Path to executable is not absolute. Find it.
1.1660 + IFS_save="$IFS"
1.1661 + IFS=:
1.1662 + for p in $PATH; do
1.1663 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1664 + new_path="$p/$path"
1.1665 + break
1.1666 + fi
1.1667 + done
1.1668 + IFS="$IFS_save"
1.1669 + else
1.1670 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) failed, using $path directly." >&5
1.1671 +$as_echo "$as_me: Resolving STRIP (as $path) failed, using $path directly." >&6;}
1.1672 + new_path="$path"
1.1673 + fi
1.1674 +
1.1675 + if test "x$new_path" = x; then
1.1676 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.1677 $as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.1678 has_space=`$ECHO "$complete" | $GREP " "`
1.1679 @@ -24731,21 +25007,20 @@
1.1680 fi
1.1681 as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.1682 fi
1.1683 - fi
1.1684 - fi
1.1685 -
1.1686 - # Now join together the path and the arguments once again
1.1687 - if test "x$arguments" != xEOL; then
1.1688 - new_complete="$new_path ${arguments% *}"
1.1689 - else
1.1690 - new_complete="$new_path"
1.1691 - fi
1.1692 + fi
1.1693 +
1.1694 + # Now join together the path and the arguments once again
1.1695 + if test "x$arguments" != xEOL; then
1.1696 + new_complete="$new_path ${arguments% *}"
1.1697 + else
1.1698 + new_complete="$new_path"
1.1699 + fi
1.1700
1.1701 if test "x$complete" != "x$new_complete"; then
1.1702 - STRIP="$new_complete"
1.1703 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.1704 + STRIP="$new_complete"
1.1705 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.1706 $as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
1.1707 - fi
1.1708 + fi
1.1709
1.1710 # Extract the first word of "mcs", so it can be a program name with args.
1.1711 set dummy mcs; ac_word=$2
1.1712 @@ -25009,14 +25284,26 @@
1.1713 tmp="$complete EOL"
1.1714 arguments="${tmp#* }"
1.1715
1.1716 - new_path=`$WHICH $path 2> /dev/null`
1.1717 - if test "x$new_path" = x; then
1.1718 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1719 - if test "x$is_absolute_path" != x; then
1.1720 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MCS (as $path) with 'which' failed, using $path directly." >&5
1.1721 -$as_echo "$as_me: Resolving MCS (as $path) with 'which' failed, using $path directly." >&6;}
1.1722 - new_path="$path"
1.1723 - else
1.1724 + # Cannot rely on the command "which" here since it doesn't always work.
1.1725 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1726 + if test -z "$is_absolute_path"; then
1.1727 + # Path to executable is not absolute. Find it.
1.1728 + IFS_save="$IFS"
1.1729 + IFS=:
1.1730 + for p in $PATH; do
1.1731 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1732 + new_path="$p/$path"
1.1733 + break
1.1734 + fi
1.1735 + done
1.1736 + IFS="$IFS_save"
1.1737 + else
1.1738 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving MCS (as $path) failed, using $path directly." >&5
1.1739 +$as_echo "$as_me: Resolving MCS (as $path) failed, using $path directly." >&6;}
1.1740 + new_path="$path"
1.1741 + fi
1.1742 +
1.1743 + if test "x$new_path" = x; then
1.1744 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of MCS, which resolves as \"$complete\", is not found." >&5
1.1745 $as_echo "$as_me: The path of MCS, which resolves as \"$complete\", is not found." >&6;}
1.1746 has_space=`$ECHO "$complete" | $GREP " "`
1.1747 @@ -25026,21 +25313,20 @@
1.1748 fi
1.1749 as_fn_error $? "Cannot locate the the path of MCS" "$LINENO" 5
1.1750 fi
1.1751 - fi
1.1752 - fi
1.1753 -
1.1754 - # Now join together the path and the arguments once again
1.1755 - if test "x$arguments" != xEOL; then
1.1756 - new_complete="$new_path ${arguments% *}"
1.1757 - else
1.1758 - new_complete="$new_path"
1.1759 - fi
1.1760 + fi
1.1761 +
1.1762 + # Now join together the path and the arguments once again
1.1763 + if test "x$arguments" != xEOL; then
1.1764 + new_complete="$new_path ${arguments% *}"
1.1765 + else
1.1766 + new_complete="$new_path"
1.1767 + fi
1.1768
1.1769 if test "x$complete" != "x$new_complete"; then
1.1770 - MCS="$new_complete"
1.1771 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5
1.1772 + MCS="$new_complete"
1.1773 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting MCS to \"$new_complete\"" >&5
1.1774 $as_echo "$as_me: Rewriting MCS to \"$new_complete\"" >&6;}
1.1775 - fi
1.1776 + fi
1.1777
1.1778 elif test "x$OPENJDK_TARGET_OS" != xwindows; then
1.1779 if test -n "$ac_tool_prefix"; then
1.1780 @@ -25357,14 +25643,26 @@
1.1781 tmp="$complete EOL"
1.1782 arguments="${tmp#* }"
1.1783
1.1784 - new_path=`$WHICH $path 2> /dev/null`
1.1785 - if test "x$new_path" = x; then
1.1786 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1787 - if test "x$is_absolute_path" != x; then
1.1788 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) with 'which' failed, using $path directly." >&5
1.1789 -$as_echo "$as_me: Resolving NM (as $path) with 'which' failed, using $path directly." >&6;}
1.1790 - new_path="$path"
1.1791 - else
1.1792 + # Cannot rely on the command "which" here since it doesn't always work.
1.1793 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1794 + if test -z "$is_absolute_path"; then
1.1795 + # Path to executable is not absolute. Find it.
1.1796 + IFS_save="$IFS"
1.1797 + IFS=:
1.1798 + for p in $PATH; do
1.1799 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1800 + new_path="$p/$path"
1.1801 + break
1.1802 + fi
1.1803 + done
1.1804 + IFS="$IFS_save"
1.1805 + else
1.1806 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving NM (as $path) failed, using $path directly." >&5
1.1807 +$as_echo "$as_me: Resolving NM (as $path) failed, using $path directly." >&6;}
1.1808 + new_path="$path"
1.1809 + fi
1.1810 +
1.1811 + if test "x$new_path" = x; then
1.1812 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of NM, which resolves as \"$complete\", is not found." >&5
1.1813 $as_echo "$as_me: The path of NM, which resolves as \"$complete\", is not found." >&6;}
1.1814 has_space=`$ECHO "$complete" | $GREP " "`
1.1815 @@ -25374,21 +25672,20 @@
1.1816 fi
1.1817 as_fn_error $? "Cannot locate the the path of NM" "$LINENO" 5
1.1818 fi
1.1819 - fi
1.1820 - fi
1.1821 -
1.1822 - # Now join together the path and the arguments once again
1.1823 - if test "x$arguments" != xEOL; then
1.1824 - new_complete="$new_path ${arguments% *}"
1.1825 - else
1.1826 - new_complete="$new_path"
1.1827 - fi
1.1828 + fi
1.1829 +
1.1830 + # Now join together the path and the arguments once again
1.1831 + if test "x$arguments" != xEOL; then
1.1832 + new_complete="$new_path ${arguments% *}"
1.1833 + else
1.1834 + new_complete="$new_path"
1.1835 + fi
1.1836
1.1837 if test "x$complete" != "x$new_complete"; then
1.1838 - NM="$new_complete"
1.1839 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
1.1840 + NM="$new_complete"
1.1841 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting NM to \"$new_complete\"" >&5
1.1842 $as_echo "$as_me: Rewriting NM to \"$new_complete\"" >&6;}
1.1843 - fi
1.1844 + fi
1.1845
1.1846 if test -n "$ac_tool_prefix"; then
1.1847 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
1.1848 @@ -25704,14 +26001,26 @@
1.1849 tmp="$complete EOL"
1.1850 arguments="${tmp#* }"
1.1851
1.1852 - new_path=`$WHICH $path 2> /dev/null`
1.1853 - if test "x$new_path" = x; then
1.1854 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1855 - if test "x$is_absolute_path" != x; then
1.1856 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&5
1.1857 -$as_echo "$as_me: Resolving STRIP (as $path) with 'which' failed, using $path directly." >&6;}
1.1858 - new_path="$path"
1.1859 - else
1.1860 + # Cannot rely on the command "which" here since it doesn't always work.
1.1861 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1862 + if test -z "$is_absolute_path"; then
1.1863 + # Path to executable is not absolute. Find it.
1.1864 + IFS_save="$IFS"
1.1865 + IFS=:
1.1866 + for p in $PATH; do
1.1867 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1868 + new_path="$p/$path"
1.1869 + break
1.1870 + fi
1.1871 + done
1.1872 + IFS="$IFS_save"
1.1873 + else
1.1874 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving STRIP (as $path) failed, using $path directly." >&5
1.1875 +$as_echo "$as_me: Resolving STRIP (as $path) failed, using $path directly." >&6;}
1.1876 + new_path="$path"
1.1877 + fi
1.1878 +
1.1879 + if test "x$new_path" = x; then
1.1880 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of STRIP, which resolves as \"$complete\", is not found." >&5
1.1881 $as_echo "$as_me: The path of STRIP, which resolves as \"$complete\", is not found." >&6;}
1.1882 has_space=`$ECHO "$complete" | $GREP " "`
1.1883 @@ -25721,21 +26030,20 @@
1.1884 fi
1.1885 as_fn_error $? "Cannot locate the the path of STRIP" "$LINENO" 5
1.1886 fi
1.1887 - fi
1.1888 - fi
1.1889 -
1.1890 - # Now join together the path and the arguments once again
1.1891 - if test "x$arguments" != xEOL; then
1.1892 - new_complete="$new_path ${arguments% *}"
1.1893 - else
1.1894 - new_complete="$new_path"
1.1895 - fi
1.1896 + fi
1.1897 +
1.1898 + # Now join together the path and the arguments once again
1.1899 + if test "x$arguments" != xEOL; then
1.1900 + new_complete="$new_path ${arguments% *}"
1.1901 + else
1.1902 + new_complete="$new_path"
1.1903 + fi
1.1904
1.1905 if test "x$complete" != "x$new_complete"; then
1.1906 - STRIP="$new_complete"
1.1907 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.1908 + STRIP="$new_complete"
1.1909 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting STRIP to \"$new_complete\"" >&5
1.1910 $as_echo "$as_me: Rewriting STRIP to \"$new_complete\"" >&6;}
1.1911 - fi
1.1912 + fi
1.1913
1.1914 fi
1.1915
1.1916 @@ -26066,14 +26374,26 @@
1.1917 tmp="$complete EOL"
1.1918 arguments="${tmp#* }"
1.1919
1.1920 - new_path=`$WHICH $path 2> /dev/null`
1.1921 - if test "x$new_path" = x; then
1.1922 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1923 - if test "x$is_absolute_path" != x; then
1.1924 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJCOPY (as $path) with 'which' failed, using $path directly." >&5
1.1925 -$as_echo "$as_me: Resolving OBJCOPY (as $path) with 'which' failed, using $path directly." >&6;}
1.1926 - new_path="$path"
1.1927 - else
1.1928 + # Cannot rely on the command "which" here since it doesn't always work.
1.1929 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1930 + if test -z "$is_absolute_path"; then
1.1931 + # Path to executable is not absolute. Find it.
1.1932 + IFS_save="$IFS"
1.1933 + IFS=:
1.1934 + for p in $PATH; do
1.1935 + if test -f "$p/$path" && test -x "$p/$path"; then
1.1936 + new_path="$p/$path"
1.1937 + break
1.1938 + fi
1.1939 + done
1.1940 + IFS="$IFS_save"
1.1941 + else
1.1942 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJCOPY (as $path) failed, using $path directly." >&5
1.1943 +$as_echo "$as_me: Resolving OBJCOPY (as $path) failed, using $path directly." >&6;}
1.1944 + new_path="$path"
1.1945 + fi
1.1946 +
1.1947 + if test "x$new_path" = x; then
1.1948 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&5
1.1949 $as_echo "$as_me: The path of OBJCOPY, which resolves as \"$complete\", is not found." >&6;}
1.1950 has_space=`$ECHO "$complete" | $GREP " "`
1.1951 @@ -26083,21 +26403,20 @@
1.1952 fi
1.1953 as_fn_error $? "Cannot locate the the path of OBJCOPY" "$LINENO" 5
1.1954 fi
1.1955 - fi
1.1956 - fi
1.1957 -
1.1958 - # Now join together the path and the arguments once again
1.1959 - if test "x$arguments" != xEOL; then
1.1960 - new_complete="$new_path ${arguments% *}"
1.1961 - else
1.1962 - new_complete="$new_path"
1.1963 - fi
1.1964 + fi
1.1965 +
1.1966 + # Now join together the path and the arguments once again
1.1967 + if test "x$arguments" != xEOL; then
1.1968 + new_complete="$new_path ${arguments% *}"
1.1969 + else
1.1970 + new_complete="$new_path"
1.1971 + fi
1.1972
1.1973 if test "x$complete" != "x$new_complete"; then
1.1974 - OBJCOPY="$new_complete"
1.1975 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJCOPY to \"$new_complete\"" >&5
1.1976 + OBJCOPY="$new_complete"
1.1977 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJCOPY to \"$new_complete\"" >&5
1.1978 $as_echo "$as_me: Rewriting OBJCOPY to \"$new_complete\"" >&6;}
1.1979 - fi
1.1980 + fi
1.1981
1.1982 fi
1.1983 fi
1.1984 @@ -26426,14 +26745,26 @@
1.1985 tmp="$complete EOL"
1.1986 arguments="${tmp#* }"
1.1987
1.1988 - new_path=`$WHICH $path 2> /dev/null`
1.1989 - if test "x$new_path" = x; then
1.1990 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1991 - if test "x$is_absolute_path" != x; then
1.1992 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJDUMP (as $path) with 'which' failed, using $path directly." >&5
1.1993 -$as_echo "$as_me: Resolving OBJDUMP (as $path) with 'which' failed, using $path directly." >&6;}
1.1994 - new_path="$path"
1.1995 - else
1.1996 + # Cannot rely on the command "which" here since it doesn't always work.
1.1997 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.1998 + if test -z "$is_absolute_path"; then
1.1999 + # Path to executable is not absolute. Find it.
1.2000 + IFS_save="$IFS"
1.2001 + IFS=:
1.2002 + for p in $PATH; do
1.2003 + if test -f "$p/$path" && test -x "$p/$path"; then
1.2004 + new_path="$p/$path"
1.2005 + break
1.2006 + fi
1.2007 + done
1.2008 + IFS="$IFS_save"
1.2009 + else
1.2010 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving OBJDUMP (as $path) failed, using $path directly." >&5
1.2011 +$as_echo "$as_me: Resolving OBJDUMP (as $path) failed, using $path directly." >&6;}
1.2012 + new_path="$path"
1.2013 + fi
1.2014 +
1.2015 + if test "x$new_path" = x; then
1.2016 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&5
1.2017 $as_echo "$as_me: The path of OBJDUMP, which resolves as \"$complete\", is not found." >&6;}
1.2018 has_space=`$ECHO "$complete" | $GREP " "`
1.2019 @@ -26443,21 +26774,20 @@
1.2020 fi
1.2021 as_fn_error $? "Cannot locate the the path of OBJDUMP" "$LINENO" 5
1.2022 fi
1.2023 - fi
1.2024 - fi
1.2025 -
1.2026 - # Now join together the path and the arguments once again
1.2027 - if test "x$arguments" != xEOL; then
1.2028 - new_complete="$new_path ${arguments% *}"
1.2029 - else
1.2030 - new_complete="$new_path"
1.2031 - fi
1.2032 + fi
1.2033 +
1.2034 + # Now join together the path and the arguments once again
1.2035 + if test "x$arguments" != xEOL; then
1.2036 + new_complete="$new_path ${arguments% *}"
1.2037 + else
1.2038 + new_complete="$new_path"
1.2039 + fi
1.2040
1.2041 if test "x$complete" != "x$new_complete"; then
1.2042 - OBJDUMP="$new_complete"
1.2043 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJDUMP to \"$new_complete\"" >&5
1.2044 + OBJDUMP="$new_complete"
1.2045 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting OBJDUMP to \"$new_complete\"" >&5
1.2046 $as_echo "$as_me: Rewriting OBJDUMP to \"$new_complete\"" >&6;}
1.2047 - fi
1.2048 + fi
1.2049
1.2050 fi
1.2051
1.2052 @@ -26724,14 +27054,26 @@
1.2053 tmp="$complete EOL"
1.2054 arguments="${tmp#* }"
1.2055
1.2056 - new_path=`$WHICH $path 2> /dev/null`
1.2057 - if test "x$new_path" = x; then
1.2058 - is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.2059 - if test "x$is_absolute_path" != x; then
1.2060 - { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving LIPO (as $path) with 'which' failed, using $path directly." >&5
1.2061 -$as_echo "$as_me: Resolving LIPO (as $path) with 'which' failed, using $path directly." >&6;}
1.2062 - new_path="$path"
1.2063 - else
1.2064 + # Cannot rely on the command "which" here since it doesn't always work.
1.2065 + is_absolute_path=`$ECHO "$path" | $GREP ^/`
1.2066 + if test -z "$is_absolute_path"; then
1.2067 + # Path to executable is not absolute. Find it.
1.2068 + IFS_save="$IFS"
1.2069 + IFS=:
1.2070 + for p in $PATH; do
1.2071 + if test -f "$p/$path" && test -x "$p/$path"; then
1.2072 + new_path="$p/$path"
1.2073 + break
1.2074 + fi
1.2075 + done
1.2076 + IFS="$IFS_save"
1.2077 + else
1.2078 + { $as_echo "$as_me:${as_lineno-$LINENO}: Resolving LIPO (as $path) failed, using $path directly." >&5
1.2079 +$as_echo "$as_me: Resolving LIPO (as $path) failed, using $path directly." >&6;}
1.2080 + new_path="$path"
1.2081 + fi
1.2082 +
1.2083 + if test "x$new_path" = x; then
1.2084 { $as_echo "$as_me:${as_lineno-$LINENO}: The path of LIPO, which resolves as \"$complete\", is not found." >&5
1.2085 $as_echo "$as_me: The path of LIPO, which resolves as \"$complete\", is not found." >&6;}
1.2086 has_space=`$ECHO "$complete" | $GREP " "`
1.2087 @@ -26741,21 +27083,20 @@
1.2088 fi
1.2089 as_fn_error $? "Cannot locate the the path of LIPO" "$LINENO" 5
1.2090 fi
1.2091 - fi
1.2092 - fi
1.2093 -
1.2094 - # Now join together the path and the arguments once again
1.2095 - if test "x$arguments" != xEOL; then
1.2096 - new_complete="$new_path ${arguments% *}"
1.2097 - else
1.2098 - new_complete="$new_path"
1.2099 - fi
1.2100 + fi
1.2101 +
1.2102 + # Now join together the path and the arguments once again
1.2103 + if test "x$arguments" != xEOL; then
1.2104 + new_complete="$new_path ${arguments% *}"
1.2105 + else
1.2106 + new_complete="$new_path"
1.2107 + fi
1.2108
1.2109 if test "x$complete" != "x$new_complete"; then
1.2110 - LIPO="$new_complete"
1.2111 - { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting LIPO to \"$new_complete\"" >&5
1.2112 + LIPO="$new_complete"
1.2113 + { $as_echo "$as_me:${as_lineno-$LINENO}: Rewriting LIPO to \"$new_complete\"" >&5
1.2114 $as_echo "$as_me: Rewriting LIPO to \"$new_complete\"" >&6;}
1.2115 - fi
1.2116 + fi
1.2117
1.2118 fi
1.2119
