Mercurial > hg > heapstats
changeset 148:3fe4fbc1e7f0
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:28:51 +0900 |
| parents | f5896ee78e30 |
| children | ac463161743c |
| files | ChangeLog configure configure.ac |
| diffstat | 3 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Feb 22 22:44:19 2016 +0900 +++ b/ChangeLog Wed Feb 24 21:28:51 2016 +0900 @@ -1,3 +1,7 @@ +2016-02-24 Yasumasa Suenaga <yasuenag@gmail.com> + + * Bug 2860: configure should regard $JAVA_HOME + 2016-02-22 Yasumasa Suenaga <yasuenag@gmail.com> * Bug 2857: NPE occurs when user choose multiple exclude filter.
--- a/configure Mon Feb 22 22:44:19 2016 +0900 +++ b/configure Wed Feb 24 21:28:51 2016 +0900 @@ -8082,12 +8082,16 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVA_HOME using configure arguments" >&5 -$as_echo_n "checking for JAVA_HOME using configure arguments... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVA_HOME using configure arguments and environment (\$JAVA_HOME)" >&5 +$as_echo_n "checking for JAVA_HOME using configure arguments and environment (\$JAVA_HOME)... " >&6; } if test -n "$with_jdk"; then 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/configure.ac Mon Feb 22 22:44:19 2016 +0900 +++ b/configure.ac Wed Feb 24 21:28:51 2016 +0900 @@ -195,10 +195,13 @@ AC_ARG_WITH([jdk], AC_HELP_STRING([--with-jdk@<:@=PATH@:>@], [Path to JDK home directory. (default: follow symbolic links from /etc/alternatives/java)])) -AC_MSG_CHECKING([for JAVA_HOME using configure arguments]) +AC_MSG_CHECKING([for JAVA_HOME using configure arguments and environment (\$JAVA_HOME)]) if test -n "$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_PATH_PROG([JAVA_PATH], [java], [], [/etc/alternatives])