From 3edf75c319c47df598efd55aa6771d8d58c52bb4 Mon Sep 17 00:00:00 2001 From: Jongmin Lee Date: Thu, 27 Jun 2019 08:26:55 +0000 Subject: [PATCH] meson: add some config definitions Some config definitions used in source code could not be defined during build config process. - HAVE_XATTR - HAVE_CIPHER - HAVE_SIGNATURE - BUILD_ECORE_EVAS_EWS Reviewed-by: Marcel Hollerbach Reviewed-by: Vincent Torri Differential Revision: https://phab.enlightenment.org/D9192 --- header_checks/meson.build | 4 ++++ meson.build | 5 +++++ src/modules/ecore_evas/meson.build | 2 ++ 3 files changed, 11 insertions(+) diff --git a/header_checks/meson.build b/header_checks/meson.build index 8ead497882..21545607b8 100644 --- a/header_checks/meson.build +++ b/header_checks/meson.build @@ -194,6 +194,10 @@ if (cc.has_header('sys/mman.h')) config_h.set10('HAVE_MMAN_H', true) endif +if config_h.has('HAVE_LISTXATTR') and config_h.has('HAVE_SETXATTR') and config_h.has('HAVE_GETXATTR') + config_h.set10('HAVE_XATTR', true) +endif + regexp = [] if sys_windows == true regexp = cc.find_library('regex', diff --git a/meson.build b/meson.build index 96b33180ed..a6febe01d0 100644 --- a/meson.build +++ b/meson.build @@ -225,6 +225,11 @@ elif (get_option('crypto') == 'openssl') config_h.set('HAVE_OPENSSL', '1') endif +if get_option('crypto') != '' + config_h.set('HAVE_CIPHER', '1') + config_h.set('HAVE_SIGNATURE', '1') +endif + config_h.set_quoted('SHARED_LIB_SUFFIX', '.'+sys_lib_extension) config_h.set_quoted('MOD_SUFFIX', '.'+sys_mod_extension) config_h.set_quoted('EXE_SUFFIX', '.'+sys_exe_extension) diff --git a/src/modules/ecore_evas/meson.build b/src/modules/ecore_evas/meson.build index 7a9d6979da..78a9b35d13 100644 --- a/src/modules/ecore_evas/meson.build +++ b/src/modules/ecore_evas/meson.build @@ -44,3 +44,5 @@ if get_option('vnc-server') subdir(join_paths('vnc_server')) endif + +config_h.set('BUILD_ECORE_EVAS_EWS', '1')