diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-08-03 14:47:08 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-10 13:05:47 -0500 |
| commit | f03029354e47d3765ee006bb915fdaf9296900f3 (patch) | |
| tree | 42a87f064180f7c0a29a279cc808887e5cad04e9 | |
| parent | 8e02e54cc44de66229da0d97698f57e38b69b315 (diff) | |
CURL libs are used both by tools and softmmu
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | Makefile.target | 2 | ||||
| -rwxr-xr-x | configure | 3 |
3 files changed, 3 insertions, 3 deletions
@@ -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 94f0cc3c97..e61e6d7a6d 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 @@ -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 |