1.1 --- a/common/autoconf/generated-configure.sh Wed Nov 14 10:16:45 2012 -0800
1.2 +++ b/common/autoconf/generated-configure.sh Wed Nov 14 10:18:51 2012 -0800
1.3 @@ -3068,7 +3068,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=1352916966
1.8 +DATE_WHEN_GENERATED=1352917083
1.9
1.10 ###############################################################################
1.11 #
1.12 @@ -7137,7 +7137,56 @@
1.13
1.14
1.15 # Test from where we are running configure, in or outside of src root.
1.16 -if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
1.17 +# To enable comparison of directories, CURDIR needs to be symlink free
1.18 +# just like SRC_ROOT already is
1.19 +NOSYM_CURDIR="$CURDIR"
1.20 +
1.21 + if test "x$OPENJDK_BUILD_OS" != xwindows; then
1.22 + # Follow a chain of symbolic links. Use readlink
1.23 + # where it exists, else fall back to horribly
1.24 + # complicated shell code.
1.25 + if test "x$READLINK_TESTED" != yes; then
1.26 + # On MacOSX there is a readlink tool with a different
1.27 + # purpose than the GNU readlink tool. Check the found readlink.
1.28 + ISGNU=`$READLINK --help 2>&1 | $GREP GNU`
1.29 + if test "x$ISGNU" = x; then
1.30 + # A readlink that we do not know how to use.
1.31 + # Are there other non-GNU readlinks out there?
1.32 + READLINK_TESTED=yes
1.33 + READLINK=
1.34 + fi
1.35 + fi
1.36 +
1.37 + if test "x$READLINK" != x; then
1.38 + NOSYM_CURDIR=`$READLINK -f $NOSYM_CURDIR`
1.39 + else
1.40 + STARTDIR=$PWD
1.41 + COUNTER=0
1.42 + sym_link_dir=`$DIRNAME $NOSYM_CURDIR`
1.43 + sym_link_file=`$BASENAME $NOSYM_CURDIR`
1.44 + while test $COUNTER -lt 20; do
1.45 + ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
1.46 + if test "x$ISLINK" == x; then
1.47 + # This is not a symbolic link! We are done!
1.48 + break
1.49 + fi
1.50 + # The link might be relative! We have to use cd to travel safely.
1.51 + cd $sym_link_dir
1.52 + # ... and we must get the to the absolute path, not one using symbolic links.
1.53 + cd `pwd -P`
1.54 + cd `$DIRNAME $ISLINK`
1.55 + sym_link_dir=`$THEPWDCMD`
1.56 + sym_link_file=`$BASENAME $ISLINK`
1.57 + let COUNTER=COUNTER+1
1.58 + done
1.59 + cd $STARTDIR
1.60 + NOSYM_CURDIR=$sym_link_dir/$sym_link_file
1.61 + fi
1.62 + fi
1.63 +
1.64 +if test "x$NOSYM_CURDIR" = "x$SRC_ROOT" || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common" \
1.65 + || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/autoconf" \
1.66 + || test "x$NOSYM_CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
1.67 # We are running configure from the src root.
1.68 # Create a default ./build/target-variant-debuglevel output root.
1.69 if test "x${CONF_NAME}" = x; then
