(openoffice) 03/12: Fix including OpenSSL dynamic libraries on Unix (#147)

[ardovm]

This is an automated email from the ASF dual-hosted git repository.

ardovm pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 41606ed7346160b3ca64565cb72ca5409c4bef18
Author: Arrigo Marchiori <ard...@yahoo.it>
AuthorDate: Fri May 6 21:16:33 2022 +0200

    Fix including OpenSSL dynamic libraries on Unix (#147)
    
    (cherry picked from commit 0ca5b4b7b8e66fbc937f89173ce45fcc179e72b3)
---
 main/openssl/prj/d.lst                    |  4 ++--
 main/scp2/source/ooo/file_library_ooo.scp | 11 +++++++----
 main/scp2/source/ooo/makefile.mk          |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/main/openssl/prj/d.lst b/main/openssl/prj/d.lst
index 6b67f0fefc..bfd80e44f8 100644
--- a/main/openssl/prj/d.lst
+++ b/main/openssl/prj/d.lst
@@ -5,6 +5,6 @@ mkdir: %_DEST%\inc%_EXT%\external\openssl
 ..\%__SRC%\bin\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll
 ..\%__SRC%\lib\libeay32.lib %_DEST%\lib%_EXT%\libeay32.lib
 ..\%__SRC%\bin\libeay32.dll %_DEST%\bin%_EXT%\libeay32.dll
-..\%__SRC%\lib\libcrypto.a %_DEST%\lib%_EXT%\libcrypto.a
-..\%__SRC%\lib\libssl.a %_DEST%\lib%_EXT%\libssl.a
+..\%__SRC%\lib\libcrypto.* %_DEST%\lib%_EXT%\libcrypto.*
+..\%__SRC%\lib\libssl.* %_DEST%\lib%_EXT%\libssl.*
  
diff --git a/main/scp2/source/ooo/file_library_ooo.scp 
b/main/scp2/source/ooo/file_library_ooo.scp
index 7e7c39d7ba..ae84b0d958 100644
--- a/main/scp2/source/ooo/file_library_ooo.scp
+++ b/main/scp2/source/ooo/file_library_ooo.scp
@@ -1776,6 +1776,8 @@ File gid_File_Lib_Openssl
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef WNT
     Name = "ssleay32.dll";
+  #else
+    Name = "libssl.so";
   #endif
 End
 #endif
@@ -1785,10 +1787,11 @@ File gid_File_Lib_Crypto
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-
-       #ifdef WNT
-         Name = "libeay32.dll";
-       #endif
+  #ifdef WNT
+    Name = "libeay32.dll";
+  #else
+    Name = "libcrypto.so";
+  #endif
 End
 #endif
 
diff --git a/main/scp2/source/ooo/makefile.mk b/main/scp2/source/ooo/makefile.mk
index f5ce610c4a..7fdbc1cb7d 100644
--- a/main/scp2/source/ooo/makefile.mk
+++ b/main/scp2/source/ooo/makefile.mk
@@ -223,7 +223,7 @@ SCPDEFS+=-DSYSTEM_NEON
 .ENDIF
 
 # if yes or unset (neon not used) -> do not install openssl library!
-.IF $(SYSTEM_OPENSSL) != "YES"
+.IF "$(SYSTEM_OPENSSL)" != "YES"
 SCPDEFS+=-DOPENSSL
 .ENDIF