issue 336 - Look for libcurl-gnutls in addition to libcurl.so. Patch by Karl Tomlinson <karlt@mozbugz.karlt.net>, r=me

git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@435 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
ted.mielczarek 2009-12-03 16:31:25 +00:00
parent b1f271a4ec
commit 3b9b206b5f

View file

@ -69,8 +69,15 @@ bool HTTPUpload::SendRequest(const string &url,
void *curl_lib = dlopen("libcurl.so", RTLD_NOW); void *curl_lib = dlopen("libcurl.so", RTLD_NOW);
if (!curl_lib) { if (!curl_lib) {
if (error_description != NULL)
*error_description = dlerror();
curl_lib = dlopen("libcurl.so.4", RTLD_NOW); curl_lib = dlopen("libcurl.so.4", RTLD_NOW);
} }
if (!curl_lib) {
// Debian gives libcurl a different name when it is built against GnuTLS
// instead of OpenSSL.
curl_lib = dlopen("libcurl-gnutls.so.4", RTLD_NOW);
}
if (!curl_lib) { if (!curl_lib) {
curl_lib = dlopen("libcurl.so.3", RTLD_NOW); curl_lib = dlopen("libcurl.so.3", RTLD_NOW);
} }