commit 2712d0cbaa816ab6b0976f3d65b7cc9f222dd63f
Author: Anthony Liguori <aliguori@us.ibm.com>
Date:   Thu May 28 03:44:23 2009 -0500

    Make sure to respect curl-config CFLAGS
    
    Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

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