From 181cd6dc517c96e86f0c71c121250105e06e8c0c Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Mon, 2 May 2022 14:21:46 +0200 Subject: [PATCH] meson: Use dependencies for pkgconfig MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- meson.build | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/meson.build b/meson.build index ee891b004..2a549f3ba 100644 --- a/meson.build +++ b/meson.build @@ -206,9 +206,8 @@ threads = dependency('threads') ## Seccomp. libseccomp = dependency('libseccomp') conf.set10('HAVE_SECCOMP', libseccomp.found()) +pkgconfig_libs += libseccomp if libseccomp.found() - pkgconfig_libs += '-lseccomp' - if libseccomp.version().version_compare('>=2.5.0') # https://github.com/seccomp/libseccomp/commit/dead12bc788b259b148cc4d93b970ef0bd602b1a conf.set10('HAVE_DECL_SECCOMP_NOTIFY_FD', true) @@ -245,9 +244,7 @@ endif ## SELinux. libselinux = dependency('libselinux', required: false) conf.set10('HAVE_SELINUX', libselinux.found()) -if libselinux.found() - pkgconfig_libs += '-lselinux' -endif +pkgconfig_libs += libselinux ## AppArmor. libapparmor = dependency('libapparmor', required: false) @@ -256,9 +253,7 @@ conf.set10('HAVE_APPARMOR', libapparmor.found()) ## OpenSSL. libopenssl = dependency('openssl', required: false) conf.set10('HAVE_OPENSSL', libopenssl.found()) -if libopenssl.found() - pkgconfig_libs += '-lssl -lcrypto' -endif +pkgconfig_libs += libopenssl ## Libcap.. libcap = dependency('libcap', required: false) @@ -267,9 +262,7 @@ if not libcap.found() libcap = cc.find_library('cap', required: false) endif conf.set10('HAVE_LIBCAP', libcap.found()) -if libcap.found() - pkgconfig_libs += '-lcap' -endif +pkgconfig_libs += libcap libcap_static = dependency('libcap', required: false, static: true) if not libcap_static.found() @@ -282,9 +275,7 @@ conf.set10('HAVE_STATIC_LIBCAP', libcap_static.found()) pam = cc.find_library('pam', has_headers: 'security/pam_modules.h') conf.set10('HAVE_PAM', pam.found()) -if pam.found() - pkgconfig_libs += '-lpam' -endif +pkgconfig_libs += pam ## Others. have = cc.has_function('strchrnul', prefix: '#include ', args: '-D_GNU_SOURCE') -- 2.47.2