config_host.mk.in | 1 -
configure.ac | 20 ++++----------------
2 files changed, 4 insertions(+), 17 deletions(-)
New commits:
commit 1b8c61d5ca8e2a7ae7a0bcd189b7a87defecea03
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Thu Aug 25 14:21:20 2016 +0200
Bump JDK buildtime requirement to 1.6
Change-Id: I3dc715f3cd924d681658829254fd1392677d9e73
Reviewed-on: https://gerrit.libreoffice.org/28382
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/config_host.mk.in b/config_host.mk.in
index 3e5b286..0ebdb8f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -256,7 +256,6 @@ export HAVE_GCC_PRAGMA_OPERATOR=@HAVE_GCC_PRAGMA_OPERATOR@
export HAVE_GCC_VISIBILITY_BROKEN=@HAVE_GCC_VISIBILITY_BROKEN@
export HAVE_GCC_VISIBILITY_FEATURE=@HAVE_GCC_VISIBILITY_FEATURE@
export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@
-export HAVE_JAVA6=@HAVE_JAVA6@
export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
export
HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@
diff --git a/configure.ac b/configure.ac
index 2d78068..07747a7 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
