mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Automatically avoid export validation if not using Java

Browse Source 
Change-Id: Ic1c917b16a8d812b3170b14890eacf3b9859cc2d
This commit is contained in:
Tor Lillqvist
2016-08-19 17:00:24 +03:00
parent b9ebc6e4c8
commit f351446ac8
1 changed files with 63 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -4630,7 +4630,6 @@ if test "$cross_compiling" = "yes"; then
--with-parallelism="$with_parallelism" \ --with-parallelism="$with_parallelism" \
--without-doxygen \ --without-doxygen \
--without-java \ --without-java \
--without-export-validation \
$sub_conf_opts \ $sub_conf_opts \
--srcdir=$srcdir \ --srcdir=$srcdir \
2>&1 | sed -e 's/^/ /' 2>&1 | sed -e 's/^/ /'
@@ -7307,6 +7306,9 @@ dnl Export file validation
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([whether to enable export file validation]) AC_MSG_CHECKING([whether to enable export file validation])
if test "$with_export_validation" = yes; then 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 if test "$HAVE_JAVA6" != "TRUE"; then
AC_MSG_ERROR([officeotron needs at least JRE 1.6; update or specify --without-export-validation]) AC_MSG_ERROR([officeotron needs at least JRE 1.6; update or specify --without-export-validation])
fi fi
@@ -7370,6 +7372,7 @@ if test "$with_export_validation" = yes; then
else else
OFFICEOTRON="sh $OFFICEOTRON" OFFICEOTRON="sh $OFFICEOTRON"
fi fi
fi
AC_SUBST(OFFICEOTRON) AC_SUBST(OFFICEOTRON)
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])