Mercurial > hg > release > heapstats-1.1
changeset 50:eecc75027c25
Bug 2860: configure should regard $JAVA_HOME
Reviewed-by: ykubota
GitHub: https://github.com/HeapStats/heapstats/pull/16
| author | Yasumasa Suenaga <yasuenag@gmail.com> |
|---|---|
| date | Wed, 24 Feb 2016 21:32:11 +0900 |
| parents | 46eb873607e8 |
| children | 38c7e47cc6b9 |
| files | agent/ChangeLog agent/configure agent/configure.ac |
| diffstat | 3 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/agent/ChangeLog Mon Jan 18 21:28:27 2016 +0900 +++ b/agent/ChangeLog Wed Feb 24 21:32:11 2016 +0900 @@ -1,3 +1,7 @@ +2016-02-24 Yasumasa Suenaga <yasuenag@gmail.com> + + * Bug 2860: configure should regard $JAVA_HOME + 2016-01-18 Yasumasa Suenaga <yasuenag@gmail.com> * Bug 2793: MIB object type name fix
--- a/agent/configure Mon Jan 18 21:28:27 2016 +0900 +++ b/agent/configure Wed Feb 24 21:32:11 2016 +0900 @@ -18564,6 +18564,10 @@ JDK_DIR="$with_jdk" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JDK_DIR" >&5 $as_echo "$JDK_DIR" >&6; } +elif test -n "$JAVA_HOME"; then + JDK_DIR="$JAVA_HOME" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JDK_DIR" >&5 +$as_echo "$JDK_DIR" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 $as_echo "none" >&6; }
--- a/agent/configure.ac Mon Jan 18 21:28:27 2016 +0900 +++ b/agent/configure.ac Wed Feb 24 21:32:11 2016 +0900 @@ -314,6 +314,9 @@ if test "$with_jdk" != ""; then JDK_DIR="$with_jdk" AC_MSG_RESULT($JDK_DIR) +elif test -n "$JAVA_HOME"; then + JDK_DIR="$JAVA_HOME" + AC_MSG_RESULT($JDK_DIR) else AC_MSG_RESULT(none) AC_MSG_CHECKING([for default openjdk home directory])