31 LANGTOOLS_TOPDIR="$SRC_ROOT/langtools" |
31 LANGTOOLS_TOPDIR="$SRC_ROOT/langtools" |
32 CORBA_TOPDIR="$SRC_ROOT/corba" |
32 CORBA_TOPDIR="$SRC_ROOT/corba" |
33 JAXP_TOPDIR="$SRC_ROOT/jaxp" |
33 JAXP_TOPDIR="$SRC_ROOT/jaxp" |
34 JAXWS_TOPDIR="$SRC_ROOT/jaxws" |
34 JAXWS_TOPDIR="$SRC_ROOT/jaxws" |
35 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" |
35 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" |
|
36 NASHORN_TOPDIR="$SRC_ROOT/nashorn" |
36 JDK_TOPDIR="$SRC_ROOT/jdk" |
37 JDK_TOPDIR="$SRC_ROOT/jdk" |
37 AC_SUBST(LANGTOOLS_TOPDIR) |
38 AC_SUBST(LANGTOOLS_TOPDIR) |
38 AC_SUBST(CORBA_TOPDIR) |
39 AC_SUBST(CORBA_TOPDIR) |
39 AC_SUBST(JAXP_TOPDIR) |
40 AC_SUBST(JAXP_TOPDIR) |
40 AC_SUBST(JAXWS_TOPDIR) |
41 AC_SUBST(JAXWS_TOPDIR) |
41 AC_SUBST(HOTSPOT_TOPDIR) |
42 AC_SUBST(HOTSPOT_TOPDIR) |
|
43 AC_SUBST(NASHORN_TOPDIR) |
42 AC_SUBST(JDK_TOPDIR) |
44 AC_SUBST(JDK_TOPDIR) |
43 ]) |
45 ]) |
44 |
46 |
45 |
47 |
46 AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS], |
48 AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS], |
231 ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then |
233 ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then |
232 AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!]) |
234 AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!]) |
233 fi |
235 fi |
234 AC_MSG_CHECKING([if hotspot should be overridden]) |
236 AC_MSG_CHECKING([if hotspot should be overridden]) |
235 AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR]) |
237 AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR]) |
236 fi |
238 fi |
|
239 if test "x$with_override_nashorn" != x; then |
|
240 CURDIR="$PWD" |
|
241 cd "$with_override_nashorn" |
|
242 NASHORN_TOPDIR="`pwd`" |
|
243 cd "$CURDIR" |
|
244 if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then |
|
245 AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!]) |
|
246 fi |
|
247 AC_MSG_CHECKING([if nashorn should be overridden]) |
|
248 AC_MSG_RESULT([yes with $NASHORN_TOPDIR]) |
|
249 fi |
237 if test "x$with_override_jdk" != x; then |
250 if test "x$with_override_jdk" != x; then |
238 CURDIR="$PWD" |
251 CURDIR="$PWD" |
239 cd "$with_override_jdk" |
252 cd "$with_override_jdk" |
240 JDK_TOPDIR="`pwd`" |
253 JDK_TOPDIR="`pwd`" |
241 cd "$CURDIR" |
254 cd "$CURDIR" |