From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, HTML_MESSAGE,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E6EEC4361B for ; Thu, 17 Dec 2020 12:03:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 43C6A238EF for ; Thu, 17 Dec 2020 12:03:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 43C6A238EF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kps00-0001YJ-VY for qemu-devel@archiver.kernel.org; Thu, 17 Dec 2020 07:03:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kprxw-0000ak-Dg for qemu-devel@nongnu.org; Thu, 17 Dec 2020 07:01:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56874) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kprxn-0006RT-Qp for qemu-devel@nongnu.org; Thu, 17 Dec 2020 07:01:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608206454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kbq8JX5fOckwn1EbcdsMmt7Sz5Y7eRZncyzxXUvWzeE=; b=dtCjmbyMI0YNH7S84JMmxbGHmDOxRSjncHLfkoNipEYYU5ojmJv5x2+cC7BQYvJkP7rZmd 9kQQRSroWrsYZIA+sCcfPsMCQytNZaGVbToJrJ4GVP/xH7+Su08rB+K+13jSFaFWql9HyS vxH1kYmTJsOX0XGi4KgArOS7iqMFetA= Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-216-N1Ck_LZyP0C511f-eSL2OQ-1; Thu, 17 Dec 2020 07:00:52 -0500 X-MC-Unique: N1Ck_LZyP0C511f-eSL2OQ-1 Received: by mail-io1-f72.google.com with SMTP id x7so26993216ion.12 for ; Thu, 17 Dec 2020 04:00:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=kbq8JX5fOckwn1EbcdsMmt7Sz5Y7eRZncyzxXUvWzeE=; b=F/cfqK3KnKGmKyfOYehF9wfhUcEuQLlKI26+P9yc31bxTC4TVv/chEoEXJdZojijfK 1G7oxIirBGxMpOBw7D8cpe7Bt3YZmJCc0UlUdzJDNHlkIBoQHuoIDfD/jTEZB5kwLXnI oGAm8UhW2lVrWvjWDyMa3qn+MMHDprBh4PEb1SQZXhLcvzIKZWtUABKJHw0f4Wq32i3w XG+QFKnKyUWoPxmraJLsYoANMWTk7+b3OiEV6V64FCB3u7wgjXuFFhO0+k/EhbhO1QOX E+ILr0KIaMe6PvbdkIrut0oEG9UGD0C/OGB6h7bgmc8GlCegTKnRq0L8Udj/ICo4isy5 IAtg== X-Gm-Message-State: AOAM533lzZNJPAATs8wqv1kU9qSBuIiSYWn0cpAI7rY7lNPjkk+6/0gM zMXCiPn+nrrXoObkyWmmOzNv4bF7eS0lmroR/QVKyGFt8nJ9FMeOXMZalx2XrJ9Mlcn2gwDh31v AMmqT63L/KWp6xy4ZiwMu0WCghTJbhKo= X-Received: by 2002:a6b:b74e:: with SMTP id h75mr10673150iof.0.1608206451628; Thu, 17 Dec 2020 04:00:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJz3Ai5M3PwAOddWsJh0MRb+Mul7+1cWSQ/sc0sJzmTPwCGRpdpHLq04Mw/64voSr2PPijy7lz9zB0tUsUDRJds= X-Received: by 2002:a6b:b74e:: with SMTP id h75mr10673134iof.0.1608206451440; Thu, 17 Dec 2020 04:00:51 -0800 (PST) MIME-Version: 1.0 References: <20201217094044.46462-1-pbonzini@redhat.com> <20201217094044.46462-4-pbonzini@redhat.com> In-Reply-To: From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Thu, 17 Dec 2020 16:00:40 +0400 Message-ID: Subject: Re: [PATCH 03/18] curl: convert to meson To: Paolo Bonzini Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="00000000000043920405b6a7be7d" Received-SPF: pass client-ip=63.128.21.124; envelope-from=mlureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --00000000000043920405b6a7be7d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Dec 17, 2020 at 3:59 PM Marc-Andr=C3=A9 Lureau < marcandre.lureau@redhat.com> wrote: > Hi > > On Thu, Dec 17, 2020 at 1:40 PM Paolo Bonzini wrote= : > >> Signed-off-by: Paolo Bonzini >> > --- >> configure | 31 ++++--------------------------- >> contrib/elf2dmp/meson.build | 2 +- >> meson.build | 11 +++++++---- >> meson_options.txt | 2 ++ >> 4 files changed, 14 insertions(+), 32 deletions(-) >> >> diff --git a/configure b/configure >> index c0a3e1556b..71196b1fe7 100755 >> --- a/configure >> +++ b/configure >> @@ -307,7 +307,7 @@ for opt do >> done >> >> brlapi=3D"auto" >> -curl=3D"$default_feature" >> +curl=3D"auto" >> > > What about default_feature=3Dno ? > Oh got it: $(if test "$default_features" =3D no; then echo "-Dauto_features=3Ddisabled"; fi) \ Reviewed-by: Marc-Andr=C3=A9 Lureau > iconv=3D"auto" >> curses=3D"auto" >> docs=3D"auto" >> @@ -1216,9 +1216,9 @@ for opt do >> ;; >> --enable-iconv) iconv=3D"enabled" >> ;; >> - --disable-curl) curl=3D"no" >> + --disable-curl) curl=3D"disabled" >> ;; >> - --enable-curl) curl=3D"yes" >> + --enable-curl) curl=3D"enabled" >> ;; >> --disable-fdt) fdt=3D"disabled" >> ;; >> @@ -3425,25 +3425,6 @@ for drv in $audio_drv_list; do >> esac >> done >> >> -########################################## >> -# curl probe >> -if test "$curl" !=3D "no" ; then >> - cat > $TMPC << EOF >> -#include >> -int main(void) { curl_easy_init(); curl_multi_setopt(0, 0, 0); return 0= ; >> } >> -EOF >> - curl_cflags=3D$($pkg_config libcurl --cflags 2>/dev/null) >> - curl_libs=3D$($pkg_config libcurl --libs 2>/dev/null) >> - if compile_prog "$curl_cflags" "$curl_libs" ; then >> - curl=3Dyes >> - else >> - if test "$curl" =3D "yes" ; then >> - feature_not_found "curl" "Install libcurl devel" >> - fi >> - curl=3Dno >> - fi >> -fi # test "$curl" >> - >> ########################################## >> # glib support probe >> >> @@ -6104,11 +6085,6 @@ fi >> if test "$bswap_h" =3D "yes" ; then >> echo "CONFIG_MACHINE_BSWAP_H=3Dy" >> $config_host_mak >> fi >> -if test "$curl" =3D "yes" ; then >> - echo "CONFIG_CURL=3Dy" >> $config_host_mak >> - echo "CURL_CFLAGS=3D$curl_cflags" >> $config_host_mak >> - echo "CURL_LIBS=3D$curl_libs" >> $config_host_mak >> -fi >> if test "$gtk" =3D "yes" ; then >> echo "CONFIG_GTK=3Dy" >> $config_host_mak >> echo "GTK_CFLAGS=3D$gtk_cflags" >> $config_host_mak >> @@ -6943,6 +6919,7 @@ NINJA=3D$ninja $meson setup \ >> -Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc_jpeg=3D$vnc_jpeg >> -Dvnc_png=3D$vnc_png \ >> -Dgettext=3D$gettext -Dxkbcommon=3D$xkbcommon -Du2f=3D$u2f >> -Dvirtiofsd=3D$virtiofsd \ >> -Dcapstone=3D$capstone -Dslirp=3D$slirp -Dfdt=3D$fdt -Dbrlapi= =3D$brlapi \ >> + -Dcurl=3D$curl \ >> -Diconv=3D$iconv -Dcurses=3D$curses -Dlibudev=3D$libudev\ >> -Ddocs=3D$docs -Dsphinx_build=3D$sphinx_build -Dinstall_blobs= =3D$blobs >> \ >> -Dvhost_user_blk_server=3D$vhost_user_blk_server \ >> diff --git a/contrib/elf2dmp/meson.build b/contrib/elf2dmp/meson.build >> index b3de173316..4d86cb390a 100644 >> --- a/contrib/elf2dmp/meson.build >> +++ b/contrib/elf2dmp/meson.build >> @@ -1,4 +1,4 @@ >> -if 'CONFIG_CURL' in config_host >> +if curl.found() >> executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', >> 'pdb.c', 'qemu_elf.c'), >> dependencies: [glib, curl], >> install: true) >> diff --git a/meson.build b/meson.build >> index 70f81121d7..83dbc61acd 100644 >> --- a/meson.build >> +++ b/meson.build >> @@ -392,9 +392,11 @@ if 'CONFIG_VIRGL' in config_host >> link_args: >> config_host['VIRGL_LIBS'].split()) >> endif >> curl =3D not_found >> -if 'CONFIG_CURL' in config_host >> - curl =3D declare_dependency(compile_args: >> config_host['CURL_CFLAGS'].split(), >> - link_args: config_host['CURL_LIBS'].split()= ) >> +if not get_option('curl').auto() or have_block >> + curl =3D dependency('libcurl', version: '>=3D7.29.0', >> + method: 'pkg-config', >> + required: get_option('curl'), >> + static: enable_static) >> endif >> libudev =3D not_found >> if targetos =3D=3D 'linux' and (have_system or have_tools) >> @@ -872,6 +874,7 @@ config_host_data.set('CONFIG_COCOA', cocoa.found()) >> config_host_data.set('CONFIG_LIBUDEV', libudev.found()) >> config_host_data.set('CONFIG_MPATH', mpathpersist.found()) >> config_host_data.set('CONFIG_MPATH_NEW_API', mpathpersist_new_api) >> +config_host_data.set('CONFIG_CURL', curl.found()) >> config_host_data.set('CONFIG_CURSES', curses.found()) >> config_host_data.set('CONFIG_SDL', sdl.found()) >> config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) >> @@ -2160,7 +2163,7 @@ summary_info +=3D {'iconv support': iconv.foun= d()} >> summary_info +=3D {'curses support': curses.found()} >> # TODO: add back version >> summary_info +=3D {'virgl support': >> config_host.has_key('CONFIG_VIRGL')} >> -summary_info +=3D {'curl support': config_host.has_key('CONFIG_CUR= L')} >> +summary_info +=3D {'curl support': curl.found()} >> summary_info +=3D {'mingw32 support': targetos =3D=3D 'windows'} >> summary_info +=3D {'Audio drivers': >> config_host['CONFIG_AUDIO_DRIVERS']} >> summary_info +=3D {'Block whitelist (rw)': >> config_host['CONFIG_BDRV_RW_WHITELIST']} >> diff --git a/meson_options.txt b/meson_options.txt >> index 62efe96a91..2b845ac62b 100644 >> --- a/meson_options.txt >> +++ b/meson_options.txt >> @@ -44,6 +44,8 @@ option('brlapi', type : 'feature', value : 'auto', >> description: 'brlapi character device driver') >> option('cocoa', type : 'feature', value : 'auto', >> description: 'Cocoa user interface (macOS only)') >> +option('curl', type : 'feature', value : 'auto', >> + description: 'CURL block device driver') >> option('mpath', type : 'feature', value : 'auto', >> description: 'Multipath persistent reservation passthrough') >> option('iconv', type : 'feature', value : 'auto', >> -- >> 2.29.2 >> >> >> --00000000000043920405b6a7be7d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Dec 17, 2020 at 3:59 PM Marc-= Andr=C3=A9 Lureau <marcan= dre.lureau@redhat.com> wrote:
Hi

On Thu, Dec 17, 2020 at 1:= 40 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
=C2=A0configure=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0| 31 ++++---------------------------
=C2=A0contrib/elf2dmp/meson.build |=C2=A0 2 +-
=C2=A0meson.build=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| 11 +++++++----
=C2=A0meson_options.txt=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 += +
=C2=A04 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/configure b/configure
index c0a3e1556b..71196b1fe7 100755
--- a/configure
+++ b/configure
@@ -307,7 +307,7 @@ for opt do
=C2=A0done

=C2=A0brlapi=3D"auto"
-curl=3D"$default_feature"
+curl=3D"auto"

What about def= ault_feature=3Dno ?

Oh go= t it:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 $(if test "$default_featur= es" =3D no; then echo "-Dauto_features=3Ddisabled"; fi) \

Reviewed-by: Marc-Andr=C3=A9 Lureau <marcandre.lureau@redhat.com>
=


=C2=A0iconv=3D"auto"
=C2=A0curses=3D"auto"
=C2=A0docs=3D"auto"
@@ -1216,9 +1216,9 @@ for opt do
=C2=A0 =C2=A0;;
=C2=A0 =C2=A0--enable-iconv) iconv=3D"enabled"
=C2=A0 =C2=A0;;
-=C2=A0 --disable-curl) curl=3D"no"
+=C2=A0 --disable-curl) curl=3D"disabled"
=C2=A0 =C2=A0;;
-=C2=A0 --enable-curl) curl=3D"yes"
+=C2=A0 --enable-curl) curl=3D"enabled"
=C2=A0 =C2=A0;;
=C2=A0 =C2=A0--disable-fdt) fdt=3D"disabled"
=C2=A0 =C2=A0;;
@@ -3425,25 +3425,6 @@ for drv in $audio_drv_list; do
=C2=A0 =C2=A0 =C2=A0esac
=C2=A0done

-##########################################
-# curl probe
-if test "$curl" !=3D "no" ; then
-=C2=A0 cat > $TMPC << EOF
-#include <curl/curl.h>
-int main(void) { curl_easy_init(); curl_multi_setopt(0, 0, 0); return 0; }=
-EOF
-=C2=A0 curl_cflags=3D$($pkg_config libcurl --cflags 2>/dev/null)
-=C2=A0 curl_libs=3D$($pkg_config libcurl --libs 2>/dev/null)
-=C2=A0 if compile_prog "$curl_cflags" "$curl_libs" ; t= hen
-=C2=A0 =C2=A0 curl=3Dyes
-=C2=A0 else
-=C2=A0 =C2=A0 if test "$curl" =3D "yes" ; then
-=C2=A0 =C2=A0 =C2=A0 feature_not_found "curl" "Install libc= url devel"
-=C2=A0 =C2=A0 fi
-=C2=A0 =C2=A0 curl=3Dno
-=C2=A0 fi
-fi # test "$curl"
-
=C2=A0##########################################
=C2=A0# glib support probe

@@ -6104,11 +6085,6 @@ fi
=C2=A0if test "$bswap_h" =3D "yes" ; then
=C2=A0 =C2=A0echo "CONFIG_MACHINE_BSWAP_H=3Dy" >> $config_h= ost_mak
=C2=A0fi
-if test "$curl" =3D "yes" ; then
-=C2=A0 echo "CONFIG_CURL=3Dy" >> $config_host_mak
-=C2=A0 echo "CURL_CFLAGS=3D$curl_cflags" >> $config_host_m= ak
-=C2=A0 echo "CURL_LIBS=3D$curl_libs" >> $config_host_mak -fi
=C2=A0if test "$gtk" =3D "yes" ; then
=C2=A0 =C2=A0echo "CONFIG_GTK=3Dy" >> $config_host_mak
=C2=A0 =C2=A0echo "GTK_CFLAGS=3D$gtk_cflags" >> $config_hos= t_mak
@@ -6943,6 +6919,7 @@ NINJA=3D$ninja $meson setup \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dvnc=3D$vnc -Dvnc_sasl=3D$vnc_sasl -Dvnc= _jpeg=3D$vnc_jpeg -Dvnc_png=3D$vnc_png \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dgettext=3D$gettext -Dxkbcommon=3D$xkbco= mmon -Du2f=3D$u2f -Dvirtiofsd=3D$virtiofsd \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dcapstone=3D$capstone -Dslirp=3D$slirp -= Dfdt=3D$fdt -Dbrlapi=3D$brlapi \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 -Dcurl=3D$curl \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Diconv=3D$iconv -Dcurses=3D$curses -Dlib= udev=3D$libudev\
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Ddocs=3D$docs -Dsphinx_build=3D$sphinx_b= uild -Dinstall_blobs=3D$blobs \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0-Dvhost_user_blk_server=3D$vhost_user_blk= _server \
diff --git a/contrib/elf2dmp/meson.build b/contrib/elf2dmp/meson.build
index b3de173316..4d86cb390a 100644
--- a/contrib/elf2dmp/meson.build
+++ b/contrib/elf2dmp/meson.build
@@ -1,4 +1,4 @@
-if 'CONFIG_CURL' in config_host
+if curl.found()
=C2=A0 =C2=A0executable('elf2dmp', files('main.c', 'add= rspace.c', 'download.c', 'pdb.c', 'qemu_elf.c')= ,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 dependencies: [glib, curl]= ,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 install: true)
diff --git a/meson.build b/meson.build
index 70f81121d7..83dbc61acd 100644
--- a/meson.build
+++ b/meson.build
@@ -392,9 +392,11 @@ if 'CONFIG_VIRGL' in config_host
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 link_args: config_host['VIRGL_LIBS'= ].split())
=C2=A0endif
=C2=A0curl =3D not_found
-if 'CONFIG_CURL' in config_host
-=C2=A0 curl =3D declare_dependency(compile_args: config_host['CURL_CFL= AGS'].split(),
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 link_args: config_host['CURL_LIBS'].split(= ))
+if not get_option('curl').auto() or have_block
+=C2=A0 curl =3D dependency('libcurl', version: '>=3D7.29.0&= #39;,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 meth= od: 'pkg-config',
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 requ= ired: get_option('curl'),
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 stat= ic: enable_static)
=C2=A0endif
=C2=A0libudev =3D not_found
=C2=A0if targetos =3D=3D 'linux' and (have_system or have_tools) @@ -872,6 +874,7 @@ config_host_data.set('CONFIG_COCOA', cocoa.foun= d())
=C2=A0config_host_data.set('CONFIG_LIBUDEV', libudev.found())
=C2=A0config_host_data.set('CONFIG_MPATH', mpathpersist.found()) =C2=A0config_host_data.set('CONFIG_MPATH_NEW_API', mpathpersist_new= _api)
+config_host_data.set('CONFIG_CURL', curl.found())
=C2=A0config_host_data.set('CONFIG_CURSES', curses.found())
=C2=A0config_host_data.set('CONFIG_SDL', sdl.found())
=C2=A0config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) @@ -2160,7 +2163,7 @@ summary_info +=3D {'iconv support':=C2=A0 =C2= =A0 =C2=A0iconv.found()}
=C2=A0summary_info +=3D {'curses support':=C2=A0 =C2=A0 curses.foun= d()}
=C2=A0# TODO: add back version
=C2=A0summary_info +=3D {'virgl support':=C2=A0 =C2=A0 =C2=A0config= _host.has_key('CONFIG_VIRGL')}
-summary_info +=3D {'curl support':=C2=A0 =C2=A0 =C2=A0 config_host= .has_key('CONFIG_CURL')}
+summary_info +=3D {'curl support':=C2=A0 =C2=A0 =C2=A0 curl.found(= )}
=C2=A0summary_info +=3D {'mingw32 support':=C2=A0 =C2=A0targetos = =3D=3D 'windows'}
=C2=A0summary_info +=3D {'Audio drivers':=C2=A0 =C2=A0 =C2=A0config= _host['CONFIG_AUDIO_DRIVERS']}
=C2=A0summary_info +=3D {'Block whitelist (rw)': config_host['C= ONFIG_BDRV_RW_WHITELIST']}
diff --git a/meson_options.txt b/meson_options.txt
index 62efe96a91..2b845ac62b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -44,6 +44,8 @@ option('brlapi', type : 'feature', value = : 'auto',
=C2=A0 =C2=A0 =C2=A0 =C2=A0 description: 'brlapi character device drive= r')
=C2=A0option('cocoa', type : 'feature', value : 'auto&#= 39;,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 description: 'Cocoa user interface (macOS o= nly)')
+option('curl', type : 'feature', value : 'auto', +=C2=A0 =C2=A0 =C2=A0 =C2=A0description: 'CURL block device driver'= )
=C2=A0option('mpath', type : 'feature', value : 'auto&#= 39;,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 description: 'Multipath persistent reservat= ion passthrough')
=C2=A0option('iconv', type : 'feature', value : 'auto&#= 39;,
--
2.29.2


--00000000000043920405b6a7be7d--