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

[Caolán McNamara (via logerrit)]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 12520fd5c5d5a7191fbe17ddd503764b0c7368fa
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 3 15:37:03 2021 +0000
Commit:     Michael Stahl <michael.stahl at allotropia.de>
CommitDate: Thu Feb 4 10:48:09 2021 +0100

    don't need FindBin if --disable-openssl used
    
    Change-Id: I786ca760b8f4e606945acfc9b2667c2305c014d1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110353
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/configure.ac b/configure.ac
index 42158d2613b2..6a74bd3c6060 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6014,7 +6014,7 @@ fi
 if test "$with_system_hsqldb" = "yes"; then
     perl_use_string="$perl_use_string ; use Archive::Zip"
 fi
-if test "$with_system_openssl" != "yes"; then
+if test "$enable_openssl" = "yes" -a "$with_system_openssl" != "yes"; then
     # OpenSSL needs that to build
     perl_use_string="$perl_use_string ; use FindBin"
 fi