mirror of https://gitee.com/openkylin/qemu.git
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:
parent
8e02e54cc4
commit
f03029354e
1
Makefile
1
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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue