diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2017-09-12 10:32:26 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2017-09-12 13:36:52 +0200 |
| commit | 047b4c14ada038204a1e1280742960db00a5d1f2 (patch) | |
| tree | 1f4099e409ee8c1e788fbcca9cbdf83067dbb097 /configure.ac | |
| parent | 41c704a8d6ca225e0ba0b1deb730c2bead66da25 (diff) | |
Detect libjawt automatically on java9 too
Change-Id: Ie8eb53a915682b7a188b1af4b2d435eb0cc9ff81
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f616afef856e..4cd1700088d5 100644 --- a/configure.ac +++ b/configure.ac @@ -7000,7 +7000,12 @@ then my_java_arch=$host_cpu ;; esac - JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt" + # This is where JDK9 puts the library + if test -e "$JAVA_HOME/lib/libjawt.so"; then + JAWTLIB="-L$JAVA_HOME/lib/ -ljawt" + else + JAWTLIB="-L$JAVA_HOME/jre/lib/$my_java_arch -ljawt" + fi AS_IF([test "$JAVA_ARCH" != ""], [AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$JAVA_ARCH"])]) fi AC_MSG_RESULT([$JAWTLIB]) |