Even after the previous patch, in order to build without netcf you
would need to add "-Dnetcf=disabled" to the meson commandline (or
uninstall netcf-devel). This patch makes -Dnetcf=disabled the
default. (Without this change, a lot of people would just blindly
continue building with netcf enabled.)

Signed-off-by: Laine Stump <la...@redhat.com>
---
 meson.build | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index bfdffb16d2..4cddb95bad 100644
--- a/meson.build
+++ b/meson.build
@@ -1155,10 +1155,11 @@ libm_dep = cc.find_library('m', required : false)
 
 netcf_version = '0.1.8'
 netcf_dep = dependency('netcf', version: '>=' + netcf_version, required: 
get_option('netcf'))
-if not get_option('netcf').disabled()
-  if netcf_dep.found()
-    conf.set('WITH_NETCF', 1)
+if get_option('netcf').enabled()
+  if not netcf_dep.found()
+    error('You must install the netcf development package to build with netcf')
   endif
+  conf.set('WITH_NETCF', 1)
 endif
 
 have_gnu_gettext_tools = false
-- 
2.29.2

Reply via email to