summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorq66 <daniel@octaforge.org>2020-06-11 02:43:14 +0200
committerq66 <daniel@octaforge.org>2020-06-11 02:44:55 +0200
commitfd9a7983763076e79f482e67abe8b360f9d85719 (patch)
treebff125c1d8010a416e51c11af943c078f726ea78
parent9fc310db63f5310160c94e130db8d80c6acc7c2b (diff)
downloadenlightenment-fd9a7983763076e79f482e67abe8b360f9d85719.tar.gz
meson: fix fnmatch dependency lookup
The previous version didn't really make sense whatsoever, also it was unused.
-rw-r--r--meson.build4
-rw-r--r--src/bin/meson.build1
2 files changed, 2 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index 57e7da821d..5027d542c9 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 a3c4513603..d1ad052941 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,