configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d365f36331874f94bbd9832fbd19ace90fafefec
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Apr 24 09:05:09 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Apr 24 11:09:57 2019 +0200
Allow to pass JAVA_SOURCE/TARGET_VER into configure
...for those who pretend they know what they are doing (e.g., to experiment
with
building against Java 12 which no longer supports Java 1.6 source/target,
even
though that results in a build that is not baseline compatible).
Change-Id: I6e8617bc5b90212473652bdfac40bb48e9623a08
Reviewed-on: https://gerrit.libreoffice.org/71218
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 567746177490..9d010de28280 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7203,8 +7203,8 @@ dnl Checks for javac
dnl ===================================================================
if test "$ENABLE_JAVA" != ""; then
javacompiler="javac"
- JAVA_SOURCE_VER="1.6"
- JAVA_TARGET_VER="1.6"
+ : ${JAVA_SOURCE_VER=1.6}
+ : ${JAVA_TARGET_VER=1.6}
if test -z "$with_jdk_home"; then
AC_PATH_PROG(JAVACOMPILER, $javacompiler)
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
