From: Jonathan Dieter <jdieter@gmail.com>
Date: Sun, 9 Jan 2022 20:55:21 +0000 (+0000)
Subject: Simplify use of disabler
X-Git-Tag: archive/raspbian/1.2.1+ds1-1+rpi1^2~7^2~1^2~5^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=728591b3aaf4b28ac0bb9393076932cb7acea7b4;p=zchunk.git

Simplify use of disabler

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---

diff --git a/meson.build b/meson.build
index 14c6fa5..aa07574 100644
--- a/meson.build
+++ b/meson.build
@@ -34,12 +34,9 @@ endif
 
 # curl dependency
 if build_machine.system() == 'windows'
-    curl_dep = dependency('curl', modules: 'CURL::libcurl', required : get_option('with-curl'))
+    curl_dep = dependency('curl', modules : 'CURL::libcurl', required : get_option('with-curl'), disabler : true)
 else
-    curl_dep = dependency('libcurl', required : get_option('with-curl'))
-endif
-if not curl_dep.found()
-    curl_dep = disabler()
+    curl_dep = dependency('libcurl', required : get_option('with-curl'), disabler : true)
 endif
 
 # openssl dependency
diff --git a/src/meson.build b/src/meson.build
index 928fe3f..5a2d625 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -46,13 +46,11 @@ zck_delta_size = executable(
     link_with: zcklib,
     install: true
 )
-if curl_dep.found()
-    zckdl = executable(
-        'zckdl',
-        ['zck_dl.c', 'util_common.c'] + extra_win_src,
-        include_directories: inc,
-        dependencies: [argplib, curl_dep],
-        link_with: zcklib,
-        install: true
-    )
-endif
+zckdl = executable(
+    'zckdl',
+    ['zck_dl.c', 'util_common.c'] + extra_win_src,
+    include_directories: inc,
+    dependencies: [argplib, curl_dep],
+    link_with: zcklib,
+    install: true
+)
diff --git a/test/meson.build b/test/meson.build
index 76f2701..7c05b53 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -77,15 +77,13 @@ test(
         '-V'
     ]
 )
-if curl_dep.found()
-    test(
-        'check version info in zckdl',
-        zckdl,
-        args: [
-            '-V'
-        ]
-    )
-endif
+test(
+    'check version info in zckdl',
+    zckdl,
+    args: [
+        '-V'
+    ]
+)
 test(
     'check version info in zck_read_header',
     zck_read_header,
@@ -151,17 +149,15 @@ test(
     ],
     is_parallel: false
 )
-if curl_dep.found()
-    test(
-        'check verbosity in zckdl',
-        zckdl,
-        args: [
-            '-vvvvv',
-            'file:///empty'
-        ],
-        should_fail: true
-    )
-endif
+test(
+    'check verbosity in zckdl',
+    zckdl,
+    args: [
+        '-vvvvv',
+        'file:///empty'
+    ],
+    should_fail: true
+)
 test(
     'check verbosity in zck_read_header',
     zck_read_header,