summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabrice Fontaine <fontaine.fabrice@gmail.com>2019-06-09 18:38:37 +0200
committerSami Kerola <kerolasa@iki.fi>2019-06-10 20:55:28 +0100
commit418d8bea5424d8a14a21fd7928747a233557618c (patch)
treed6f86b5a2097277593b8e1c72ce5bac5ab090950
parenteabe21164bbb29dead1a902b6d6e910f6892e3a7 (diff)
downloadiputils-418d8bea5424d8a14a21fd7928747a233557618c.tar.gz
build-sys: fix build with NLS
With some toolchains, intl is needed for NLS support so search for this library and use if needed. Fixes: - http://autobuild.buildroot.org/results/0a8a3efe734ac7fb3a68ba505277681857dc0a3d Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-rw-r--r--meson.build11
1 files changed, 7 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index 3766edc..2b545b6 100644
--- a/meson.build
+++ b/meson.build
@@ -77,6 +77,8 @@ if opt != ''
conf.set_quoted('DEFAULT_DEVICE', opt, description : 'arping default device.')
endif
+# Some systems needs intl for gettext
+intl_dep = []
opt = get_option('USE_GETTEXT')
if opt == true
prefix = get_option('prefix')
@@ -86,6 +88,7 @@ if opt == true
conf.set('ENABLE_NLS', 1, description : 'If set enable I18N.')
conf.set_quoted('LOCALEDIR', join_paths(prefix, localedir))
subdir ('po')
+ intl_dep += cc.find_library('intl', required : false)
endif
opt = get_option('USE_IDN')
@@ -243,7 +246,7 @@ libcommon = static_library(
if build_ping == true
executable('ping', ['ping.c', 'ping_common.c', 'ping6_common.c', git_version_h],
- dependencies : [m_dep, cap_dep, idn_dep, crypto_dep, resolv_dep],
+ dependencies : [m_dep, cap_dep, idn_dep, intl_dep, crypto_dep, resolv_dep],
link_with : [libcommon],
install: true)
meson.add_install_script('build-aux/setcap-setuid.sh',
@@ -256,7 +259,7 @@ endif
if build_tracepath == true
executable('tracepath', ['tracepath.c', git_version_h],
- dependencies : idn_dep,
+ dependencies : [idn_dep, intl_dep],
link_with : [libcommon],
install: true)
endif
@@ -276,7 +279,7 @@ endif
if build_clockdiff == true
executable('clockdiff', ['clockdiff.c', git_version_h],
- dependencies : [cap_dep],
+ dependencies : [cap_dep, intl_dep],
link_with : [libcommon],
install: true)
meson.add_install_script('build-aux/setcap-setuid.sh',
@@ -306,7 +309,7 @@ endif
if build_arping == true
executable('arping', ['arping.c', git_version_h],
- dependencies : [rt_dep, cap_dep, idn_dep],
+ dependencies : [rt_dep, cap_dep, idn_dep, intl_dep],
link_with : [libcommon],
install: true)
meson.add_install_script('build-aux/setcap-setuid.sh',