fixup! curl: add 8.0.1

mesonbuild · Sep 9, 2023 · 698727f · 698727f
1 parent e646dc3
commit 698727f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/subprojects/packagefiles/curl/meson.build b/subprojects/packagefiles/curl/meson.build
@@ -562,12 +562,12 @@ schannel_opt = get_option(
   'schannel',
 ).disable_auto_if(
   ssl_backends.length() > 0,
-).require(
-  ssl_opt.allowed(),
-  error_message: SSL_DISABLED_ERROR,
 ).require(
   host_machine.system() == 'windows',
   error_message: WINDOWS_ONLY_ERROR,
+).require(
+  ssl_opt.allowed(),
+  error_message: SSL_DISABLED_ERROR,
 ).require(
   sspi_opt.allowed(),
   error_message: 'feature sspi is disabled',
@@ -914,10 +914,11 @@ cdata.set('USE_LIBRTMP', rtmp_opt.allowed())
 
 # Samba. {{{
 
-smb_opt = (
+smb_opt = get_option(
+  'smb',
+).require(
   ntlm_opt.allowed()
-  and cdata.get('SIZEOF_CURL_OFF_T') > 4
-  ? ENABLED_OPT : DISABLED_OPT
+  and cdata.get('SIZEOF_CURL_OFF_T') > 4 ? ENABLED_OPT : DISABLED_OPT,
 )
 
 smbs_opt = ssl_opt.allowed() ? smb_opt : DISABLED_OPT

diff --git a/subprojects/packagefiles/curl/meson_options.txt b/subprojects/packagefiles/curl/meson_options.txt
@@ -92,14 +92,15 @@ option('dict'  , type: 'feature')
 option('file'  , type: 'feature', value: 'enabled')
 option('ftp'   , type: 'feature')
 option('gopher', type: 'feature')
-option('ldap'  , type: 'feature')
-option('ldaps' , type: 'feature')
 option('http'  , type: 'feature', value: 'enabled')
 option('imap'  , type: 'feature')
+option('ldap'  , type: 'feature')
+option('ldaps' , type: 'feature')
 option('mqtt'  , type: 'feature')
 option('pop3'  , type: 'feature')
 option('rtmp'  , type: 'feature')
 option('rtsp'  , type: 'feature')
+option('smb'   , type: 'feature')
 option('smtp'  , type: 'feature')
 option('telnet', type: 'feature')
 option('tftp'  , type: 'feature')