FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 01-03-2011, 12:51 AM
Allan McRae
 
Default Perform a fetch-ectomy, removing libfetch entirely

On 03/01/11 11:13, Dave Reisner wrote:

Signed-off-by: Dave Reisner<d@falconindy.com>
---
configure.ac | 22 +----
lib/libalpm/alpm.c | 12 ---
lib/libalpm/dload.c | 264 +--------------------------------------------------
3 files changed, 6 insertions(+), 292 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3d536cd..23120e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,11 +93,14 @@ AC_ARG_WITH(openssl,
AS_HELP_STRING([--with-openssl], [use OpenSSL crypto implementations instead of internal routines]),
[], [with_openssl=check])

+<<<<<<< HEAD
# Help line for libfetch
AC_ARG_WITH(fetch,
AS_HELP_STRING([--with-fetch], [use libfetch as an internal downloader]),
[], [with_fetch=no])

+=======
+>>>>>>> 62cb945... Perform a fetch-ectomy, removing libfetch entirely



Looks like you did not finish a merge here.

Allan
 

Thread Tools




All times are GMT. The time now is 09:51 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org