diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-08-25 14:21:20 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2016-08-25 20:42:23 +0000 |
| commit | 1b8c61d5ca8e2a7ae7a0bcd189b7a87defecea03 (patch) | |
| tree | 369a318fcaab73a3d54783c50d5022eaf7a7bd3b /configure.ac | |
| parent | 2ae6847bb15957d437702987fa4dbc9a50be9b46 (diff) | |
Bump JDK buildtime requirement to 1.6
Change-Id: I3dc715f3cd924d681658829254fd1392677d9e73
Reviewed-on: https://gerrit.libreoffice.org/28382
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 2d78068e6511..07747a7177bf 100644 --- a/configure.ac +++ b/configure.ac @@ -6879,7 +6879,6 @@ if test "$ENABLE_JAVA" != ""; then fi fi -HAVE_JAVA6= HAVE_JAVA9= dnl =================================================================== dnl Checks for JDK. @@ -6911,11 +6910,8 @@ if test "$ENABLE_JAVA" != ""; then _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//` _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` - if test "$_jdk_ver" -lt 10500; then - AC_MSG_ERROR([IBM JDK is too old, you need at least 1.5]) - fi - if test "$_jdk_ver" -ge 10600; then - HAVE_JAVA6=TRUE + if test "$_jdk_ver" -lt 10600; then + AC_MSG_ERROR([IBM JDK is too old, you need at least 1.6]) fi AC_MSG_RESULT([checked (IBM JDK $_jdk)]) @@ -6933,15 +6929,12 @@ you must use the "--with-jdk-home" configure option explicitly]) _jdk=`$JAVAINTERPRETER -version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[[-A-Za-z]]*//` _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` - if test "$_jdk_ver" -lt 10500; then - AC_MSG_ERROR([JDK is too old, you need at least 1.5]) + if test "$_jdk_ver" -lt 10600; then + AC_MSG_ERROR([JDK is too old, you need at least 1.6]) fi if test "$_jdk_ver" -gt 10600; then JAVA_CLASSPATH_NOT_SET="1" fi - if test "$_jdk_ver" -ge 10600; then - HAVE_JAVA6=TRUE - fi if test "$_jdk_ver" -ge 10900; then HAVE_JAVA9=TRUE fi @@ -6965,8 +6958,6 @@ else JAVA_HOME= export JAVA_HOME fi -AC_SUBST([HAVE_JAVA6]) -AC_SUBST([HAVE_JAVA9]) dnl =================================================================== dnl Set target Java bytecode version @@ -7309,9 +7300,6 @@ if test "$with_export_validation" = yes; then if test -z "$ENABLE_JAVA"; then AC_MSG_RESULT([no, as Java is disabled]) else - if test "$HAVE_JAVA6" != "TRUE"; then - AC_MSG_ERROR([officeotron needs at least JRE 1.6; update or specify --without-export-validation]) - fi AC_MSG_RESULT([yes]) AC_DEFINE(HAVE_EXPORT_VALIDATION) |