common/autoconf/basics.m4

*** 416,447 ****
  ])
  
  # Setup basic configuration paths, and platform-specific stuff related to PATHs.
  AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
  [
    # Locate the directory of this script.
!   SCRIPT="[$]0"
!   AUTOCONF_DIR=`cd \`$DIRNAME $SCRIPT\`; $THEPWDCMD -L`
  
!   # Where is the source? It is located two levels above the configure script.
    CURDIR="$PWD"
!   cd "$AUTOCONF_DIR/../.."
!   SRC_ROOT="`$THEPWDCMD -L`"
  
    if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
      PATH_SEP=";"
      BASIC_CHECK_PATHS_WINDOWS
    else
      PATH_SEP=":"
    fi
- 
-   AC_SUBST(SRC_ROOT)
    AC_SUBST(PATH_SEP)
-   cd "$CURDIR"
- 
-   BASIC_FIXUP_PATH(SRC_ROOT)
-   BASIC_FIXUP_PATH(CURDIR)
  
    if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
      # Add extra search paths on solaris for utilities like ar and as etc...
      PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
    fi
--- 416,448 ----
  ])
  
  # Setup basic configuration paths, and platform-specific stuff related to PATHs.
  AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
  [
+   # We get the top-level directory from the supporting wrappers.
+   AC_MSG_CHECKING([for top-level directory])
+   AC_MSG_RESULT([$TOPDIR])
+   BASIC_FIXUP_PATH(TOPDIR)
+   AC_SUBST(TOPDIR)
+ 
+   # SRC_ROOT is a traditional alias for TOPDIR.
+   SRC_ROOT=$TOPDIR
+ 
    # Locate the directory of this script.
!   AUTOCONF_DIR=$TOPDIR/common/autoconf
  
!   # Save the current directory this script was started from
    CURDIR="$PWD"
!   BASIC_FIXUP_PATH(CURDIR)
  
    if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
      PATH_SEP=";"
      BASIC_CHECK_PATHS_WINDOWS
    else
      PATH_SEP=":"
    fi
    AC_SUBST(PATH_SEP)
  
    if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
      # Add extra search paths on solaris for utilities like ar and as etc...
      PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
    fi
*** 485,501 ****
--- 486,506 ----
    AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
        [use this as the name of the configuration @<:@generated from important configuration options@:>@])],
        [ CONF_NAME=${with_conf_name} ])
  
    # Test from where we are running configure, in or outside of src root.
+   AC_MSG_CHECKING([where to store configuration])
    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/make" ; then
      # We are running configure from the src root.
      # Create a default ./build/target-variant-debuglevel output root.
      if test "x${CONF_NAME}" = x; then
+       AC_MSG_RESULT([in default location])
        CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
+     else
+       AC_MSG_RESULT([in build directory with custom name])
      fi
      OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
      $MKDIR -p "$OUTPUT_ROOT"
      if test ! -d "$OUTPUT_ROOT"; then
        AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
*** 507,516 ****
--- 512,522 ----
      # directory name as configuration name, otherwise use the complete path.
      if test "x${CONF_NAME}" = x; then
        CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
      fi
      OUTPUT_ROOT="$CURDIR"
+     AC_MSG_RESULT([in current directory])
  
      # WARNING: This might be a bad thing to do. You need to be sure you want to
      # have a configuration in this directory. Do some sanity checks!
  
      if test ! -e "$OUTPUT_ROOT/spec.gmk"; then