[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] Re: [PATCH] Add HTTP protocol using curl v7
From: |
Anthony Liguori |
Subject: |
Re: [Qemu-devel] Re: [PATCH] Add HTTP protocol using curl v7 |
Date: |
Thu, 28 May 2009 03:45:58 -0500 |
User-agent: |
Thunderbird 2.0.0.21 (X11/20090409) |
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
commit 2712d0cbaa816ab6b0976f3d65b7cc9f222dd63f
Author: Anthony Liguori <address@hidden>
Date: Thu May 28 03:44:23 2009 -0500
Make sure to respect curl-config CFLAGS
Signed-off-by: Anthony Liguori <address@hidden>
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