[libgda/LIBGDA_5.2] JDBC: Fix detection of JRE 11.0
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda/LIBGDA_5.2] JDBC: Fix detection of JRE 11.0
- Date: Tue, 23 Apr 2019 19:06:21 +0000 (UTC)
commit aa2e20b1ae4fd5809d2b1b88eef66d85eb7e8989
Author: Daniel Espinosa <esodan gmail com>
Date: Tue Apr 23 11:25:16 2019 -0500
JDBC: Fix detection of JRE 11.0
NEWS | 1 +
m4/java.m4 | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/NEWS b/NEWS
index 41bc53dff..60df12614 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
libgda 5.2.9
- Fix Sun JRE 1.8 detection
+ - Fix JDK 11.0 detection
- Drop unneeded JAVAH variable check
- Fix build for System Installed SQLite libs
- Non-Dates and Timestamps values returns 'NULL' string when converted
diff --git a/m4/java.m4 b/m4/java.m4
index f036e4c79..57a4f2a41 100644
--- a/m4/java.m4
+++ b/m4/java.m4
@@ -178,6 +178,11 @@ m4_define([_JAVA_CHECK_INTERNAL],
JTYPE="Sun JRE 1.8"
JFLAGS="-Xlint:unchecked -Xlint:deprecation"
;;
+ JRE11.0.*)
+ try_java=true
+ JTYPE="Sun JRE 11.0"
+ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
+ ;;
JREgcj-4*)
try_java=true
JTYPE="GCJ"
@@ -217,7 +222,7 @@ m4_define([_JAVA_CHECK_INTERNAL],
;;
*)
RUN_JAVA(JAVA_LIBS, [-classpath ${srcdir} getsp -libs])
- JAVA_LIBS="${JAVA_LIBS} -ljvm"
+ JAVA_LIBS="${JAVA_LIBS} -L${JAVA_HOME}/lib/server -ljvm"
RUN_JAVA(JAVA_LD_PATH, [-classpath ${srcdir} getsp -ldpath])
;;
esac
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]