From 3bd88821bbfc8066a63ddfc9959e78984bc17750 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 18 May 2020 15:18:12 -0400 Subject: build: add libintl dependency to meson and the .pc file In order to use gettext on systems where it is not part of libc, the correct linker flags are needed in libalpm.pc (for static compilation). This has never been the case. The new meson build system currently only checks for ngettext in libc, but does not fall back to searching for the existence of -lintl; add it to the libalpm dependencies. Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 680cf62b..264c6501 100644 --- a/meson.build +++ b/meson.build @@ -77,9 +77,13 @@ conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/')) conf.set_quoted('HOOKDIR', join_paths(SYSCONFDIR, 'pacman.d/hooks/')) conf.set_quoted('ROOTDIR', ROOTDIR) +libintl = dependency('', required: false) if get_option('i18n') if not cc.has_function('ngettext') - error('ngettext not found but NLS support requested') + libintl = cc.find_library('intl', required : false, static: get_option('buildstatic')) + if not libintl.found() + error('ngettext not found but NLS support requested') + endif endif conf.set('ENABLE_NLS', 1) endif @@ -301,7 +305,7 @@ libcommon = static_library( include_directories : includes, install : false) -alpm_deps = [crypto_provider, libarchive, libcurl, gpgme] +alpm_deps = [crypto_provider, libarchive, libcurl, libintl, gpgme] libalpm_a = static_library( 'alpm_objlib', -- cgit v1.2.3-54-g00ecf