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

Markus Mohrhard markus.mohrhard at googlemail.com
Mon Feb 22 17:29:11 UTC 2016


 configure.ac |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit e72cd4053676d826ef9a914e62e89e26247bdd5c
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Feb 17 09:27:51 2016 +0100

    add officeotron version check
    
    This allows us to make sure that the correct officeotron version is
    installed on the machine.
    
    Change-Id: I1c4532bed3e91194f51aa6f6767711295282528f
    Reviewed-on: https://gerrit.libreoffice.org/22417
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/configure.ac b/configure.ac
index f1d8e94..aabe558 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2800,6 +2800,10 @@ if test "$with_export_validation" = yes; then
     if test -z "$OFFICEOTRON"; then
         AC_MSG_ERROR([officeotron not found, but required by --with-export-validation])
     fi
+    OFFICEOTRON_VER=`$OFFICEOTRON --version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
+    if test 0"$OFFICEOTRON_VER" -lt 704; then
+        AC_MSG_ERROR([officeotron too old])
+    fi
     AC_SUBST(OFFICEOTRON)
 else
     AC_MSG_RESULT([no])


More information about the Libreoffice-commits mailing list