[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - configure.ac
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Thu Oct 31 13:28:25 UTC 2019
configure.ac | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 1f8c284a194c72e94c55a8646322fd2476c62f23
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Oct 31 12:14:58 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Oct 31 14:28:05 2019 +0100
add -lssl and -lcrypto to LIBS, if SSL is enabled
Without this the linking with static poco libs failed on Ubuntu
16.04 and 18.04. Interestingly on other distros, including Debian
8, 9, 10, and CentOS 7, 8, and openSUSE, this patch was not necessary.
Change-Id: I96c90ab5e960e8843db9b835f6e1a0417c7b48f8
Reviewed-on: https://gerrit.libreoffice.org/81848
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/configure.ac b/configure.ac
index b40de3e60..ee4a4773d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -515,6 +515,9 @@ AC_SUBST(ENABLE_SUPPORT_KEY)
LIBS="$LIBS -lPocoNet${POCO_DEBUG_SUFFIX} -lPocoNetSSL${POCO_DEBUG_SUFFIX} -lPocoUtil${POCO_DEBUG_SUFFIX} -lPocoJSON${POCO_DEBUG_SUFFIX} -lPocoXML${POCO_DEBUG_SUFFIX} -lPocoFoundation${POCO_DEBUG_SUFFIX} -lPocoCrypto${POCO_DEBUG_SUFFIX}"
+AS_IF([test "$ENABLE_SSL" = "true"],
+ [LIBS="$LIBS -lssl -lcrypto"])
+
AS_IF([test "$ENABLE_IOSAPP" != "true"],
[AC_CHECK_HEADERS([LibreOfficeKit/LibreOfficeKit.h],
[],
More information about the Libreoffice-commits
mailing list