openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
This commit is contained in:
Juan Quintela 2009-08-03 14:47:08 +02:00 committed by Anthony Liguori
parent 8e02e54cc4
commit f03029354e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -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 obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o
QEMU_CFLAGS+=$(CURL_CFLAGS) QEMU_CFLAGS+=$(CURL_CFLAGS)
LIBS+=$(CURL_LIBS)
cocoa.o: cocoa.m cocoa.o: cocoa.m

2
Makefile.target
View File

@ -300,7 +300,7 @@ vl.o: qemu-options.h
monitor.o: qemu-monitor.h monitor.o: qemu-monitor.h
LIBS += $(COCOA_LIBS) $(CURL_LIBS) LIBS += $(COCOA_LIBS)
ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
endif # CONFIG_SOFTMMU endif # CONFIG_SOFTMMU

3
configure vendored
View File

@ -1103,6 +1103,8 @@ EOF
curl_libs=`curl-config --libs 2>/dev/null` curl_libs=`curl-config --libs 2>/dev/null`
if compile_prog "$curl_cflags" "$curl_libs" ; then if compile_prog "$curl_cflags" "$curl_libs" ; then
curl=yes curl=yes
libs_tools="$curl_libs $libs_tools"
libs_softmmu="$curl_libs $libs_softmmu"
fi fi
fi # test "$curl" fi # test "$curl"
@ -1690,7 +1692,6 @@ fi
if test "$curl" = "yes" ; then if test "$curl" = "yes" ; then
echo "CONFIG_CURL=y" >> $config_host_mak echo "CONFIG_CURL=y" >> $config_host_mak
echo "CURL_CFLAGS=$curl_cflags" >> $config_host_mak echo "CURL_CFLAGS=$curl_cflags" >> $config_host_mak
echo "CURL_LIBS=$curl_libs" >> $config_host_mak
fi fi
if test "$brlapi" = "yes" ; then if test "$brlapi" = "yes" ; then
echo "CONFIG_BRLAPI=y" >> $config_host_mak echo "CONFIG_BRLAPI=y" >> $config_host_mak