[eog: 20/21] build: Set values in configuration object unconditionally
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog: 20/21] build: Set values in configuration object unconditionally
- Date: Mon, 15 Jul 2019 19:31:21 +0000 (UTC)
commit 55429319be405abe1c3c139a493a4c5b64af2caa
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Fri Jun 28 10:50:48 2019 +0200
build: Set values in configuration object unconditionally
Some values are set as true once the value they depend has been
checked.
This has been changed so it is set or unset depending on the boolean
value to be checked.
meson.build | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 4c5eb660..42360040 100644
--- a/meson.build
+++ b/meson.build
@@ -132,22 +132,22 @@ if enable_libexif
'libexif support requested but library not found. Please use -Dlibexif=false')
common_deps += libexif_dep
- config_h.set('HAVE_EXIF', true)
endif
+config_h.set('HAVE_EXIF', enable_libexif)
# Little CMS (optional)
enable_cms = get_option('cms')
if enable_cms
common_deps += dependency('lcms2')
- config_h.set('HAVE_LCMS', true)
endif
+config_h.set('HAVE_LCMS', enable_cms)
# Exempi (optional)
enable_xmp = get_option('xmp')
if enable_xmp
common_deps += dependency('exempi-2.0', version: '>= 1.99.5')
- config_h.set('HAVE_EXEMPI', true)
endif
+config_h.set('HAVE_EXEMPI', enable_xmp)
# Jpeg (semi-optional)
enable_libjpeg = get_option('libjpeg')
@@ -168,9 +168,8 @@ if enable_libjpeg
#endif
'''
have_jpeg_80 = cc.compiles(jpeg_80_check_src, dependencies: libjpeg_dep, name: 'libjpeg version is 8 or
greater')
-
- config_h.set('HAVE_JPEG', true)
endif
+config_h.set('HAVE_JPEG', enable_libjpeg)
config_h.set('HAVE_LIBJPEG', enable_libjpeg)
# introspection support
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]