1.1 --- a/common/autoconf/basics.m4 Wed Apr 11 09:36:13 2018 -0700
1.2 +++ b/common/autoconf/basics.m4 Thu Apr 12 02:54:38 2018 -0700
1.3 @@ -418,21 +418,8 @@
1.4 # Setup basic configuration paths, and platform-specific stuff related to PATHs.
1.5 AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
1.6 [
1.7 - # We get the top-level directory from the supporting wrappers.
1.8 - AC_MSG_CHECKING([for top-level directory])
1.9 - AC_MSG_RESULT([$TOPDIR])
1.10 - BASIC_FIXUP_PATH(TOPDIR)
1.11 - AC_SUBST(TOPDIR)
1.12 -
1.13 - # SRC_ROOT is a traditional alias for TOPDIR.
1.14 - SRC_ROOT=$TOPDIR
1.15 -
1.16 - # Locate the directory of this script.
1.17 - AUTOCONF_DIR=$TOPDIR/common/autoconf
1.18 -
1.19 # Save the current directory this script was started from
1.20 CURDIR="$PWD"
1.21 - BASIC_FIXUP_PATH(CURDIR)
1.22
1.23 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
1.24 PATH_SEP=";"
1.25 @@ -442,6 +429,20 @@
1.26 fi
1.27 AC_SUBST(PATH_SEP)
1.28
1.29 + # We get the top-level directory from the supporting wrappers.
1.30 + AC_MSG_CHECKING([for top-level directory])
1.31 + AC_MSG_RESULT([$TOPDIR])
1.32 + AC_SUBST(TOPDIR)
1.33 +
1.34 + # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
1.35 + BASIC_FIXUP_PATH(CURDIR)
1.36 + BASIC_FIXUP_PATH(TOPDIR)
1.37 + # SRC_ROOT is a traditional alias for TOPDIR.
1.38 + SRC_ROOT=$TOPDIR
1.39 +
1.40 + # Locate the directory of this script.
1.41 + AUTOCONF_DIR=$TOPDIR/common/autoconf
1.42 +
1.43 if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
1.44 # Add extra search paths on solaris for utilities like ar and as etc...
1.45 PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
