1.1 --- a/common/autoconf/generated-configure.sh Tue Jan 22 21:02:06 2013 -0800
1.2 +++ b/common/autoconf/generated-configure.sh Mon Jan 28 16:29:34 2013 -0400
1.3 @@ -738,6 +738,7 @@
1.4 OVERRIDE_SRC_ROOT
1.5 ADD_SRC_ROOT
1.6 JDK_TOPDIR
1.7 +NASHORN_TOPDIR
1.8 HOTSPOT_TOPDIR
1.9 JAXWS_TOPDIR
1.10 JAXP_TOPDIR
1.11 @@ -15627,6 +15628,7 @@
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
1.18
1.19 @@ -15637,6 +15639,7 @@
1.20
1.21
1.22
1.23 +
1.24 ###############################################################################
1.25 #
1.26 # Pickup additional source for a component from outside of the source root
1.27 @@ -15867,6 +15870,19 @@
1.28 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5
1.29 $as_echo "yes with $HOTSPOT_TOPDIR" >&6; }
1.30 fi
1.31 +if test "x$with_override_nashorn" != x; then
1.32 + CURDIR="$PWD"
1.33 + cd "$with_override_nashorn"
1.34 + NASHORN_TOPDIR="`pwd`"
1.35 + cd "$CURDIR"
1.36 + if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then
1.37 + as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
1.38 + fi
1.39 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
1.40 +$as_echo_n "checking if nashorn should be overridden... " >&6; }
1.41 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $NASHORN_TOPDIR" >&5
1.42 +$as_echo "yes with $NASHORN_TOPDIR" >&6; }
1.43 +fi
1.44 if test "x$with_override_jdk" != x; then
1.45 CURDIR="$PWD"
1.46 cd "$with_override_jdk"
