[Libreoffice-commits] core.git: 2 commits - configure.ac

[Thorsten Behrens]

 configure.ac |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit b9ebc6e4c8b0ae72f4a208df29f99fe1404595ed
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Fri Aug 19 15:39:55 2016 +0200

    configure.ac: use sed from path_progrs macro
    
    Change-Id: I79a6352eabba6d6f3064df2340d53c2808210f6c

diff --git a/configure.ac b/configure.ac
index 0e386be0..847651b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7321,7 +7321,7 @@ if test "$with_export_validation" = yes; then
         ODFVALIDATOR="$SRC_ROOT/bin/odfvalidator.sh"
 
         # and fetch name of odfvalidator jar name from download.lst
-        ODFVALIDATOR_JAR=`sed -ne "s/export *ODFVALIDATOR_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst`
+        ODFVALIDATOR_JAR=`$SED -n -e "s/export *ODFVALIDATOR_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst`
         AC_SUBST(ODFVALIDATOR_JAR)
 
         if test -z "$ODFVALIDATOR_JAR"; then
@@ -7348,7 +7348,7 @@ if test "$with_export_validation" = yes; then
         OFFICEOTRON="$SRC_ROOT/bin/officeotron.sh"
 
         # and fetch name of officeotron jar name from download.lst
-        OFFICEOTRON_JAR=`sed -ne "s/export *OFFICEOTRON_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst`
+        OFFICEOTRON_JAR=`$SED -n -e "s/export *OFFICEOTRON_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst`
         AC_SUBST(OFFICEOTRON_JAR)
 
         if test -z "$OFFICEOTRON_JAR"; then
commit 53c98f01effb31c3308f0c27e4cc0bdd37fd974f
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Fri Aug 19 15:33:17 2016 +0200

    configure.ac: invert help text semantics for export-validation
    
    Change-Id: I5444c89db7bf46b1894026aa8a2d58ce4d2294df

diff --git a/configure.ac b/configure.ac
index 81fb048..0e386be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2035,10 +2035,9 @@ AC_ARG_WITH(symbol-config,
         [with_symbol_config=no])
 
 AC_ARG_WITH(export-validation,
-    AS_HELP_STRING([--with-export-validation],
-        [If you want the exported files to be validated. Right now limited to OOXML and ODF files.
-         Note: You need executable scripts officeotron and odfvalidator that take the path to the file.
-         See https://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/export-validation]),
+    AS_HELP_STRING([--without-export-validation],
+        [Disable validating OOXML and ODF files as exported from in-tree tests.
+         Use this option e.g. if your system only provides Java 5.]),
 ,with_export_validation=yes)
 
 AC_ARG_WITH(bffvalidator,