From aed29eceaea8475ec7d55100d7c5868b7527f9b6 Mon Sep 17 00:00:00 2001
From: Marcus Comstedt <marcus@mc.pp.se>
Date: Wed, 19 Jan 2000 17:18:04 +0100
Subject: [PATCH] Now even more magical in finding JAVA_HOME... :-)
Rev: src/modules/Java/configure.in:1.8
---
src/modules/Java/configure.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/modules/Java/configure.in b/src/modules/Java/configure.in
index 81a5e1794a..cef4fbc413 100644
--- a/src/modules/Java/configure.in
+++ b/src/modules/Java/configure.in
@@ -67,7 +67,8 @@ if test "x$with_java" = xyes; then
AC_CACHE_VAL(pike_cv_java_java_home, [
if test "x$JAVA_HOME" = x; then
pike_cv_java_java_home=no
- for tmp_java_home in /usr/java /usr/local/java /usr/local/jdk* /usr/java*/jre /usr/local/java*/jre /usr/local/jdk*/jre /usr/local/jre* "$pike_java_user_lib_directory"/..; do
+ java_home_guess="`java -verbose 2>&1 | /bin/sed -n -e 's/^[[^/]]*//' -e 's:/lib/rt.jar .*$::' -e p -e q`"
+ for tmp_java_home in /usr/java /usr/local/java /usr/local/jdk* /usr/java*/jre /usr/local/java*/jre /usr/local/jdk*/jre /usr/local/jre* "$java_home_guess" "$pike_java_user_lib_directory"/..; do
if test -d $tmp_java_home/.; then
if ls "$tmp_java_home/lib/$pike_cv_java_arch/$pike_cv_java_threads_type"/libjvm* >/dev/null 2>&1 || \
ls "$tmp_java_home/lib/$pike_cv_java_arch"/libjvm* >/dev/null 2>&1 || \
--
GitLab