[java-atk-wrapper] Change JRE_SRC back to JAVA_HOME
- From: Magdalen Berns <mberns src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [java-atk-wrapper] Change JRE_SRC back to JAVA_HOME
- Date: Mon, 10 Nov 2014 13:33:13 +0000 (UTC)
commit 4e4c6e42d3760ff1834ff30dcadba1e81d2e302d
Author: Magdalen Berns <m berns thismagpie com>
Date: Mon Nov 10 13:32:12 2014 +0000
Change JRE_SRC back to JAVA_HOME
It is better to follow convention even if that doesn't make
sense
configure.ac | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 845fc58..3ad2a3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_SUBST(LIB_ATK_WRAPPER_LT_VERSION)
AC_CONFIG_HEADERS([config.h])
-AC_PROG_CC
+AC_PROG_CC(cc)
AC_PROG_INSTALL
AC_ISC_POSIX
@@ -58,13 +58,13 @@ AC_SUBST(LIB_ATK_WRAPPER_LD_FLAGS)
JAVA_REQUIRED=1.5
JAVA_ERROR_MESSAGE="Java $JAVA_REQUIRED or later is required to build java-access-bridge"
-AC_ARG_VAR([JRE_SRC],[Java Runtime Environment location])
+AC_ARG_VAR([JAVA_HOME],[Java Runtime Environment location])
AC_ARG_VAR([JDK_SRC],[JDK installation path])
-if test -z "$JRE_SRC"; then
+if test -z "$JAVA_HOME"; then
JAVA_PATH=${PATH}
else
- JAVA_PATH=${JRE_SRC}:${JRE_SRC}/jre/bin:${JRE_SRC}/bin:${JRE_SRC}/../bin:${PATH}
+ JAVA_PATH=${JAVA_HOME}:${JAVA_HOME}/jre/bin:${JAVA_HOME}/bin:${JAVA_HOME}/../bin:${PATH}
fi
AC_PATH_PROG(JAVA,java,,${JAVA_PATH})
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]