diff mbox

[77/81] CURL libs are used both by tools and softmmu

Message ID d3ccaf3ce45236b436909338b155d9c090ae9519.1249301360.git.quintela@redhat.com
State Superseded
Headers show

Commit Message

Juan Quintela Aug. 3, 2009, 12:47 p.m. UTC 
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile        |    1 -
 Makefile.target |    2 +-
 configure       |    3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 7fe36c4..7742461 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,6 @@  obj-$(CONFIG_XEN) += xen_backend.o xen_devconfig.o
 obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o

 QEMU_CFLAGS+=$(CURL_CFLAGS)
-LIBS+=$(CURL_LIBS)

 cocoa.o: cocoa.m

diff --git a/Makefile.target b/Makefile.target
index 01275f8..01fc052 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -300,7 +300,7 @@  vl.o: qemu-options.h

 monitor.o: qemu-monitor.h

-LIBS += $(COCOA_LIBS) $(CURL_LIBS)
+LIBS += $(COCOA_LIBS)
 ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)

 endif # CONFIG_SOFTMMU
diff --git a/configure b/configure
index 1da827b..046531a 100755
--- a/configure
+++ b/configure
@@ -1103,6 +1103,8 @@  EOF
   curl_libs=`curl-config --libs 2>/dev/null`
   if compile_prog "$curl_cflags" "$curl_libs" ; then
     curl=yes
+    libs_tools="$curl_libs $libs_tools"
+    libs_softmmu="$curl_libs $libs_softmmu"
   fi
 fi # test "$curl"

@@ -1690,7 +1692,6 @@  fi
 if test "$curl" = "yes" ; then
   echo "CONFIG_CURL=y" >> $config_host_mak
   echo "CURL_CFLAGS=$curl_cflags" >> $config_host_mak
-  echo "CURL_LIBS=$curl_libs" >> $config_host_mak
 fi
 if test "$brlapi" = "yes" ; then
   echo "CONFIG_BRLAPI=y" >> $config_host_mak