freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 2cc589043: meson: Use the standard dependency mechani


From: Werner Lemberg
Subject: [freetype2] master 2cc589043: meson: Use the standard dependency mechanism to find bzip2
Date: Wed, 6 Mar 2024 09:48:46 -0500 (EST)

branch: master
commit 2cc589043ea195f4a398b18f7cc2ec36c0ec0885
Author: Jordan Williams <jordan@jwillikers.com>
Commit: Jordan Williams <jordan@jwillikers.com>

    meson: Use the standard dependency mechanism to find bzip2
    
    This follows standard conventions in Meson by using the pkg-config file.
    This change allows Conan to switch to the Meson build system.
---
 meson.build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 2939e288b..18d812499 100644
--- a/meson.build
+++ b/meson.build
@@ -316,8 +316,10 @@ else
 endif
 
 # BZip2 support
-bzip2_dep = cc.find_library('bz2',
-  required: get_option('bzip2'))
+bzip2_dep = dependency('bzip2', required: false)
+if not bzip2_dep.found()
+  bzip2_dep = cc.find_library('bz2', has_headers: ['bzlib.h'], required: 
get_option('bzip2'))
+endif
 
 if bzip2_dep.found()
   ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BZIP2']



reply via email to

[Prev in Thread] Current Thread [Next in Thread]