Mercurial > hg > heapstats
changeset 172:a77984fba64f
Bug 3023: [JDK 9] Search JDK shared-library correctly
Reviewed-by: yasuenag
GitHub: https://github.com/HeapStats/heapstats/pull/27
| author | KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp> |
|---|---|
| date | Fri, 01 Jul 2016 10:07:50 +0900 |
| parents | 8c4cec448fed |
| children | b92aa059996a |
| files | ChangeLog configure configure.ac |
| diffstat | 3 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jun 02 22:24:09 2016 +0900 +++ b/ChangeLog Fri Jul 01 10:07:50 2016 +0900 @@ -1,3 +1,7 @@ +2016-07-01 KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp> + + * Bug 3023: [JDK 9] Search JDK shared-library correctly + 2016-06-02 Yasumasa Suenaga <yasuenag@gmail.com> * Bug 2970: [JDK 9] Add ParallelOldGC hook for JDK 9
--- a/configure Thu Jun 02 22:24:09 2016 +0900 +++ b/configure Fri Jul 01 10:07:50 2016 +0900 @@ -8142,10 +8142,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JDK library using found JAVA_HOME" >&5 $as_echo_n "checking for JDK library using found JAVA_HOME... " >&6; } if test -z "$JDK_DIR" || test ! -d $JDK_DIR || test ! -r $JDK_DIR \ - || test ! -d $JDK_DIR/bin/ || test ! -r $JDK_DIR/bin/ \ - || test ! -d $JDK_DIR/include/ || test ! -r $JDK_DIR/include/ \ - || test ! -d $JDK_DIR/jre/ || test ! -r $JDK_DIR/jre/ \ - || test ! -d $JDK_DIR/lib/ || test ! -r $JDK_DIR/lib/ ; then + || test ! -d $JDK_DIR/bin/ || test ! -x $JDK_DIR/bin/javac ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } @@ -8186,6 +8183,10 @@ if test -d $JDK_DIR/jre/lib/$archPath/ ; then JVM_LIB_DIR=`$ECHO $JDK_DIR/jre/lib/$archPath 2>$DEVNULL` break + elif test -d $JDK_DIR/lib/$archPath/ ; then + # JDK9 does not have jre directory + JVM_LIB_DIR=`$ECHO $JDK_DIR/lib/$archPath 2>$DEVNULL` + break fi done
--- a/configure.ac Thu Jun 02 22:24:09 2016 +0900 +++ b/configure.ac Fri Jul 01 10:07:50 2016 +0900 @@ -228,11 +228,8 @@ AC_MSG_CHECKING([for JDK library using found JAVA_HOME]) if test -z "$JDK_DIR" || test ! -d $JDK_DIR || test ! -r $JDK_DIR \ - || test ! -d $JDK_DIR/bin/ || test ! -r $JDK_DIR/bin/ \ - || test ! -d $JDK_DIR/include/ || test ! -r $JDK_DIR/include/ \ - || test ! -d $JDK_DIR/jre/ || test ! -r $JDK_DIR/jre/ \ - || test ! -d $JDK_DIR/lib/ || test ! -r $JDK_DIR/lib/ ; then - + || test ! -d $JDK_DIR/bin/ || test ! -x $JDK_DIR/bin/javac ; then + AC_MSG_RESULT([not found]) AC_MSG_NOTICE([ [Do you put java at non default directory ?] @@ -263,6 +260,10 @@ if test -d $JDK_DIR/jre/lib/$archPath/ ; then JVM_LIB_DIR=`$ECHO $JDK_DIR/jre/lib/$archPath 2>$DEVNULL` break + elif test -d $JDK_DIR/lib/$archPath/ ; then + # JDK9 does not have jre directory + JVM_LIB_DIR=`$ECHO $JDK_DIR/lib/$archPath 2>$DEVNULL` + break fi done