1.1 --- a/common/autoconf/source-dirs.m4 Thu Sep 12 12:29:17 2013 -0700
1.2 +++ b/common/autoconf/source-dirs.m4 Tue Nov 05 17:33:48 2013 -0800
1.3 @@ -25,55 +25,54 @@
1.4
1.5 AC_DEFUN_ONCE([SRCDIRS_SETUP_TOPDIRS],
1.6 [
1.7 -
1.8 -# Where are the sources. Any of these can be overridden
1.9 -# using --with-override-corba and the likes.
1.10 -LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
1.11 -CORBA_TOPDIR="$SRC_ROOT/corba"
1.12 -JAXP_TOPDIR="$SRC_ROOT/jaxp"
1.13 -JAXWS_TOPDIR="$SRC_ROOT/jaxws"
1.14 -HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
1.15 -NASHORN_TOPDIR="$SRC_ROOT/nashorn"
1.16 -JDK_TOPDIR="$SRC_ROOT/jdk"
1.17 -AC_SUBST(LANGTOOLS_TOPDIR)
1.18 -AC_SUBST(CORBA_TOPDIR)
1.19 -AC_SUBST(JAXP_TOPDIR)
1.20 -AC_SUBST(JAXWS_TOPDIR)
1.21 -AC_SUBST(HOTSPOT_TOPDIR)
1.22 -AC_SUBST(NASHORN_TOPDIR)
1.23 -AC_SUBST(JDK_TOPDIR)
1.24 + # Where are the sources. Any of these can be overridden
1.25 + # using --with-override-corba and the likes.
1.26 + LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
1.27 + CORBA_TOPDIR="$SRC_ROOT/corba"
1.28 + JAXP_TOPDIR="$SRC_ROOT/jaxp"
1.29 + JAXWS_TOPDIR="$SRC_ROOT/jaxws"
1.30 + HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
1.31 + NASHORN_TOPDIR="$SRC_ROOT/nashorn"
1.32 + JDK_TOPDIR="$SRC_ROOT/jdk"
1.33 + AC_SUBST(LANGTOOLS_TOPDIR)
1.34 + AC_SUBST(CORBA_TOPDIR)
1.35 + AC_SUBST(JAXP_TOPDIR)
1.36 + AC_SUBST(JAXWS_TOPDIR)
1.37 + AC_SUBST(HOTSPOT_TOPDIR)
1.38 + AC_SUBST(NASHORN_TOPDIR)
1.39 + AC_SUBST(JDK_TOPDIR)
1.40 ])
1.41
1.42
1.43 AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
1.44 [
1.45
1.46 -###############################################################################
1.47 -#
1.48 -# Pickup additional source for a component from outside of the source root
1.49 -# or override source for a component.
1.50 -#
1.51 -AC_ARG_WITH(add-source-root, [AS_HELP_STRING([--with-add-source-root],
1.52 - [for each and every source directory, look in this additional source root for
1.53 - the same directory; if it exists and have files in it, include it in the build])])
1.54 -
1.55 -AC_ARG_WITH(override-source-root, [AS_HELP_STRING([--with-override-source-root],
1.56 - [for each and every source directory, look in this override source root for
1.57 - the same directory; if it exists, use that directory instead and
1.58 - ignore the directory in the original source root])])
1.59 + ###############################################################################
1.60 + #
1.61 + # Pickup additional source for a component from outside of the source root
1.62 + # or override source for a component.
1.63 + #
1.64 + AC_ARG_WITH(add-source-root, [AS_HELP_STRING([--with-add-source-root],
1.65 + [for each and every source directory, look in this additional source root for
1.66 + the same directory; if it exists and have files in it, include it in the build])])
1.67
1.68 -AC_ARG_WITH(adds-and-overrides, [AS_HELP_STRING([--with-adds-and-overrides],
1.69 - [use the subdirs 'adds' and 'overrides' in the specified directory as
1.70 - add-source-root and override-source-root])])
1.71 + AC_ARG_WITH(override-source-root, [AS_HELP_STRING([--with-override-source-root],
1.72 + [for each and every source directory, look in this override source root for
1.73 + the same directory; if it exists, use that directory instead and
1.74 + ignore the directory in the original source root])])
1.75
1.76 -if test "x$with_adds_and_overrides" != x; then
1.77 + AC_ARG_WITH(adds-and-overrides, [AS_HELP_STRING([--with-adds-and-overrides],
1.78 + [use the subdirs 'adds' and 'overrides' in the specified directory as
1.79 + add-source-root and override-source-root])])
1.80 +
1.81 + if test "x$with_adds_and_overrides" != x; then
1.82 with_add_source_root="$with_adds_and_overrides/adds"
1.83 with_override_source_root="$with_adds_and_overrides/overrides"
1.84 -fi
1.85 + fi
1.86
1.87 -if test "x$with_add_source_root" != x; then
1.88 + if test "x$with_add_source_root" != x; then
1.89 if ! test -d $with_add_source_root; then
1.90 - AC_MSG_ERROR([Trying to use a non-existant add-source-root $with_add_source_root])
1.91 + AC_MSG_ERROR([Trying to use a non-existant add-source-root $with_add_source_root])
1.92 fi
1.93 CURDIR="$PWD"
1.94 cd "$with_add_source_root"
1.95 @@ -82,208 +81,218 @@
1.96 # Verify that the addon source root does not have any root makefiles.
1.97 # If it does, then it is usually an error, prevent this.
1.98 if test -f $with_add_source_root/langtools/makefiles/Makefile || \
1.99 - test -f $with_add_source_root/langtools/make/Makefile; then
1.100 - AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.])
1.101 + test -f $with_add_source_root/langtools/make/Makefile; then
1.102 + AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.])
1.103 fi
1.104 if test -f $with_add_source_root/corba/makefiles/Makefile || \
1.105 - test -f $with_add_source_root/corba/make/Makefile; then
1.106 - AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.])
1.107 + test -f $with_add_source_root/corba/make/Makefile; then
1.108 + AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.])
1.109 fi
1.110 if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
1.111 - test -f $with_add_source_root/jaxp/make/Makefile; then
1.112 - AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.])
1.113 + test -f $with_add_source_root/jaxp/make/Makefile; then
1.114 + AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.])
1.115 fi
1.116 if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
1.117 - test -f $with_add_source_root/jaxws/make/Makefile; then
1.118 - AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.])
1.119 + test -f $with_add_source_root/jaxws/make/Makefile; then
1.120 + AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.])
1.121 fi
1.122 if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
1.123 - test -f $with_add_source_root/hotspot/make/Makefile; then
1.124 - AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.])
1.125 + test -f $with_add_source_root/hotspot/make/Makefile; then
1.126 + AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.])
1.127 + fi
1.128 + if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
1.129 + test -f $with_add_source_root/nashorn/make/Makefile; then
1.130 + AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.])
1.131 fi
1.132 if test -f $with_add_source_root/jdk/makefiles/Makefile || \
1.133 - test -f $with_add_source_root/jdk/make/Makefile; then
1.134 - AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.])
1.135 + test -f $with_add_source_root/jdk/make/Makefile; then
1.136 + AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.])
1.137 fi
1.138 -fi
1.139 -AC_SUBST(ADD_SRC_ROOT)
1.140 + fi
1.141 + AC_SUBST(ADD_SRC_ROOT)
1.142
1.143 -if test "x$with_override_source_root" != x; then
1.144 + if test "x$with_override_source_root" != x; then
1.145 if ! test -d $with_override_source_root; then
1.146 - AC_MSG_ERROR([Trying to use a non-existant override-source-root $with_override_source_root])
1.147 + AC_MSG_ERROR([Trying to use a non-existant override-source-root $with_override_source_root])
1.148 fi
1.149 CURDIR="$PWD"
1.150 cd "$with_override_source_root"
1.151 OVERRIDE_SRC_ROOT="`pwd`"
1.152 cd "$CURDIR"
1.153 if test -f $with_override_source_root/langtools/makefiles/Makefile || \
1.154 - test -f $with_override_source_root/langtools/make/Makefile; then
1.155 - AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.])
1.156 + test -f $with_override_source_root/langtools/make/Makefile; then
1.157 + AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.])
1.158 fi
1.159 if test -f $with_override_source_root/corba/makefiles/Makefile || \
1.160 - test -f $with_override_source_root/corba/make/Makefile; then
1.161 - AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.])
1.162 + test -f $with_override_source_root/corba/make/Makefile; then
1.163 + AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.])
1.164 fi
1.165 if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
1.166 - test -f $with_override_source_root/jaxp/make/Makefile; then
1.167 - AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.])
1.168 + test -f $with_override_source_root/jaxp/make/Makefile; then
1.169 + AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.])
1.170 fi
1.171 if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
1.172 - test -f $with_override_source_root/jaxws/make/Makefile; then
1.173 - AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.])
1.174 + test -f $with_override_source_root/jaxws/make/Makefile; then
1.175 + AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.])
1.176 fi
1.177 if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
1.178 - test -f $with_override_source_root/hotspot/make/Makefile; then
1.179 - AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.])
1.180 + test -f $with_override_source_root/hotspot/make/Makefile; then
1.181 + AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.])
1.182 + fi
1.183 + if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
1.184 + test -f $with_override_source_root/nashorn/make/Makefile; then
1.185 + AC_MSG_ERROR([Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override.])
1.186 fi
1.187 if test -f $with_override_source_root/jdk/makefiles/Makefile || \
1.188 - test -f $with_override_source_root/jdk/make/Makefile; then
1.189 - AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.])
1.190 + test -f $with_override_source_root/jdk/make/Makefile; then
1.191 + AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.])
1.192 fi
1.193 -fi
1.194 -AC_SUBST(OVERRIDE_SRC_ROOT)
1.195 + fi
1.196 + AC_SUBST(OVERRIDE_SRC_ROOT)
1.197
1.198 -###############################################################################
1.199 -#
1.200 -# Override a repo completely, this is used for example when you have 3 small
1.201 -# development sandboxes of the langtools sources and want to avoid having 3 full
1.202 -# OpenJDK sources checked out on disk.
1.203 -#
1.204 -# Assuming that the 3 langtools sandboxes are located here:
1.205 -# /home/fredrik/sandbox1/langtools
1.206 -# /home/fredrik/sandbox2/langtools
1.207 -# /home/fredrik/sandbox3/langtools
1.208 -#
1.209 -# From the source root you create build subdirs manually:
1.210 -# mkdir -p build1 build2 build3
1.211 -# in each build directory run:
1.212 -# (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make)
1.213 -# (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make)
1.214 -# (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make)
1.215 -#
1.216 + ###############################################################################
1.217 + #
1.218 + # Override a repo completely, this is used for example when you have 3 small
1.219 + # development sandboxes of the langtools sources and want to avoid having 3 full
1.220 + # OpenJDK sources checked out on disk.
1.221 + #
1.222 + # Assuming that the 3 langtools sandboxes are located here:
1.223 + # /home/fredrik/sandbox1/langtools
1.224 + # /home/fredrik/sandbox2/langtools
1.225 + # /home/fredrik/sandbox3/langtools
1.226 + #
1.227 + # From the source root you create build subdirs manually:
1.228 + # mkdir -p build1 build2 build3
1.229 + # in each build directory run:
1.230 + # (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make)
1.231 + # (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make)
1.232 + # (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make)
1.233 + #
1.234
1.235 -AC_ARG_WITH(override-langtools, [AS_HELP_STRING([--with-override-langtools],
1.236 - [use this langtools dir for the build])])
1.237 + AC_ARG_WITH(override-langtools, [AS_HELP_STRING([--with-override-langtools],
1.238 + [use this langtools dir for the build])])
1.239
1.240 -AC_ARG_WITH(override-corba, [AS_HELP_STRING([--with-override-corba],
1.241 - [use this corba dir for the build])])
1.242 + AC_ARG_WITH(override-corba, [AS_HELP_STRING([--with-override-corba],
1.243 + [use this corba dir for the build])])
1.244
1.245 -AC_ARG_WITH(override-jaxp, [AS_HELP_STRING([--with-override-jaxp],
1.246 - [use this jaxp dir for the build])])
1.247 + AC_ARG_WITH(override-jaxp, [AS_HELP_STRING([--with-override-jaxp],
1.248 + [use this jaxp dir for the build])])
1.249
1.250 -AC_ARG_WITH(override-jaxws, [AS_HELP_STRING([--with-override-jaxws],
1.251 - [use this jaxws dir for the build])])
1.252 + AC_ARG_WITH(override-jaxws, [AS_HELP_STRING([--with-override-jaxws],
1.253 + [use this jaxws dir for the build])])
1.254
1.255 -AC_ARG_WITH(override-hotspot, [AS_HELP_STRING([--with-override-hotspot],
1.256 - [use this hotspot dir for the build])])
1.257 + AC_ARG_WITH(override-hotspot, [AS_HELP_STRING([--with-override-hotspot],
1.258 + [use this hotspot dir for the build])])
1.259
1.260 -AC_ARG_WITH(override-jdk, [AS_HELP_STRING([--with-override-jdk],
1.261 - [use this jdk dir for the build])])
1.262 + AC_ARG_WITH(override-nashorn, [AS_HELP_STRING([--with-override-nashorn],
1.263 + [use this nashorn dir for the build])])
1.264
1.265 -if test "x$with_override_langtools" != x; then
1.266 + AC_ARG_WITH(override-jdk, [AS_HELP_STRING([--with-override-jdk],
1.267 + [use this jdk dir for the build])])
1.268 +
1.269 + if test "x$with_override_langtools" != x; then
1.270 CURDIR="$PWD"
1.271 cd "$with_override_langtools"
1.272 LANGTOOLS_TOPDIR="`pwd`"
1.273 cd "$CURDIR"
1.274 if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
1.275 - AC_MSG_ERROR([You have to override langtools with a full langtools repo!])
1.276 + AC_MSG_ERROR([You have to override langtools with a full langtools repo!])
1.277 fi
1.278 AC_MSG_CHECKING([if langtools should be overridden])
1.279 AC_MSG_RESULT([yes with $LANGTOOLS_TOPDIR])
1.280 -fi
1.281 -if test "x$with_override_corba" != x; then
1.282 + fi
1.283 + if test "x$with_override_corba" != x; then
1.284 CURDIR="$PWD"
1.285 cd "$with_override_corba"
1.286 CORBA_TOPDIR="`pwd`"
1.287 cd "$CURDIR"
1.288 if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
1.289 - AC_MSG_ERROR([You have to override corba with a full corba repo!])
1.290 + AC_MSG_ERROR([You have to override corba with a full corba repo!])
1.291 fi
1.292 AC_MSG_CHECKING([if corba should be overridden])
1.293 AC_MSG_RESULT([yes with $CORBA_TOPDIR])
1.294 -fi
1.295 -if test "x$with_override_jaxp" != x; then
1.296 + fi
1.297 + if test "x$with_override_jaxp" != x; then
1.298 CURDIR="$PWD"
1.299 cd "$with_override_jaxp"
1.300 JAXP_TOPDIR="`pwd`"
1.301 cd "$CURDIR"
1.302 if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
1.303 - AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!])
1.304 + AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!])
1.305 fi
1.306 AC_MSG_CHECKING([if jaxp should be overridden])
1.307 AC_MSG_RESULT([yes with $JAXP_TOPDIR])
1.308 -fi
1.309 -if test "x$with_override_jaxws" != x; then
1.310 + fi
1.311 + if test "x$with_override_jaxws" != x; then
1.312 CURDIR="$PWD"
1.313 cd "$with_override_jaxws"
1.314 JAXWS_TOPDIR="`pwd`"
1.315 cd "$CURDIR"
1.316 if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
1.317 - AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!])
1.318 + AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!])
1.319 fi
1.320 AC_MSG_CHECKING([if jaxws should be overridden])
1.321 AC_MSG_RESULT([yes with $JAXWS_TOPDIR])
1.322 -fi
1.323 -if test "x$with_override_hotspot" != x; then
1.324 + fi
1.325 + if test "x$with_override_hotspot" != x; then
1.326 CURDIR="$PWD"
1.327 cd "$with_override_hotspot"
1.328 HOTSPOT_TOPDIR="`pwd`"
1.329 cd "$CURDIR"
1.330 if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
1.331 - ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
1.332 - AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!])
1.333 + ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
1.334 + AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!])
1.335 fi
1.336 AC_MSG_CHECKING([if hotspot should be overridden])
1.337 AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR])
1.338 -fi
1.339 -if test "x$with_override_nashorn" != x; then
1.340 + fi
1.341 + if test "x$with_override_nashorn" != x; then
1.342 CURDIR="$PWD"
1.343 cd "$with_override_nashorn"
1.344 NASHORN_TOPDIR="`pwd`"
1.345 cd "$CURDIR"
1.346 - if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then
1.347 - AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
1.348 + if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
1.349 + AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
1.350 fi
1.351 AC_MSG_CHECKING([if nashorn should be overridden])
1.352 AC_MSG_RESULT([yes with $NASHORN_TOPDIR])
1.353 -fi
1.354 -if test "x$with_override_jdk" != x; then
1.355 + fi
1.356 + if test "x$with_override_jdk" != x; then
1.357 CURDIR="$PWD"
1.358 cd "$with_override_jdk"
1.359 JDK_TOPDIR="`pwd`"
1.360 cd "$CURDIR"
1.361 if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
1.362 - AC_MSG_ERROR([You have to override JDK with a full JDK repo!])
1.363 + AC_MSG_ERROR([You have to override JDK with a full JDK repo!])
1.364 fi
1.365 AC_MSG_CHECKING([if JDK should be overridden])
1.366 AC_MSG_RESULT([yes with $JDK_TOPDIR])
1.367 -fi
1.368 -
1.369 + fi
1.370 ])
1.371
1.372 AC_DEFUN_ONCE([SRCDIRS_SETUP_OUTPUT_DIRS],
1.373 [
1.374 -BUILD_OUTPUT="$OUTPUT_ROOT"
1.375 -AC_SUBST(BUILD_OUTPUT)
1.376 + BUILD_OUTPUT="$OUTPUT_ROOT"
1.377 + AC_SUBST(BUILD_OUTPUT)
1.378
1.379 -HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
1.380 -BUILD_HOTSPOT=true
1.381 -AC_SUBST(HOTSPOT_DIST)
1.382 -AC_SUBST(BUILD_HOTSPOT)
1.383 -AC_ARG_WITH(import-hotspot, [AS_HELP_STRING([--with-import-hotspot],
1.384 - [import hotspot binaries from this jdk image or hotspot build dist dir instead of building from source])])
1.385 -if test "x$with_import_hotspot" != x; then
1.386 + HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
1.387 + BUILD_HOTSPOT=true
1.388 + AC_SUBST(HOTSPOT_DIST)
1.389 + AC_SUBST(BUILD_HOTSPOT)
1.390 + AC_ARG_WITH(import-hotspot, [AS_HELP_STRING([--with-import-hotspot],
1.391 + [import hotspot binaries from this jdk image or hotspot build dist dir instead of building from source])])
1.392 + if test "x$with_import_hotspot" != x; then
1.393 CURDIR="$PWD"
1.394 cd "$with_import_hotspot"
1.395 HOTSPOT_DIST="`pwd`"
1.396 cd "$CURDIR"
1.397 if ! (test -d $HOTSPOT_DIST/lib && test -d $HOTSPOT_DIST/jre/lib); then
1.398 - AC_MSG_ERROR([You have to import hotspot from a full jdk image or hotspot build dist dir!])
1.399 + AC_MSG_ERROR([You have to import hotspot from a full jdk image or hotspot build dist dir!])
1.400 fi
1.401 AC_MSG_CHECKING([if hotspot should be imported])
1.402 AC_MSG_RESULT([yes from $HOTSPOT_DIST])
1.403 BUILD_HOTSPOT=false
1.404 -fi
1.405 + fi
1.406
1.407 -JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
1.408 + JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
1.409 ])
