# HG changeset patch
# User Yasumasa Suenaga <yasuenag@gmail.com>
# Date 1456317131 -32400
# Node ID eecc75027c2572d584aeb9c084dd1e043f47362f
# Parent  46eb873607e8655d77e18f2f93191bdb5d2489ef
Bug 2860: configure should regard $JAVA_HOME
Reviewed-by: ykubota
GitHub: https://github.com/HeapStats/heapstats/pull/16

diff -r 46eb873607e8 -r eecc75027c25 agent/ChangeLog
--- 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
diff -r 46eb873607e8 -r eecc75027c25 agent/configure
--- 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; }
diff -r 46eb873607e8 -r eecc75027c25 agent/configure.ac
--- 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])