1.1 --- a/common/autoconf/source-dirs.m4 Thu Sep 12 10:38:17 2013 +0200
1.2 +++ b/common/autoconf/source-dirs.m4 Thu Sep 12 10:42:19 2013 +0200
1.3 @@ -101,6 +101,10 @@
1.4 test -f $with_add_source_root/hotspot/make/Makefile; then
1.5 AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.])
1.6 fi
1.7 + if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
1.8 + test -f $with_add_source_root/nashorn/make/Makefile; then
1.9 + AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.])
1.10 + fi
1.11 if test -f $with_add_source_root/jdk/makefiles/Makefile || \
1.12 test -f $with_add_source_root/jdk/make/Makefile; then
1.13 AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.])
1.14 @@ -136,6 +140,10 @@
1.15 test -f $with_override_source_root/hotspot/make/Makefile; then
1.16 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.17 fi
1.18 + if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
1.19 + test -f $with_override_source_root/nashorn/make/Makefile; then
1.20 + 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.21 + fi
1.22 if test -f $with_override_source_root/jdk/makefiles/Makefile || \
1.23 test -f $with_override_source_root/jdk/make/Makefile; then
1.24 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.25 @@ -177,6 +185,9 @@
1.26 AC_ARG_WITH(override-hotspot, [AS_HELP_STRING([--with-override-hotspot],
1.27 [use this hotspot dir for the build])])
1.28
1.29 +AC_ARG_WITH(override-nashorn, [AS_HELP_STRING([--with-override-nashorn],
1.30 + [use this nashorn dir for the build])])
1.31 +
1.32 AC_ARG_WITH(override-jdk, [AS_HELP_STRING([--with-override-jdk],
1.33 [use this jdk dir for the build])])
1.34
1.35 @@ -241,7 +252,7 @@
1.36 cd "$with_override_nashorn"
1.37 NASHORN_TOPDIR="`pwd`"
1.38 cd "$CURDIR"
1.39 - if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then
1.40 + if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
1.41 AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
1.42 fi
1.43 AC_MSG_CHECKING([if nashorn should be overridden])
