summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-04-24 09:05:09 +0200
committerAron Budea <aron.budea@collabora.com>2024-05-31 17:10:40 +0200
commit26452c5c22e564323a819566e72ee444034a7b33 (patch)
tree8fc9bc7e8105d71691b4e4fb5bded015c2735368
parent389d5165bd86119f81f43684d3bd4958d072a396 (diff)
Allow to pass JAVA_SOURCE/TARGET_VER into configure mimo-6.2.8.2.M14
...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 <sbergman@redhat.com> (cherry picked from commit d365f36331874f94bbd9832fbd19ace90fafefec)
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 71022b841c46..7c9c698c843b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7010,8 +7010,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