1.1 --- a/common/autoconf/source-dirs.m4 Thu Mar 07 11:17:28 2013 -0800 1.2 +++ b/common/autoconf/source-dirs.m4 Tue Mar 12 16:38:11 2013 -0700 1.3 @@ -33,12 +33,14 @@ 1.4 JAXP_TOPDIR="$SRC_ROOT/jaxp" 1.5 JAXWS_TOPDIR="$SRC_ROOT/jaxws" 1.6 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" 1.7 +NASHORN_TOPDIR="$SRC_ROOT/nashorn" 1.8 JDK_TOPDIR="$SRC_ROOT/jdk" 1.9 AC_SUBST(LANGTOOLS_TOPDIR) 1.10 AC_SUBST(CORBA_TOPDIR) 1.11 AC_SUBST(JAXP_TOPDIR) 1.12 AC_SUBST(JAXWS_TOPDIR) 1.13 AC_SUBST(HOTSPOT_TOPDIR) 1.14 +AC_SUBST(NASHORN_TOPDIR) 1.15 AC_SUBST(JDK_TOPDIR) 1.16 ]) 1.17 1.18 @@ -233,7 +235,18 @@ 1.19 fi 1.20 AC_MSG_CHECKING([if hotspot should be overridden]) 1.21 AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR]) 1.22 -fi 1.23 +fi 1.24 +if test "x$with_override_nashorn" != x; then 1.25 + CURDIR="$PWD" 1.26 + cd "$with_override_nashorn" 1.27 + NASHORN_TOPDIR="`pwd`" 1.28 + cd "$CURDIR" 1.29 + if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then 1.30 + AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!]) 1.31 + fi 1.32 + AC_MSG_CHECKING([if nashorn should be overridden]) 1.33 + AC_MSG_RESULT([yes with $NASHORN_TOPDIR]) 1.34 +fi 1.35 if test "x$with_override_jdk" != x; then 1.36 CURDIR="$PWD" 1.37 cd "$with_override_jdk"