[java-atk-wrapper] Specify JAVA_HOME
- From: Magdalen Berns <mberns src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [java-atk-wrapper] Specify JAVA_HOME
- Date: Mon, 10 Nov 2014 18:23:05 +0000 (UTC)
commit 390cd6314db1c35e24e2aaca344a923bd83198c5
Author: Magdalen Berns <m berns thismagpie com>
Date: Mon Nov 10 18:22:05 2014 +0000
Specify JAVA_HOME
JAVA_HOME is used but not specified in configure.ac so really it's just
a blank string. It can be determined from JavaInfo and then used.
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=739912
configure.ac | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7c4c968..f7434ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,11 +61,16 @@ JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-acces
AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location])
AC_ARG_VAR([JDK_SRC],[JDK installation path])
+
+`$JAVAC $JAVACFLAGS -classpath=$SRC_DIR/wrapper/org/GNOME/Accessibility $SRC_DIR/JavaInfo.java`
+JAVA_HOME=`$JAVA JavaInfo`/jre
+
if test -z "$JAVA_HOME"; then
JAVA_PATH=${PATH}
else
JAVA_PATH=${JAVA_HOME}:${JAVA_HOME}/jre/bin:${JAVA_HOME}/bin:${JAVA_HOME}/../bin:${PATH}
fi
+AC_SUBST(JAVA_HOME)
AC_PATH_PROG(JAVA,java,,${JAVA_PATH})
if test -z "$JAVA"; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]