equal
deleted
inserted
replaced
303 AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG]) |
303 AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG]) |
304 AC_MSG_NOTICE([This might be fixed by explicitely setting --with-boot-jdk]) |
304 AC_MSG_NOTICE([This might be fixed by explicitely setting --with-boot-jdk]) |
305 AC_MSG_ERROR([Cannot continue]) |
305 AC_MSG_ERROR([Cannot continue]) |
306 fi |
306 fi |
307 |
307 |
308 # Setup proper paths for what we found |
|
309 BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar" |
|
310 if test ! -f "$BOOT_RTJAR"; then |
|
311 # On MacOSX it is called classes.jar |
|
312 BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar" |
|
313 if test -f "$BOOT_RTJAR"; then |
|
314 # Remove the .. |
|
315 BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}" |
|
316 fi |
|
317 fi |
|
318 BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar" |
|
319 BOOT_JDK="$BOOT_JDK" |
|
320 AC_SUBST(BOOT_RTJAR) |
|
321 AC_SUBST(BOOT_TOOLSJAR) |
|
322 AC_SUBST(BOOT_JDK) |
308 AC_SUBST(BOOT_JDK) |
323 |
309 |
324 # Setup tools from the Boot JDK. |
310 # Setup tools from the Boot JDK. |
325 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java) |
311 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA, java) |
326 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac) |
312 BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC, javac) |