include/systools/curlinit.hxx | 2 ++
include/systools/opensslinit.hxx | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit af7e6fe6c7a76433ccb63d10d7cddd8335c0630c
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Sat Dec 9 11:44:43 2023 +0100
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Mon Dec 11 18:31:36 2023 +0100
Fix build --with-system-openssl but --without-system-curl
Change-Id: I60e2e995a159ebbbdc0991204d765b5654d5a4fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160510
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 7b2166c8217cb32f2f7951f074e33d9fe890bb9b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160489
Tested-by: Eike Rathke <er...@redhat.com>
diff --git a/include/systools/curlinit.hxx b/include/systools/curlinit.hxx
index bf2899ee1e23..d03c620a3c75 100644
--- a/include/systools/curlinit.hxx
+++ b/include/systools/curlinit.hxx
@@ -16,7 +16,9 @@
#if defined(LINUX) && !defined(SYSTEM_CURL)
#include <com/sun/star/uno/RuntimeException.hpp>
+#define LO_CURL_NEEDS_CA_BUNDLE
#include "opensslinit.hxx"
+#undef LO_CURL_NEEDS_CA_BUNDLE
#endif
#include <rtl/string.hxx>
diff --git a/include/systools/opensslinit.hxx b/include/systools/opensslinit.hxx
index 9c3f4c860895..04f38faa0821 100644
--- a/include/systools/opensslinit.hxx
+++ b/include/systools/opensslinit.hxx
@@ -11,7 +11,9 @@
#include <config_crypto.h>
-#if defined(LINUX) && !defined(SYSTEM_OPENSSL)
+// Also include/systools/curlinit.hxx needs GetCABundleFile() if
+// !defined(SYSTEM_CURL) it defines LO_CURL_NEEDS_CA_BUNDLE.
+#if defined(LINUX) && (!defined(SYSTEM_OPENSSL) ||
defined(LO_CURL_NEEDS_CA_BUNDLE))
#include <com/sun/star/uno/RuntimeException.hpp>
#include <unistd.h>
