equal
deleted
inserted
replaced
96 fi # end check java |
96 fi # end check java |
97 fi # end check boot jdk found |
97 fi # end check boot jdk found |
98 fi |
98 fi |
99 ]) |
99 ]) |
100 |
100 |
101 # Test: Is bootjdk explicitely set by command line arguments? |
101 # Test: Is bootjdk explicitly set by command line arguments? |
102 AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS], |
102 AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS], |
103 [ |
103 [ |
104 if test "x$with_boot_jdk" != x; then |
104 if test "x$with_boot_jdk" != x; then |
105 BOOT_JDK=$with_boot_jdk |
105 BOOT_JDK=$with_boot_jdk |
106 BOOT_JDK_FOUND=maybe |
106 BOOT_JDK_FOUND=maybe |
236 [ |
236 [ |
237 AC_MSG_CHECKING([for $2 in Boot JDK]) |
237 AC_MSG_CHECKING([for $2 in Boot JDK]) |
238 $1=$BOOT_JDK/bin/$2 |
238 $1=$BOOT_JDK/bin/$2 |
239 if test ! -x [$]$1; then |
239 if test ! -x [$]$1; then |
240 AC_MSG_RESULT(not found) |
240 AC_MSG_RESULT(not found) |
241 AC_MSG_NOTICE([Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk]) |
241 AC_MSG_NOTICE([Your Boot JDK seems broken. This might be fixed by explicitly setting --with-boot-jdk]) |
242 AC_MSG_ERROR([Could not find $2 in the Boot JDK]) |
242 AC_MSG_ERROR([Could not find $2 in the Boot JDK]) |
243 fi |
243 fi |
244 AC_MSG_RESULT(ok) |
244 AC_MSG_RESULT(ok) |
245 AC_SUBST($1) |
245 AC_SUBST($1) |
246 ]) |
246 ]) |
260 # We look for the Boot JDK through various means, going from more certain to |
260 # We look for the Boot JDK through various means, going from more certain to |
261 # more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if |
261 # more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if |
262 # we detected something (if so, the path to the jdk is in BOOT_JDK). But we |
262 # we detected something (if so, the path to the jdk is in BOOT_JDK). But we |
263 # must check if this is indeed valid; otherwise we'll continue looking. |
263 # must check if this is indeed valid; otherwise we'll continue looking. |
264 |
264 |
265 # Test: Is bootjdk explicitely set by command line arguments? |
265 # Test: Is bootjdk explicitly set by command line arguments? |
266 BOOTJDK_DO_CHECK([BOOTJDK_CHECK_ARGUMENTS]) |
266 BOOTJDK_DO_CHECK([BOOTJDK_CHECK_ARGUMENTS]) |
267 if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then |
267 if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then |
268 # Having specified an argument which is incorrect will produce an instant failure; |
268 # Having specified an argument which is incorrect will produce an instant failure; |
269 # we should not go on looking |
269 # we should not go on looking |
270 AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK]) |
270 AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK]) |
284 |
284 |
285 # If we haven't found anything yet, we've truly lost. Give up. |
285 # If we haven't found anything yet, we've truly lost. Give up. |
286 if test "x$BOOT_JDK_FOUND" = xno; then |
286 if test "x$BOOT_JDK_FOUND" = xno; then |
287 HELP_MSG_MISSING_DEPENDENCY([openjdk]) |
287 HELP_MSG_MISSING_DEPENDENCY([openjdk]) |
288 AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG]) |
288 AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG]) |
289 AC_MSG_NOTICE([This might be fixed by explicitely setting --with-boot-jdk]) |
289 AC_MSG_NOTICE([This might be fixed by explicitly setting --with-boot-jdk]) |
290 AC_MSG_ERROR([Cannot continue]) |
290 AC_MSG_ERROR([Cannot continue]) |
291 fi |
291 fi |
292 |
292 |
293 AC_SUBST(BOOT_JDK) |
293 AC_SUBST(BOOT_JDK) |
294 |
294 |