|
Lines 355-361
detect_java_vm() {
Link Here
|
| 355 |
# uname -m Darwin |
355 |
# uname -m Darwin |
| 356 |
|
356 |
|
| 357 |
# If the user has the variable JAVA_HOME in the ENV |
357 |
# If the user has the variable JAVA_HOME in the ENV |
| 358 |
if test -n "$JAVA_HOME" ; then |
358 |
if test -n "$JAVA_HOME" ; then |
| 359 |
if test $SCIVERBOSE -ne 0; then |
359 |
if test $SCIVERBOSE -ne 0; then |
| 360 |
echo "Using specified vm: $JAVA_HOME" |
360 |
echo "Using specified vm: $JAVA_HOME" |
| 361 |
fi |
361 |
fi |
|
Lines 363-369
detect_java_vm() {
Link Here
|
| 363 |
echo "Cannot find $JAVA_HOME/bin/java" |
363 |
echo "Cannot find $JAVA_HOME/bin/java" |
| 364 |
exit 1 |
364 |
exit 1 |
| 365 |
fi |
365 |
fi |
| 366 |
fi |
366 |
else |
| 367 |
|
367 |
|
| 368 |
case $OS in |
368 |
case $OS in |
| 369 |
*darwin* | *Darwin*) |
369 |
*darwin* | *Darwin*) |
|
Lines 429-446
detect_java_vm() {
Link Here
|
| 429 |
done |
429 |
done |
| 430 |
IFS=$as_save_IFS |
430 |
IFS=$as_save_IFS |
| 431 |
fi |
431 |
fi |
|
|
432 |
fi |
| 432 |
if test ! -z "$JAVA_HOME"; then |
433 |
if test ! -z "$JAVA_HOME"; then |
| 433 |
if test $SCIVERBOSE -ne 0; then |
434 |
if test $SCIVERBOSE -ne 0; then |
| 434 |
echo "JAVA_HOME : $JAVA_HOME" |
435 |
echo "JAVA_HOME : $JAVA_HOME" |
| 435 |
fi |
436 |
fi |
| 436 |
|
|
|
| 437 |
# Manage JRE & JDK because libjava.so and others are stored in the JRE |
437 |
# Manage JRE & JDK because libjava.so and others are stored in the JRE |
| 438 |
if test -d $JAVA_HOME/jre; then |
438 |
if test -d $JAVA_HOME/jre; then |
| 439 |
JRE_HOME=$JAVA_HOME/jre |
439 |
JRE_HOME=$JAVA_HOME/jre |
| 440 |
else |
440 |
else |
| 441 |
JRE_HOME=$JAVA_HOME |
441 |
JRE_HOME=$JAVA_HOME |
| 442 |
fi |
442 |
fi |
| 443 |
|
|
|
| 444 |
# Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and libxxxx.so |
443 |
# Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and libxxxx.so |
| 445 |
|
444 |
|
| 446 |
case $OS in |
445 |
case $OS in |
