summaryrefslogtreecommitdiffstats
path: root/lib/libalpm
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-09-06 18:20:51 +0200
committerDan McGee <dan@archlinux.org>2010-09-06 18:20:51 +0200
commitfe788ee4a68d2a8ba3bc3f938172294589c36fc4 (patch)
tree4de0ab1764f2b64502186d15cc1a11e4f33c8240 /lib/libalpm
parent881bf5c90f18cae47d4da06e570c934fdbdd4ecc (diff)
downloadpacman-fe788ee4a68d2a8ba3bc3f938172294589c36fc4.tar.gz
pacman-fe788ee4a68d2a8ba3bc3f938172294589c36fc4.tar.xz
Fix libfetch configure checking
I don't know what I tested in commit 3e7b90ff6950, but it definitely wasn't working as advertised. Fix the checks in the source code itself to match the right define (HAVE_LIBFETCH), as well as make sure the configure check defaults to looking for the library but not bailing if it could not be found. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/alpm.c6
-rw-r--r--lib/libalpm/dload.c6
-rw-r--r--lib/libalpm/error.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c
index 6f4f4a4c..3f9cfff3 100644
--- a/lib/libalpm/alpm.c
+++ b/lib/libalpm/alpm.c
@@ -24,7 +24,7 @@
#include "config.h"
/* connection caching setup */
-#ifdef HAVE_FETCH
+#ifdef HAVE_LIBFETCH
#include <fetch.h>
#endif
@@ -59,7 +59,7 @@ int SYMEXPORT alpm_initialize(void)
bindtextdomain("libalpm", LOCALEDIR);
#endif
-#ifdef HAVE_FETCH
+#ifdef HAVE_LIBFETCH
fetchConnectionCacheInit(5, 1);
#endif
@@ -82,7 +82,7 @@ int SYMEXPORT alpm_release(void)
_alpm_handle_free(handle);
handle = NULL;
-#ifdef HAVE_FETCH
+#ifdef HAVE_LIBFETCH
fetchConnectionCacheClose();
#endif
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index 32096e24..9b59f520 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -38,7 +38,7 @@
#include <sys/param.h> /* MAXHOSTNAMELEN */
#endif
-#ifdef HAVE_FETCH
+#ifdef HAVE_LIBFETCH
#include <fetch.h>
#endif
@@ -58,7 +58,7 @@ static char *get_filename(const char *url) {
return(filename);
}
-#ifdef HAVE_FETCH
+#ifdef HAVE_LIBFETCH
static char *get_destfile(const char *path, const char *filename) {
char *destfile;
/* len = localpath len + filename len + null */
@@ -338,7 +338,7 @@ cleanup:
static int download(const char *url, const char *localpath,
int force) {
if(handle->fetchcb == NULL) {
-#ifdef HAVE_FETCH
+#ifdef HAVE_LIBFETCH
return(download_internal(url, localpath, force));
#else
RET_ERR(PM_ERR_EXTERNAL_DOWNLOAD, -1);
diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c
index b64ee67c..c83f606e 100644
--- a/lib/libalpm/error.c
+++ b/lib/libalpm/error.c
@@ -31,7 +31,7 @@
#include <sys/param.h> /* MAXHOSTNAMELEN */
#endif
-#ifdef HAVE_FETCH
+#ifdef HAVE_LIBFETCH
#include <fetch.h> /* fetchLastErrString */
#endif
@@ -145,7 +145,7 @@ const char SYMEXPORT *alpm_strerror(int err)
* error string instead. */
return _("libarchive error");
case PM_ERR_LIBFETCH:
-#ifdef HAVE_FETCH
+#ifdef HAVE_LIBFETCH
return fetchLastErrString;
#else
/* obviously shouldn't get here... */