[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

[Rene Engelhard]

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

New commits:
commit 768e1465afb3e78eb00b65afef1a681bada68127
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Jul 3 18:17:27 2018 +0200

    we still need a Archive::Zip test in configure.ac
    
    since system-hsqldb uses it for checking the hsqldb version. This partly
    reverts 4e3dc8c141c2efd037c1f214b5edff071812b6a8
    
    Change-Id: I60d333d5807404355dd8c8fc2763e76d3a7fa350
    Reviewed-on: https://gerrit.libreoffice.org/56888
    Reviewed-by: Rene Engelhard <rene at debian.org>
    Tested-by: Rene Engelhard <rene at debian.org>
    (cherry picked from commit d503b5d50b22fe376d74aadbe518bc616299a019)
    Reviewed-on: https://gerrit.libreoffice.org/56894

diff --git a/configure.ac b/configure.ac
index e5fb9f6f9d0a..cbbda6a4aa15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5022,6 +5022,9 @@ if test "$_os" = "WINNT"; then
         done
     fi
 fi
+if test "$with_system_hsqldb" = "yes"; then
+	perl_use_string="$perl_use_string ; use Archive::Zip"
+fi
 if $PERL -e "$perl_use_string">/dev/null 2>&1; then
     AC_MSG_RESULT([all modules found])
 else