summaryrefslogtreecommitdiffstats
path: root/lib/libalpm/alpm.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-03-16 19:25:35 -0500
committerDan McGee <dan@archlinux.org>2011-03-16 19:25:35 -0500
commitcff36093f3b778b3bda9c9d1a3acf24e36dd9f73 (patch)
tree2095bf581d9c12d5b0a61796359a5b40928f3630 /lib/libalpm/alpm.c
parent92630c660710332d0e02dea5a3c06c48f75d7321 (diff)
parentf2eac18a6ec62db3ec53744064e05416024c1b30 (diff)
downloadpacman-cff36093f3b778b3bda9c9d1a3acf24e36dd9f73.tar.xz
Merge branch 'download'
Diffstat (limited to 'lib/libalpm/alpm.c')
-rw-r--r--lib/libalpm/alpm.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 4f95832d..db2a63de 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -23,9 +23,8 @@
#include "config.h"
-/* connection caching setup */
-#ifdef HAVE_LIBFETCH
-#include <fetch.h>
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
#endif
/* libalpm */
@@ -65,8 +64,9 @@ int SYMEXPORT alpm_initialize(void)
bindtextdomain("libalpm", LOCALEDIR);
#endif
-#ifdef HAVE_LIBFETCH
- fetchConnectionCacheInit(5, 1);
+#ifdef HAVE_LIBCURL
+ curl_global_init(CURL_GLOBAL_SSL);
+ handle->curl = curl_easy_init();
#endif
return(0);
@@ -88,8 +88,8 @@ int SYMEXPORT alpm_release(void)
_alpm_handle_free(handle);
handle = NULL;
-#ifdef HAVE_LIBFETCH
- fetchConnectionCacheClose();
+#ifdef HAVE_LIBCURL
+ curl_global_cleanup();
#endif
return(0);