diff -r 8bbc72864a41 -r 78bb27faf889 common/autoconf/source-dirs.m4 --- a/common/autoconf/source-dirs.m4 Thu Nov 08 12:24:35 2012 +0100 +++ b/common/autoconf/source-dirs.m4 Mon Nov 12 12:34:11 2012 -0800 @@ -253,5 +253,24 @@ BUILD_OUTPUT="$OUTPUT_ROOT" AC_SUBST(BUILD_OUTPUT) +HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist" +BUILD_HOTSPOT=true +AC_SUBST(HOTSPOT_DIST) +AC_SUBST(BUILD_HOTSPOT) +AC_ARG_WITH(import-hotspot, [AS_HELP_STRING([--with-import-hotspot], + [import hotspot binaries from this jdk image or hotspot build dist dir instead of building from source])]) +if test "x$with_import_hotspot" != x; then + CURDIR="$PWD" + cd "$with_import_hotspot" + HOTSPOT_DIST="`pwd`" + cd "$CURDIR" + if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then + AC_MSG_ERROR([You have to import hotspot from a full jdk image or hotspot build dist dir!]) + fi + AC_MSG_CHECKING([if hotspot should be imported]) + AC_MSG_RESULT([yes from $HOTSPOT_DIST]) + BUILD_HOTSPOT=false +fi + JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk" ])