< prev index next >

make/autoconf/basics.m4

Print this page

        

*** 625,635 **** ############################################################################### # Setup basic configuration paths, and platform-specific stuff related to PATHs. AC_DEFUN_ONCE([BASIC_SETUP_PATHS], [ # Save the current directory this script was started from ! CONFIGURE_START_DIR="$PWD" # We might need to rewrite ORIGINAL_PATH, if it includes "#", to quote them # for make. We couldn't do this when we retrieved ORIGINAL_PATH, since SED # was not available at that time. REWRITTEN_PATH=`$ECHO "$ORIGINAL_PATH" | $SED -e 's/#/\\\\#/g'` --- 625,635 ---- ############################################################################### # Setup basic configuration paths, and platform-specific stuff related to PATHs. AC_DEFUN_ONCE([BASIC_SETUP_PATHS], [ # Save the current directory this script was started from ! CURDIR="$PWD" # We might need to rewrite ORIGINAL_PATH, if it includes "#", to quote them # for make. We couldn't do this when we retrieved ORIGINAL_PATH, since SED # was not available at that time. REWRITTEN_PATH=`$ECHO "$ORIGINAL_PATH" | $SED -e 's/#/\\\\#/g'`
*** 651,664 **** # We get the top-level directory from the supporting wrappers. AC_MSG_CHECKING([for top-level directory]) AC_MSG_RESULT([$TOPDIR]) AC_SUBST(TOPDIR) - AC_SUBST(CONFIGURE_START_DIR) # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS. ! BASIC_FIXUP_PATH(CONFIGURE_START_DIR) BASIC_FIXUP_PATH(TOPDIR) # Locate the directory of this script. AUTOCONF_DIR=$TOPDIR/make/autoconf --- 651,663 ---- # We get the top-level directory from the supporting wrappers. AC_MSG_CHECKING([for top-level directory]) AC_MSG_RESULT([$TOPDIR]) AC_SUBST(TOPDIR) # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS. ! BASIC_FIXUP_PATH(CURDIR) BASIC_FIXUP_PATH(TOPDIR) # Locate the directory of this script. AUTOCONF_DIR=$TOPDIR/make/autoconf
*** 867,908 **** [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$CONFIGURE_START_DIR" = "x$TOPDIR" \ ! || test "x$CONFIGURE_START_DIR" = "x$CUSTOM_ROOT" \ ! || test "x$CONFIGURE_START_DIR" = "x$TOPDIR/make/autoconf" \ ! || test "x$CONFIGURE_START_DIR" = "x$TOPDIR/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}-${JVM_VARIANTS_WITH_AND}-${DEBUG_LEVEL}" else AC_MSG_RESULT([in build directory with custom name]) fi if test "x$CUSTOM_ROOT" != x; then ! WORKSPACE_ROOT="${CUSTOM_ROOT}" else ! WORKSPACE_ROOT="${TOPDIR}" fi - OUTPUTDIR="${WORKSPACE_ROOT}/build/${CONF_NAME}" $MKDIR -p "$OUTPUTDIR" if test ! -d "$OUTPUTDIR"; then AC_MSG_ERROR([Could not create build directory $OUTPUTDIR]) fi else # We are running configure from outside of the src dir. # Then use the current directory as output dir! # If configuration is situated in normal build directory, just use the build # directory name as configuration name, otherwise use the complete path. if test "x${CONF_NAME}" = x; then ! CONF_NAME=`$ECHO $CONFIGURE_START_DIR | $SED -e "s!^${TOPDIR}/build/!!"` fi ! OUTPUTDIR="$CONFIGURE_START_DIR" 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! --- 866,905 ---- [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$TOPDIR" || test "x$CURDIR" = "x$CUSTOM_ROOT" \ ! || test "x$CURDIR" = "x$TOPDIR/make/autoconf" \ ! || test "x$CURDIR" = "x$TOPDIR/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}-${JVM_VARIANTS_WITH_AND}-${DEBUG_LEVEL}" else AC_MSG_RESULT([in build directory with custom name]) fi if test "x$CUSTOM_ROOT" != x; then ! OUTPUTDIR="${CUSTOM_ROOT}/build/${CONF_NAME}" else ! OUTPUTDIR="${TOPDIR}/build/${CONF_NAME}" fi $MKDIR -p "$OUTPUTDIR" if test ! -d "$OUTPUTDIR"; then AC_MSG_ERROR([Could not create build directory $OUTPUTDIR]) fi else # We are running configure from outside of the src dir. # Then use the current directory as output dir! # If configuration is situated in normal build directory, just use the build # directory name as configuration name, otherwise use the complete path. if test "x${CONF_NAME}" = x; then ! CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${TOPDIR}/build/!!"` fi ! OUTPUTDIR="$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!
*** 918,935 **** -e 's/confdefs.h//g' \ -e 's/configure-support//g' \ -e 's/ //g' \ | $TR -d '\n'` if test "x$filtered_files" != x; then ! AC_MSG_NOTICE([Current directory is $CONFIGURE_START_DIR.]) AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here]) AC_MSG_NOTICE([(as opposed to creating a configuration in <src_root>/build/<conf-name>).]) AC_MSG_NOTICE([However, this directory is not empty. This is not allowed, since it could]) AC_MSG_NOTICE([seriously mess up just about everything.]) AC_MSG_NOTICE([Try 'cd $TOPDIR' and restart configure]) AC_MSG_NOTICE([(or create a new empty directory and cd to it).]) ! AC_MSG_ERROR([Will not continue creating configuration in $CONFIGURE_START_DIR]) fi fi fi AC_MSG_CHECKING([what configuration name to use]) AC_MSG_RESULT([$CONF_NAME]) --- 915,932 ---- -e 's/confdefs.h//g' \ -e 's/configure-support//g' \ -e 's/ //g' \ | $TR -d '\n'` if test "x$filtered_files" != x; then ! AC_MSG_NOTICE([Current directory is $CURDIR.]) AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here]) AC_MSG_NOTICE([(as opposed to creating a configuration in <src_root>/build/<conf-name>).]) AC_MSG_NOTICE([However, this directory is not empty. This is not allowed, since it could]) AC_MSG_NOTICE([seriously mess up just about everything.]) AC_MSG_NOTICE([Try 'cd $TOPDIR' and restart configure]) AC_MSG_NOTICE([(or create a new empty directory and cd to it).]) ! AC_MSG_ERROR([Will not continue creating configuration in $CURDIR]) fi fi fi AC_MSG_CHECKING([what configuration name to use]) AC_MSG_RESULT([$CONF_NAME])
*** 941,951 **** SPEC="$OUTPUTDIR/spec.gmk" AC_SUBST(SPEC) AC_SUBST(CONF_NAME) AC_SUBST(OUTPUTDIR) - AC_SUBST(WORKSPACE_ROOT) AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR) # The spec.gmk file contains all variables for the make system. AC_CONFIG_FILES([$OUTPUTDIR/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) # The bootcycle-spec.gmk file contains support for boot cycle builds. --- 938,947 ----
< prev index next >