diff options
| author | Adam <adamdharrison@gmail.com> | 2023-10-02 11:42:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-02 11:42:25 -0400 |
| commit | d6650d1687b84d9f78129f1edcb1339cc5fa512b (patch) | |
| tree | 885ed74ed2334edbe872ff1787d6cf325f45f9ea | |
| parent | 1a54a855f9720cad10a4c47f3f65ad92d239373a (diff) | |
| parent | 2d58caf2a4cb7d18e45bbff349e78913ebba3ee0 (diff) | |
| download | lite-xl-plugin-manager-d6650d1687b84d9f78129f1edcb1339cc5fa512b.tar.gz lite-xl-plugin-manager-d6650d1687b84d9f78129f1edcb1339cc5fa512b.zip | |
Merge pull request #45 from Guldoman/PR_meson_arch_mbedtls2
Improve `mbedtls2` detection in meson
| -rw-r--r-- | meson.build | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 32664cc..eed1d7a 100644 --- a/meson.build +++ b/meson.build @@ -8,18 +8,29 @@ project('lpm', cc = meson.get_compiler('c') zlib_dep = dependency('zlib') -mbedtls_dep = dependency('mbedtls', required: false) +mbedtls_dep = dependency('mbedtls', version: '<3', required: false) libgit2_dep = dependency('libgit2') libzip_dep = dependency('libzip') lua_dep = dependency('lua') microtar_dep = dependency('microtar', required: false) if not mbedtls_dep.found() - mbedtls_dep = [ - cc.find_library('mbedtls'), - cc.find_library('mbedx509'), - cc.find_library('mbedcrypto'), - ] + # Using has_headers to distinguish between mbedtls2 and mbedtls3 + _mbedtls_dep = cc.find_library('mbedtls', has_headers: 'mbedtls/net.h', required: false) + if _mbedtls_dep.found() + mbedtls_dep = [ + _mbedtls_dep, + cc.find_library('mbedx509'), + cc.find_library('mbedcrypto'), + ] + else + # In some cases we need to manually specify where to find mbedtls2 + message('Using fallback mbedtls definition') + mbedtls_dep = declare_dependency( + include_directories: ['/usr/include/mbedtls2/'], + link_args: ['-L/usr/lib/mbedtls2', '-lmbedtls', '-lmbedx509', '-lmbedcrypto'] + ) + endif endif if not microtar_dep.found() |