q66 pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=fd9a7983763076e79f482e67abe8b360f9d85719
commit fd9a7983763076e79f482e67abe8b360f9d85719 Author: q66 <[email protected]> Date: Thu Jun 11 02:43:14 2020 +0200 meson: fix fnmatch dependency lookup The previous version didn't really make sense whatsoever, also it was unused. --- meson.build | 4 +--- src/bin/meson.build | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 57e7da821..5027d542c 100644 --- a/meson.build +++ b/meson.build @@ -205,9 +205,7 @@ if cc.has_header('fnmatch.h') == false error('fnmatch.h not found') endif -if cc.has_function('fnmatch') == false - dep_fnmatch = dependency('fnmatch', required: true) -endif +dep_fnmatch = cc.find_library('fnmatch', required: false) add_global_arguments('-DPACKAGE_BIN_DIR="@0@"'.format(dir_bin), language: 'c') add_global_arguments('-DPACKAGE_LIB_DIR="@0@"'.format(dir_lib), language: 'c') diff --git a/src/bin/meson.build b/src/bin/meson.build index a3c451360..d1ad05294 100644 --- a/src/bin/meson.build +++ b/src/bin/meson.build @@ -16,6 +16,7 @@ deps_e = [ dep_m, dep_dl, dep_execinfo, + dep_fnmatch, dep_eina, dep_eet, dep_eeze, --
