Curl block driver is built as shared object module when enabled. We have per object cflags and libs support now, move CURL_CFLAGS and CURL_LIBS from global option variables to a per object basis.
"make install" is not installing it yet, manually copy it to ${prefix}/qemu/block/curl.so to make it loaded. Signed-off-by: Fam Zheng <f...@redhat.com> --- block/Makefile.objs | 3 ++- configure | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/block/Makefile.objs b/block/Makefile.objs index 4cf9aa4..b1e1520 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -23,4 +23,5 @@ common-obj-y += commit.o common-obj-y += mirror.o common-obj-y += backup.o -$(obj)/curl.o: QEMU_CFLAGS+=$(CURL_CFLAGS) +$(obj)/curl.o-cflags := $(CURL_CFLAGS) +$(obj)/curl.o-libs := $(CURL_LIBS) diff --git a/configure b/configure index 7fec1c7..4adc267 100755 --- a/configure +++ b/configure @@ -2210,8 +2210,6 @@ EOF curl_libs=`$curlconfig --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" else if test "$curl" = "yes" ; then feature_not_found "curl" @@ -3889,8 +3887,9 @@ if test "$bswap_h" = "yes" ; then echo "CONFIG_MACHINE_BSWAP_H=y" >> $config_host_mak fi if test "$curl" = "yes" ; then - echo "CONFIG_CURL=y" >> $config_host_mak + echo "CONFIG_CURL=m" >> $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.8.3.1