From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M9bFY-0003m8-Q5 for qemu-devel@nongnu.org; Thu, 28 May 2009 04:46:08 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M9bFU-0003ih-0L for qemu-devel@nongnu.org; Thu, 28 May 2009 04:46:08 -0400 Received: from [199.232.76.173] (port=35895 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M9bFT-0003iT-DP for qemu-devel@nongnu.org; Thu, 28 May 2009 04:46:03 -0400 Received: from qw-out-1920.google.com ([74.125.92.145]:35388) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M9bFS-0002yM-Oz for qemu-devel@nongnu.org; Thu, 28 May 2009 04:46:02 -0400 Received: by qw-out-1920.google.com with SMTP id 4so2653214qwk.4 for ; Thu, 28 May 2009 01:46:02 -0700 (PDT) Message-ID: <4A1E4F46.8080604@codemonkey.ws> Date: Thu, 28 May 2009 03:45:58 -0500 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] Re: [PATCH] Add HTTP protocol using curl v7 References: <1243004222-27822-1-git-send-email-agraf@suse.de> <20090527144951.GA4438@amd.home.annexia.org> <4A1D550C.6030807@codemonkey.ws> In-Reply-To: Content-Type: multipart/mixed; boundary="------------060505020400050407010602" List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Consul Cc: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------060505020400050407010602 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Consul wrote: > Anthony Liguori wrote: >> It's already in git. > > Does it work on Windows for anybody? In my case the git version of > configure does not even recognize the presence of libcurl. \ Is curl-config in your path? Does the following help? > The hack below makes it to compile in, but running for example "qemu > -cdrom http://aleksoft.net/fdbasecd.iso" hangs the emulator > with the following log. Any hints? It probably doesn't. AIO on Windows is really busted. It needs some serious work. Regards, Anthony Liguori --------------060505020400050407010602 Content-Type: text/x-patch; name="curl-config.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="curl-config.patch" commit 2712d0cbaa816ab6b0976f3d65b7cc9f222dd63f Author: Anthony Liguori Date: Thu May 28 03:44:23 2009 -0500 Make sure to respect curl-config CFLAGS Signed-off-by: Anthony Liguori diff --git a/Makefile.target b/Makefile.target index 445d55f..0078668 100644 --- a/Makefile.target +++ b/Makefile.target @@ -548,6 +548,11 @@ ifdef CONFIG_BLUEZ LIBS += $(CONFIG_BLUEZ_LIBS) endif +ifdef CONFIG_CURL +CPPFLAGS += $(CURL_CFLAGS) +LIBS += $(CURL_LIBS) +endif + # xen backend driver support XEN_OBJS := xen_machine_pv.o xen_domainbuild.o ifeq ($(CONFIG_XEN), yes) @@ -732,7 +737,7 @@ endif vl.o: qemu-options.h -$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS) +$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(QEMU_PROG): ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a $(HWLIB) $(call LINK,$(OBJS)) diff --git a/configure b/configure index 21c0633..2e68fe3 100755 --- a/configure +++ b/configure @@ -1079,7 +1079,8 @@ if test "$curl" = "yes" ; then int main(void) { return curl_easy_init(); } EOF curl_libs=`curl-config --libs 2>/dev/null` - if $cc $ARCH_CFLAGS $curl_libs -o $TMPE $TMPC > /dev/null 2> /dev/null ; then + curl_cflags=`curl-config --cflags 2>/dev/null` + if $cc $ARCH_CFLAGS $curl_cflags $curl_libs -o $TMPE $TMPC > /dev/null 2> /dev/null ; then curl=yes fi fi # test "$curl" @@ -1663,6 +1664,7 @@ fi if test "$curl" = "yes" ; then echo "CONFIG_CURL=yes" >> $config_mak echo "CURL_LIBS=$curl_libs" >> $config_mak + echo "CURL_CFLAGS=$curl_cflags" >> $config_mak echo "#define CONFIG_CURL 1" >> $config_h fi if test "$brlapi" = "yes" ; then --------------060505020400050407010602--