32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From f0e34eaf4969af89eab22331c882a0a8a10e82d8 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
|
Date: Tue, 12 Sep 2017 10:32:26 +0200
|
|
Subject: [PATCH 2/2] Detect libjawt automatically on java9 too
|
|
|
|
Change-Id: Ie8eb53a915682b7a188b1af4b2d435eb0cc9ff81
|
|
---
|
|
configure.ac | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index f053df0192c7..d99b67676177 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -7003,7 +7003,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])
|
|
--
|
|
2.14.1
|
|
|