1.1 --- a/common/autoconf/generated-configure.sh Wed May 29 14:01:04 2013 +0200
1.2 +++ b/common/autoconf/generated-configure.sh Fri May 31 14:07:42 2013 +0200
1.3 @@ -901,7 +901,6 @@
1.4 SORT
1.5 SH
1.6 RM
1.7 -THEPWDCMD
1.8 PRINTF
1.9 MV
1.10 MKTEMP
1.11 @@ -3781,7 +3780,7 @@
1.12 #CUSTOM_AUTOCONF_INCLUDE
1.13
1.14 # Do not change or remove the following line, it is needed for consistency checks:
1.15 -DATE_WHEN_GENERATED=1369828849
1.16 +DATE_WHEN_GENERATED=1370001995
1.17
1.18 ###############################################################################
1.19 #
1.20 @@ -5170,65 +5169,6 @@
1.21
1.22
1.23
1.24 - for ac_prog in pwd
1.25 -do
1.26 - # Extract the first word of "$ac_prog", so it can be a program name with args.
1.27 -set dummy $ac_prog; ac_word=$2
1.28 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.29 -$as_echo_n "checking for $ac_word... " >&6; }
1.30 -if test "${ac_cv_path_THEPWDCMD+set}" = set; then :
1.31 - $as_echo_n "(cached) " >&6
1.32 -else
1.33 - case $THEPWDCMD in
1.34 - [\\/]* | ?:[\\/]*)
1.35 - ac_cv_path_THEPWDCMD="$THEPWDCMD" # Let the user override the test with a path.
1.36 - ;;
1.37 - *)
1.38 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.39 -for as_dir in $PATH
1.40 -do
1.41 - IFS=$as_save_IFS
1.42 - test -z "$as_dir" && as_dir=.
1.43 - for ac_exec_ext in '' $ac_executable_extensions; do
1.44 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.45 - ac_cv_path_THEPWDCMD="$as_dir/$ac_word$ac_exec_ext"
1.46 - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.47 - break 2
1.48 - fi
1.49 -done
1.50 - done
1.51 -IFS=$as_save_IFS
1.52 -
1.53 - ;;
1.54 -esac
1.55 -fi
1.56 -THEPWDCMD=$ac_cv_path_THEPWDCMD
1.57 -if test -n "$THEPWDCMD"; then
1.58 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THEPWDCMD" >&5
1.59 -$as_echo "$THEPWDCMD" >&6; }
1.60 -else
1.61 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.62 -$as_echo "no" >&6; }
1.63 -fi
1.64 -
1.65 -
1.66 - test -n "$THEPWDCMD" && break
1.67 -done
1.68 -
1.69 -
1.70 - if test "x$THEPWDCMD" = x; then
1.71 - if test "xpwd" = x; then
1.72 - PROG_NAME=thepwdcmd
1.73 - else
1.74 - PROG_NAME=pwd
1.75 - fi
1.76 - { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.77 -$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.78 - as_fn_error $? "Cannot continue" "$LINENO" 5
1.79 - fi
1.80 -
1.81 -
1.82 -
1.83 for ac_prog in rm
1.84 do
1.85 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.86 @@ -6427,6 +6367,10 @@
1.87 # Always force rm.
1.88 RM="$RM -f"
1.89
1.90 +# pwd behaves differently on various platforms and some don't support the -L flag.
1.91 +# Always use the bash builtin pwd to get uniform behavior.
1.92 +THEPWDCMD=pwd
1.93 +
1.94 # These are not required on all platforms
1.95 # Extract the first word of "cygpath", so it can be a program name with args.
1.96 set dummy cygpath; ac_word=$2
1.97 @@ -7134,65 +7078,17 @@
1.98
1.99 # Locate the directory of this script.
1.100 SCRIPT="$0"
1.101 -
1.102 - if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.103 - # Follow a chain of symbolic links. Use readlink
1.104 - # where it exists, else fall back to horribly
1.105 - # complicated shell code.
1.106 - if test "x$READLINK_TESTED" != yes; then
1.107 - # On MacOSX there is a readlink tool with a different
1.108 - # purpose than the GNU readlink tool. Check the found readlink.
1.109 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.110 - if test "x$ISGNU" = x; then
1.111 - # A readlink that we do not know how to use.
1.112 - # Are there other non-GNU readlinks out there?
1.113 - READLINK_TESTED=yes
1.114 - READLINK=
1.115 - fi
1.116 - fi
1.117 -
1.118 - if test "x$READLINK" != x; then
1.119 - SCRIPT=`$READLINK -f $SCRIPT`
1.120 - else
1.121 - # Save the current directory for restoring afterwards
1.122 - STARTDIR=$PWD
1.123 - COUNTER=0
1.124 - sym_link_dir=`$DIRNAME $SCRIPT`
1.125 - sym_link_file=`$BASENAME $SCRIPT`
1.126 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.127 - cd $sym_link_dir
1.128 - cd `$THEPWDCMD`
1.129 - sym_link_dir=`$THEPWDCMD`
1.130 - # Resolve file symlinks
1.131 - while test $COUNTER -lt 20; do
1.132 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.133 - if test "x$ISLINK" == x; then
1.134 - # This is not a symbolic link! We are done!
1.135 - break
1.136 - fi
1.137 - # Again resolve directory symlinks since the target of the just found
1.138 - # link could be in a different directory
1.139 - cd `$DIRNAME $ISLINK`
1.140 - sym_link_dir=`$THEPWDCMD`
1.141 - sym_link_file=`$BASENAME $ISLINK`
1.142 - let COUNTER=COUNTER+1
1.143 - done
1.144 - cd $STARTDIR
1.145 - SCRIPT=$sym_link_dir/$sym_link_file
1.146 - fi
1.147 - fi
1.148 -
1.149 -AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD`
1.150 +AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
1.151
1.152 # Where is the source? It is located two levels above the configure script.
1.153 CURDIR="$PWD"
1.154 cd "$AUTOCONF_DIR/../.."
1.155 -SRC_ROOT="`$THEPWDCMD`"
1.156 +SRC_ROOT="`$THEPWDCMD -L`"
1.157
1.158 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.159 PATH_SEP=";"
1.160
1.161 - SRC_ROOT_LENGTH=`$THEPWDCMD|$WC -m`
1.162 + SRC_ROOT_LENGTH=`$THEPWDCMD -L|$WC -m`
1.163 if test $SRC_ROOT_LENGTH -gt 100; then
1.164 as_fn_error $? "Your base path is too long. It is $SRC_ROOT_LENGTH characters long, but only 100 is supported" "$LINENO" 5
1.165 fi
1.166 @@ -7408,7 +7304,7 @@
1.167 as_fn_error $? "The path of SRC_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
1.168 fi
1.169
1.170 - SRC_ROOT="`cd "$path"; $THEPWDCMD`"
1.171 + SRC_ROOT="`cd "$path"; $THEPWDCMD -L`"
1.172 fi
1.173
1.174
1.175 @@ -7530,7 +7426,7 @@
1.176 as_fn_error $? "The path of CURDIR, which resolves as \"$path\", is not found." "$LINENO" 5
1.177 fi
1.178
1.179 - CURDIR="`cd "$path"; $THEPWDCMD`"
1.180 + CURDIR="`cd "$path"; $THEPWDCMD -L`"
1.181 fi
1.182
1.183
1.184 @@ -7901,60 +7797,9 @@
1.185
1.186
1.187 # Test from where we are running configure, in or outside of src root.
1.188 -# To enable comparison of directories, CURDIR needs to be symlink free
1.189 -# just like SRC_ROOT already is
1.190 -NOSYM_CURDIR="$CURDIR"
1.191 -
1.192 - if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.193 - # Follow a chain of symbolic links. Use readlink
1.194 - # where it exists, else fall back to horribly
1.195 - # complicated shell code.
1.196 - if test "x$READLINK_TESTED" != yes; then
1.197 - # On MacOSX there is a readlink tool with a different
1.198 - # purpose than the GNU readlink tool. Check the found readlink.
1.199 - ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
1.200 - if test "x$ISGNU" = x; then
1.201 - # A readlink that we do not know how to use.
1.202 - # Are there other non-GNU readlinks out there?
1.203 - READLINK_TESTED=yes
1.204 - READLINK=
1.205 - fi
1.206 - fi
1.207 -
1.208 - if test "x$READLINK" != x; then
1.209 - NOSYM_CURDIR=`$READLINK -f $NOSYM_CURDIR`
1.210 - else
1.211 - # Save the current directory for restoring afterwards
1.212 - STARTDIR=$PWD
1.213 - COUNTER=0
1.214 - sym_link_dir=`$DIRNAME $NOSYM_CURDIR`
1.215 - sym_link_file=`$BASENAME $NOSYM_CURDIR`
1.216 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.217 - cd $sym_link_dir
1.218 - cd `$THEPWDCMD`
1.219 - sym_link_dir=`$THEPWDCMD`
1.220 - # Resolve file symlinks
1.221 - while test $COUNTER -lt 20; do
1.222 - ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.223 - if test "x$ISLINK" == x; then
1.224 - # This is not a symbolic link! We are done!
1.225 - break
1.226 - fi
1.227 - # Again resolve directory symlinks since the target of the just found
1.228 - # link could be in a different directory
1.229 - cd `$DIRNAME $ISLINK`
1.230 - sym_link_dir=`$THEPWDCMD`
1.231 - sym_link_file=`$BASENAME $ISLINK`
1.232 - let COUNTER=COUNTER+1
1.233 - done
1.234 - cd $STARTDIR
1.235 - NOSYM_CURDIR=$sym_link_dir/$sym_link_file
1.236 - fi
1.237 - fi
1.238 -
1.239 -if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \
1.240 - || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \
1.241 - || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
1.242 +if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
1.243 + || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
1.244 + || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
1.245 # We are running configure from the src root.
1.246 # Create a default ./build/target-variant-debuglevel output root.
1.247 if test "x${CONF_NAME}" = x; then
1.248 @@ -8129,7 +7974,7 @@
1.249 as_fn_error $? "The path of OUTPUT_ROOT, which resolves as \"$path\", is not found." "$LINENO" 5
1.250 fi
1.251
1.252 - OUTPUT_ROOT="`cd "$path"; $THEPWDCMD`"
1.253 + OUTPUT_ROOT="`cd "$path"; $THEPWDCMD -L`"
1.254 fi
1.255
1.256
1.257 @@ -11245,7 +11090,7 @@
1.258 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.259 fi
1.260
1.261 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.262 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.263 fi
1.264
1.265 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.266 @@ -11577,7 +11422,7 @@
1.267 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.268 fi
1.269
1.270 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.271 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.272 fi
1.273
1.274 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.275 @@ -11723,7 +11568,7 @@
1.276 as_fn_error $? "The path of JAVA_HOME_PROCESSED, which resolves as \"$path\", is not found." "$LINENO" 5
1.277 fi
1.278
1.279 - JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD`"
1.280 + JAVA_HOME_PROCESSED="`cd "$path"; $THEPWDCMD -L`"
1.281 fi
1.282
1.283 if test ! -d "$JAVA_HOME_PROCESSED"; then
1.284 @@ -11895,7 +11740,7 @@
1.285 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.286 fi
1.287
1.288 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.289 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.290 fi
1.291
1.292 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.293 @@ -12083,7 +11928,7 @@
1.294 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.295 fi
1.296
1.297 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.298 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.299 fi
1.300
1.301 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.302 @@ -12222,10 +12067,10 @@
1.303 COUNTER=0
1.304 sym_link_dir=`$DIRNAME $BINARY`
1.305 sym_link_file=`$BASENAME $BINARY`
1.306 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.307 cd $sym_link_dir
1.308 - cd `$THEPWDCMD`
1.309 - sym_link_dir=`$THEPWDCMD`
1.310 + # Use -P flag to resolve symlinks in directories.
1.311 + cd `$THEPWDCMD -P`
1.312 + sym_link_dir=`$THEPWDCMD -P`
1.313 # Resolve file symlinks
1.314 while test $COUNTER -lt 20; do
1.315 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.316 @@ -12236,7 +12081,7 @@
1.317 # Again resolve directory symlinks since the target of the just found
1.318 # link could be in a different directory
1.319 cd `$DIRNAME $ISLINK`
1.320 - sym_link_dir=`$THEPWDCMD`
1.321 + sym_link_dir=`$THEPWDCMD -P`
1.322 sym_link_file=`$BASENAME $ISLINK`
1.323 let COUNTER=COUNTER+1
1.324 done
1.325 @@ -12411,7 +12256,7 @@
1.326 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.327 fi
1.328
1.329 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.330 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.331 fi
1.332
1.333 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.334 @@ -12626,7 +12471,7 @@
1.335 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.336 fi
1.337
1.338 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.339 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.340 fi
1.341
1.342 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.343 @@ -12806,7 +12651,7 @@
1.344 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.345 fi
1.346
1.347 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.348 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.349 fi
1.350
1.351 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.352 @@ -13014,7 +12859,7 @@
1.353 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.354 fi
1.355
1.356 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.357 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.358 fi
1.359
1.360 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.361 @@ -13194,7 +13039,7 @@
1.362 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.363 fi
1.364
1.365 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.366 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.367 fi
1.368
1.369 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.370 @@ -13402,7 +13247,7 @@
1.371 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.372 fi
1.373
1.374 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.375 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.376 fi
1.377
1.378 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.379 @@ -13582,7 +13427,7 @@
1.380 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.381 fi
1.382
1.383 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.384 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.385 fi
1.386
1.387 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.388 @@ -13790,7 +13635,7 @@
1.389 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.390 fi
1.391
1.392 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.393 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.394 fi
1.395
1.396 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.397 @@ -13970,7 +13815,7 @@
1.398 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.399 fi
1.400
1.401 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.402 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.403 fi
1.404
1.405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.406 @@ -14165,7 +14010,7 @@
1.407 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.408 fi
1.409
1.410 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.411 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.412 fi
1.413
1.414 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.415 @@ -14343,7 +14188,7 @@
1.416 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.417 fi
1.418
1.419 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.420 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.421 fi
1.422
1.423 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.424 @@ -14539,7 +14384,7 @@
1.425 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.426 fi
1.427
1.428 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.429 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.430 fi
1.431
1.432 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.433 @@ -14717,7 +14562,7 @@
1.434 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.435 fi
1.436
1.437 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.438 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.439 fi
1.440
1.441 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.442 @@ -14912,7 +14757,7 @@
1.443 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.444 fi
1.445
1.446 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.447 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.448 fi
1.449
1.450 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.451 @@ -15090,7 +14935,7 @@
1.452 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.453 fi
1.454
1.455 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.456 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.457 fi
1.458
1.459 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.460 @@ -15286,7 +15131,7 @@
1.461 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.462 fi
1.463
1.464 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.465 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.466 fi
1.467
1.468 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.469 @@ -15464,7 +15309,7 @@
1.470 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.471 fi
1.472
1.473 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.474 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.475 fi
1.476
1.477 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.478 @@ -15641,7 +15486,7 @@
1.479 as_fn_error $? "The path of BOOT_JDK, which resolves as \"$path\", is not found." "$LINENO" 5
1.480 fi
1.481
1.482 - BOOT_JDK="`cd "$path"; $THEPWDCMD`"
1.483 + BOOT_JDK="`cd "$path"; $THEPWDCMD -L`"
1.484 fi
1.485
1.486 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Boot JDK" >&5
1.487 @@ -16445,7 +16290,7 @@
1.488 as_fn_error $? "The path of JT_HOME, which resolves as \"$path\", is not found." "$LINENO" 5
1.489 fi
1.490
1.491 - JT_HOME="`cd "$path"; $THEPWDCMD`"
1.492 + JT_HOME="`cd "$path"; $THEPWDCMD -L`"
1.493 fi
1.494
1.495 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JT_HOME" >&5
1.496 @@ -17434,7 +17279,7 @@
1.497 as_fn_error $? "The path of MSVCR_DLL, which resolves as \"$path\", is not found." "$LINENO" 5
1.498 fi
1.499
1.500 - MSVCR_DLL="`cd "$path"; $THEPWDCMD`"
1.501 + MSVCR_DLL="`cd "$path"; $THEPWDCMD -L`"
1.502 fi
1.503
1.504
1.505 @@ -17591,7 +17436,7 @@
1.506 as_fn_error $? "The path of dxsdk_path, which resolves as \"$path\", is not found." "$LINENO" 5
1.507 fi
1.508
1.509 - dxsdk_path="`cd "$path"; $THEPWDCMD`"
1.510 + dxsdk_path="`cd "$path"; $THEPWDCMD -L`"
1.511 fi
1.512
1.513
1.514 @@ -17729,7 +17574,7 @@
1.515 as_fn_error $? "The path of DXSDK_LIB_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
1.516 fi
1.517
1.518 - DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD`"
1.519 + DXSDK_LIB_PATH="`cd "$path"; $THEPWDCMD -L`"
1.520 fi
1.521
1.522
1.523 @@ -17865,7 +17710,7 @@
1.524 as_fn_error $? "The path of DXSDK_INCLUDE_PATH, which resolves as \"$path\", is not found." "$LINENO" 5
1.525 fi
1.526
1.527 - DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD`"
1.528 + DXSDK_INCLUDE_PATH="`cd "$path"; $THEPWDCMD -L`"
1.529 fi
1.530
1.531
1.532 @@ -19452,10 +19297,10 @@
1.533 COUNTER=0
1.534 sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.535 sym_link_file=`$BASENAME $TEST_COMPILER`
1.536 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.537 cd $sym_link_dir
1.538 - cd `$THEPWDCMD`
1.539 - sym_link_dir=`$THEPWDCMD`
1.540 + # Use -P flag to resolve symlinks in directories.
1.541 + cd `$THEPWDCMD -P`
1.542 + sym_link_dir=`$THEPWDCMD -P`
1.543 # Resolve file symlinks
1.544 while test $COUNTER -lt 20; do
1.545 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.546 @@ -19466,7 +19311,7 @@
1.547 # Again resolve directory symlinks since the target of the just found
1.548 # link could be in a different directory
1.549 cd `$DIRNAME $ISLINK`
1.550 - sym_link_dir=`$THEPWDCMD`
1.551 + sym_link_dir=`$THEPWDCMD -P`
1.552 sym_link_file=`$BASENAME $ISLINK`
1.553 let COUNTER=COUNTER+1
1.554 done
1.555 @@ -19889,10 +19734,10 @@
1.556 COUNTER=0
1.557 sym_link_dir=`$DIRNAME $PROPER_COMPILER_CC`
1.558 sym_link_file=`$BASENAME $PROPER_COMPILER_CC`
1.559 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.560 cd $sym_link_dir
1.561 - cd `$THEPWDCMD`
1.562 - sym_link_dir=`$THEPWDCMD`
1.563 + # Use -P flag to resolve symlinks in directories.
1.564 + cd `$THEPWDCMD -P`
1.565 + sym_link_dir=`$THEPWDCMD -P`
1.566 # Resolve file symlinks
1.567 while test $COUNTER -lt 20; do
1.568 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.569 @@ -19903,7 +19748,7 @@
1.570 # Again resolve directory symlinks since the target of the just found
1.571 # link could be in a different directory
1.572 cd `$DIRNAME $ISLINK`
1.573 - sym_link_dir=`$THEPWDCMD`
1.574 + sym_link_dir=`$THEPWDCMD -P`
1.575 sym_link_file=`$BASENAME $ISLINK`
1.576 let COUNTER=COUNTER+1
1.577 done
1.578 @@ -21025,10 +20870,10 @@
1.579 COUNTER=0
1.580 sym_link_dir=`$DIRNAME $TEST_COMPILER`
1.581 sym_link_file=`$BASENAME $TEST_COMPILER`
1.582 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.583 cd $sym_link_dir
1.584 - cd `$THEPWDCMD`
1.585 - sym_link_dir=`$THEPWDCMD`
1.586 + # Use -P flag to resolve symlinks in directories.
1.587 + cd `$THEPWDCMD -P`
1.588 + sym_link_dir=`$THEPWDCMD -P`
1.589 # Resolve file symlinks
1.590 while test $COUNTER -lt 20; do
1.591 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.592 @@ -21039,7 +20884,7 @@
1.593 # Again resolve directory symlinks since the target of the just found
1.594 # link could be in a different directory
1.595 cd `$DIRNAME $ISLINK`
1.596 - sym_link_dir=`$THEPWDCMD`
1.597 + sym_link_dir=`$THEPWDCMD -P`
1.598 sym_link_file=`$BASENAME $ISLINK`
1.599 let COUNTER=COUNTER+1
1.600 done
1.601 @@ -21462,10 +21307,10 @@
1.602 COUNTER=0
1.603 sym_link_dir=`$DIRNAME $PROPER_COMPILER_CXX`
1.604 sym_link_file=`$BASENAME $PROPER_COMPILER_CXX`
1.605 - # Use the system pwd and not the shell builtin to resolve directory symlinks
1.606 cd $sym_link_dir
1.607 - cd `$THEPWDCMD`
1.608 - sym_link_dir=`$THEPWDCMD`
1.609 + # Use -P flag to resolve symlinks in directories.
1.610 + cd `$THEPWDCMD -P`
1.611 + sym_link_dir=`$THEPWDCMD -P`
1.612 # Resolve file symlinks
1.613 while test $COUNTER -lt 20; do
1.614 ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.615 @@ -21476,7 +21321,7 @@
1.616 # Again resolve directory symlinks since the target of the just found
1.617 # link could be in a different directory
1.618 cd `$DIRNAME $ISLINK`
1.619 - sym_link_dir=`$THEPWDCMD`
1.620 + sym_link_dir=`$THEPWDCMD -P`
1.621 sym_link_file=`$BASENAME $ISLINK`
1.622 let COUNTER=COUNTER+1
1.623 done
1.624 @@ -31188,7 +31033,7 @@
1.625 as_fn_error $? "The path of with_freetype, which resolves as \"$path\", is not found." "$LINENO" 5
1.626 fi
1.627
1.628 - with_freetype="`cd "$path"; $THEPWDCMD`"
1.629 + with_freetype="`cd "$path"; $THEPWDCMD -L`"
1.630 fi
1.631
1.632 FREETYPE2_LIBS="-L$with_freetype/lib -lfreetype"
1.633 @@ -31490,7 +31335,7 @@
1.634 as_fn_error $? "The path of FREETYPELOCATION, which resolves as \"$path\", is not found." "$LINENO" 5
1.635 fi
1.636
1.637 - FREETYPELOCATION="`cd "$path"; $THEPWDCMD`"
1.638 + FREETYPELOCATION="`cd "$path"; $THEPWDCMD -L`"
1.639 fi
1.640
1.641 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype in some standard windows locations" >&5
