[openoffice] branch AOO418 updated: Set java compilation target to version 1.5

[tr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

truckman pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO418 by this push:
     new c19b8f9  Set java compilation target to version 1.5
     new 7bcdd27  Merge pull request #101 from DonLewisFreeBSD/javadetection
c19b8f9 is described below

commit c19b8f986f6289381c53629bec12dd817a215275
Author: Don Lewis <tr...@apache.org>
AuthorDate: Tue Sep 29 14:34:51 2020 -0700

    Set java compilation target to version 1.5
    
    Set java compilation target to version 1.5 so that old versions of java
    can be detected even when building using a newer version of the compiler.
---
 main/configure.ac | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main/configure.ac b/main/configure.ac
index 01981be..d305f62 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -3066,6 +3066,7 @@ you must use the "--with-jdk-home" configure option explicitly])
              AC_MSG_ERROR([JDK is too old, you need at least 1.5])
         fi
         AC_MSG_RESULT([checked (JDK $_jdk)])
+        JAVAFLAGS="-source 1.5 -target 1.5"
         JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
         if test "$_os" = "WINNT"; then
           JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[[eE]][[xX]][[eE]]$,,"`
@@ -3114,6 +3115,7 @@ if test "$SOLAR_JAVA" != ""; then
        fi
        JAVACOMPILER=`cygpath -d "$JAVACOMPILER"`
        JAVACOMPILER=`cygpath -u "$JAVACOMPILER"`
+       JAVAFLAGS="-source 1.5 -target 1.5"
     fi
     if test "$_os" = "OS2"; then
        if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then