Automatically avoid export validation if not using Java

Change-Id: Ic1c917b16a8d812b3170b14890eacf3b9859cc2d

configure.ac

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