diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-10-06 10:20:53 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-10-06 10:21:09 +0200 |
| commit | 0595f3ff18f1105ba7bea4a9599c071575ea703c (patch) | |
| tree | 28b09f258867ec860d0bb4366ff8be45240e7823 /configure.ac | |
| parent | a836afe471d6df7bfc932fc419f7ccad7d40efb2 (diff) | |
Allow building with java9 (first installement)
In java9, there is no option for source/target 1.5,
the lowest version is 1.6.
This commit also patches the relevant external libraries
in order to be able to build with build-wide source/target
Change-Id: I68807c973a2a8be2f9b3a6e01243e36cb7110a12
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f14180a5e5f7..6e17ac2dab8a 100644 --- a/configure.ac +++ b/configure.ac @@ -6614,6 +6614,7 @@ if test "$ENABLE_JAVA" != ""; then fi HAVE_JAVA6= +HAVE_JAVA9= dnl =================================================================== dnl Checks for JDK. dnl =================================================================== @@ -6675,6 +6676,9 @@ you must use the "--with-jdk-home" configure option explicitly]) if test "$_jdk_ver" -ge 10600; then HAVE_JAVA6=TRUE fi + if test "$_jdk_ver" -ge 10900; then + HAVE_JAVA9=TRUE + fi AC_MSG_RESULT([checked (JDK $_jdk)]) JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` @@ -6695,13 +6699,17 @@ else JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME fi AC_SUBST([HAVE_JAVA6]) +AC_SUBST([HAVE_JAVA9]) dnl =================================================================== dnl Set target Java bytecode version dnl =================================================================== if test "$ENABLE_JAVA" != ""; then - _java_target_ver="1.5" - + if test "$HAVE_JAVA9" == "TRUE"; then + _java_target_ver="1.6" + else + _java_target_ver="1.5" + fi JAVA_SOURCE_VER="$_java_target_ver" JAVA_TARGET_VER="$_java_target_ver" fi |