2 commits - meson.build meson_options.txt

[GitLab Mirror]

 meson.build       |    2 +-
 meson_options.txt |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 62d99c8a654ff67f34e9c3b3496b4eb5269f6694
Merge: 65a29e787 c1748e79f
Author: Tim-Philipp Müller <tim at centricular.com>
Date:   Tue Sep 10 15:14:58 2024 +0000

    Merge branch 'hgr/lzo_option' into 'master'
    
    meson: expose lzo as a meson option
    
    See merge request cairo/cairo!590

commit c1748e79f0b18d44891bda2b6aa877175d802660
Author: Håvard Graff <havard.graff at gmail.com>
Date:   Sat Jan 13 12:06:12 2024 +0100

    meson: expose lzo as a meson option

diff --git a/meson.build b/meson.build
index 4051a7c11..e45e441f3 100644
--- a/meson.build
+++ b/meson.build
@@ -198,7 +198,7 @@ else
   endif
 endif
 
-lzo_dep = dependency('lzo2', required: false)
+lzo_dep = dependency('lzo2', required: get_option('lzo'))
 if lzo_dep.found()
   conf.set('HAVE_LZO', 1)
 endif
diff --git a/meson_options.txt b/meson_options.txt
index f481ef3ea..8aa6814bb 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -16,6 +16,7 @@ option('zlib', type : 'feature', value : 'auto') # script, ps, pdf, xml surfaces
 option('tests', type : 'feature', value : 'auto')
 
 # Util deps
+option('lzo', type : 'feature', value : 'auto')
 option('gtk2-utils', type : 'feature', value : 'disabled')
 
 # Misc deps