[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 77/81] CURL libs are used both by tools and softmmu
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 77/81] CURL libs are used both by tools and softmmu |
Date: |
Mon, 3 Aug 2009 14:47:08 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 1 -
Makefile.target | 2 +-
configure | 3 ++-
3 files changed, 3 insertions(+), 3 deletions(-)
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
--
1.6.2.5
- Re: [Qemu-devel] [PATCH 70/81] remove last 3 uses of :=, everywhere else uses += or =, (continued)
[Qemu-devel] [PATCH 71/81] Consolidate audio flags in configure, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 73/81] use TARGET_<arch name> for selection, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 72/81] We also need TARGET_<arechname> in Makefiles, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 74/81] Disable aio in mingw32, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 76/81] VDE libs are used both by tools and softmmu, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 75/81] Add libs_tools support, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 77/81] CURL libs are used both by tools and softmmu,
Juan Quintela <=
[Qemu-devel] [PATCH 79/81] convert gprof flags to style of rest of Makefile, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 78/81] Add cocoa libs at Darwin selection time, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 80/81] Move libsunpath to use the same style than everything else, Juan Quintela, 2009/08/03
[Qemu-devel] [PATCH 81/81] rename aio/CONFIG_AIO to posix_aio/CONFIG_POSIX_AIO, Juan Quintela, 2009/08/03
[Qemu-devel] Re: [PATCH 81/81] rename aio/CONFIG_AIO to posix_aio/CONFIG_POSIX_AIO, Juan Quintela, 2009/08/10