From: Eli Schwartz <eschwartz@archlinux.org>
Date: Fri, 16 Dec 2022 00:48:22 +0000 (-0500)
Subject: meson: fix broken commit that broke the build
X-Git-Tag: v1.5.4^2~104^2~1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e8401e9e8d84c7dab40677cc1687138135e86901;p=thirdparty%2Fzstd.git

meson: fix broken commit that broke the build

In commit 031de3c69ccbf3282ed02fb49369b476730aeca8 some code was added
that returned a boolean, but was treated as if it returned a dependency
object. This wasn't tested and could not work. Moreover, zstd no longer
built at all unless the entire programs directory was disabled and not
even evaluated.

Fix the return type checking.
---

diff --git a/build/meson/programs/meson.build b/build/meson/programs/meson.build
index 8cee115da..e611dc337 100644
--- a/build/meson/programs/meson.build
+++ b/build/meson/programs/meson.build
@@ -51,8 +51,8 @@ endif
 
 export_dynamic_on_windows = false
 # explicit backtrace enable/disable for Linux & Darwin
-execinfo = cc.has_header('execinfo.h', required: use_backtrace)
-if not execinfo.found()
+have_execinfo = cc.has_header('execinfo.h', required: use_backtrace)
+if not have_execinfo
   zstd_c_args += '-DBACKTRACE_ENABLE=0'
 elif use_debug and host_machine_os == os_windows  # MinGW target
   zstd_c_args += '-DBACKTRACE_ENABLE=1'