[cairo-commit] 2 commits - meson.build util/meson.build

[GitLab Mirror]

 meson.build      |    4 ++--
 util/meson.build |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 63f0d6268469dcd12316ea405a026f4be900dd79
Merge: 936e5ce8e 45cca0c98
Author: Uli Schlachter <psychon at znc.in>
Date:   Fri May 21 15:36:44 2021 +0000

    Merge branch 'meson-defines' into 'master'
    
    meson: Move CAIRO_HAS_INTERPRETER to config.h
    
    See merge request cairo/cairo!174

commit 45cca0c984c17e98964beb63410627298d1f6a01
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun May 2 21:25:48 2021 +0200

    meson: Move CAIRO_HAS_INTERPRETER to config.h
    
    This is what autoconf does and hopefully that means this is the correct
    thing to do.
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/meson.build b/meson.build
index 06df7f9c1..9901bdf29 100644
--- a/meson.build
+++ b/meson.build
@@ -686,7 +686,7 @@ if zlib_dep.found()
 endif
 
 if zlib_dep.found()
-  feature_conf.set('CAIRO_HAS_INTERPRETER', 1)
+  conf.set('CAIRO_HAS_INTERPRETER', 1)
 endif
 
 # TODO: add xml option and disable by default
@@ -970,6 +970,6 @@ if meson.version().version_compare('>= 0.53')
 
   summary({
           'cairo-trace:': conf.get('CAIRO_HAS_TRACE', 0) == 1,
-          'cairo-script-interpreter': feature_conf.get('CAIRO_HAS_INTERPRETER', 0) == 1,
+          'cairo-script-interpreter': conf.get('CAIRO_HAS_INTERPRETER', 0) == 1,
           }, section: 'Features and Utilities', bool_yn: true)
 endif
diff --git a/util/meson.build b/util/meson.build
index 55362b6d4..e3a1ace96 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -6,7 +6,7 @@ if feature_conf.get('CAIRO_HAS_GOBJECT_FUNCTIONS', 0) == 1
   subdir('cairo-gobject')
 endif
 
-if feature_conf.get('CAIRO_HAS_INTERPRETER', 0) == 1
+if conf.get('CAIRO_HAS_INTERPRETER', 0) == 1
   subdir('cairo-script')
 endif