Add HTTPS_BACKEND_CURL_LINKED preprocessor AND CMake option.

src/CMakeLists.txt

@@ -33,7 +33,7 @@ endif ()
 
 ### "Libraries"
 add_library (https MODULE
-	lua/main.cpp
+	lua/luahttps.cpp
 )
 
 add_library (https-common STATIC
@@ -131,9 +131,13 @@ target_link_libraries (https https-common)
 
 if (USE_CURL_BACKEND)
 	set(HTTPS_BACKEND_CURL ON)
+	option(HTTPS_BACKEND_CURL_LINKED "Require libcurl at load-time instead at runtime." OFF)
 	find_package (CURL REQUIRED)
 	include_directories (${CURL_INCLUDE_DIRS})
 	target_link_libraries (https https-curl)
+	if (HTTPS_BACKEND_CURL_LINKED)
+		target_link_libraries(https ${CURL_LIBRARIES})
+	endif ()
 endif ()
 
 if (USE_OPENSSL_BACKEND)

src/common/config-generated.h.in

@@ -1,4 +1,5 @@
 #cmakedefine HTTPS_BACKEND_CURL
+#cmakedefine HTTPS_BACKEND_CURL_LINKED
 #cmakedefine HTTPS_BACKEND_OPENSSL
 #cmakedefine HTTPS_BACKEND_SCHANNEL
 #cmakedefine HTTPS_BACKEND_NSURL

src/generic/CurlClient.cpp

@@ -12,19 +12,22 @@
 #include <sstream>
 #include <vector>
 
+#ifndef HTTPS_BACKEND_CURL_LINKED
 // Dynamic library loader
 #ifdef _WIN32
 #include <windows.h>
 #else
 #include <dlfcn.h>
 #endif
+#endif
 
 typedef struct StringReader
 {
 	const std::string *str;
 	size_t pos;
 } StringReader;
 
+#ifndef HTTPS_BACKEND_CURL_LINKED
 template <class T>
 static inline bool loadSymbol(T &var, void *handle, const char *name)
 {
@@ -35,6 +38,7 @@ static inline bool loadSymbol(T &var, void *handle, const char *name)
 #endif
 	return var != nullptr;
 }
+#endif
 
 CurlClient::Curl::Curl()
 : handle(nullptr)
@@ -48,6 +52,19 @@ CurlClient::Curl::Curl()
 , slist_append(nullptr)
 , slist_free_all(nullptr)
 {
+#ifdef HTTPS_BACKEND_CURL_LINKED
+	// Linked cURL always available.
+	global_cleanup = &curl_global_cleanup;
+	easy_init = &curl_easy_init;
+	easy_cleanup = &curl_easy_cleanup;
+	easy_setopt = &curl_easy_setopt;
+	easy_perform = &curl_easy_perform;
+	easy_getinfo = &curl_easy_getinfo;
+	slist_append = &curl_slist_append;
+	slist_free_all = &curl_slist_free_all;
+
+	curl_global_init(CURL_GLOBAL_DEFAULT);
+#else
 #ifdef _WIN32
 	handle = (void *) LoadLibraryA("libcurl.dll");
 #else
@@ -78,6 +95,8 @@ CurlClient::Curl::Curl()
 		return;
 
 	global_init(CURL_GLOBAL_DEFAULT);
+#endif // HTTPS_BACKEND_CURL_LINKED
+
 	loaded = true;
 }
 
@@ -86,12 +105,14 @@ CurlClient::Curl::~Curl()
 	if (loaded)
 		global_cleanup();
 
+#ifndef HTTPS_BACKEND_CURL_LINKED
 	if (handle)
 #ifdef _WIN32
 		FreeLibrary((HMODULE) handle);
 #else
 		dlclose(handle);
 #endif
+#endif
 }
 
 static char toUppercase(char c)