diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2019-04-18 09:31:51 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-04-18 12:30:22 -0400 |
| commit | ecce595b241763dd3029a1bc39f10f4f664b3c9a (patch) | |
| tree | 6b8cf50e27d676911a1d99900997f4b20431e725 /header_checks | |
| parent | e65c49b4224d4c4d27f67bbc1c91e8d2bc8450e8 (diff) | |
| download | efl-ecce595b241763dd3029a1bc39f10f4f664b3c9a.tar.gz | |
Windows: remove fnmatch and regex in Evil and use the ones in regex DLL installed by ewpi
Test Plan: compilation with autotools and meson (at least as far as it can go)
Reviewers: zmike, raster
Reviewed By: zmike
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D8646
Diffstat (limited to 'header_checks')
| -rw-r--r-- | header_checks/meson.build | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/header_checks/meson.build b/header_checks/meson.build index 42d638fc6a..af5ef11149 100644 --- a/header_checks/meson.build +++ b/header_checks/meson.build @@ -189,12 +189,29 @@ if (cc.has_header('sys/mman.h')) config_h.set10('HAVE_MMAN_H', true) endif +regexp = [] +if sys_windows == true + regexp = cc.find_library('regex', + has_headers: ['regex.h', 'fnmatch.h'], + required: true) + if regexp.found() == false + error('regex can not be found') + endif +else + if cc.has_header_symbol('fnmatch.h', 'fnmatch') == false + error('fnmatch can not be found') + endif + if cc.has_header_symbol('regex.h', 'regcomp') == false + error('regcomp can not be found') + endif +endif + config_h.set('VMAJ', version_major) config_h.set('VMIN', version_minor) config_h.set('VMIC', version_micro) config_h.set('VREV', '0') -#jpeg detection ... life is a bit more complex there +#jpeg detection ... life is a bit more complex there jpeg = dependency('libjpeg', required: false) if jpeg.found() == false |