diff --git a/meson.build b/meson.build index a10a1b3c8..c4cf8c6a9 100644 --- a/meson.build +++ b/meson.build @@ -296,6 +296,12 @@ if cc.has_function('SYS_memfd_create', prefix : '#include ') cdata.set('HAVE_MEMFD', 1) endif +if cc.has_function('libintl_dgettext') + libintl_dep = [] +else + libintl_dep = cc.find_library('intl') +endif + # Symbols if cc.has_header_symbol('signal.h', 'SIGXCPU') diff --git a/src/daemon/meson.build b/src/daemon/meson.build index 9bc3bf18e..9c9f807e7 100644 --- a/src/daemon/meson.build +++ b/src/daemon/meson.build @@ -31,7 +31,7 @@ executable('pulseaudio', include_directories : [configinc, topinc], link_args : ['-ffast-math'], link_with : [libpulsecore, libpulsecommon, libpulse], - dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep], + dependencies : [ltdl_dep, cap_dep, dbus_dep, libsystemd_dep, dl_dep, libintl_dep], c_args : pa_c_args, ) diff --git a/src/meson.build b/src/meson.build index c9b71a484..832c0de0d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -183,7 +183,7 @@ libpulsecommon = shared_library('pulsecommon-' + pa_version_major_minor, install_dir : privlibdir, dependencies : [ libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep, - x11_dep, libsystemd_dep, glib_dep, gtk_dep, asyncns_dep + x11_dep, libsystemd_dep, glib_dep, gtk_dep, asyncns_dep, libintl_dep, ], implicit_include_directories : false) diff --git a/src/pulse/meson.build b/src/pulse/meson.build index 00c686772..2a6f78489 100644 --- a/src/pulse/meson.build +++ b/src/pulse/meson.build @@ -81,10 +81,10 @@ libpulse = shared_library('pulse', link_args : [nodelete_link_args, versioning_link_args], install : true, install_rpath : privlibdir, - dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep], + dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep], implicit_include_directories : false) -libpulse_dep = declare_dependency(link_with: libpulse) +libpulse_dep = declare_dependency(link_with: libpulse, dependencies: libintl_dep) install_data( libpulse_headers, 'simple.h', diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build index 19f6b9e99..0bd596cbd 100644 --- a/src/pulsecore/meson.build +++ b/src/pulsecore/meson.build @@ -198,7 +198,7 @@ libpulsecore = shared_library('pulsecore-' + pa_version_major_minor, install_rpath : privlibdir, install_dir : privlibdir, link_with : libpulsecore_simd_lib, - dependencies : [libm_dep, libpulsecommon_dep, libpulse_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, libatomic_ops_dep, orc_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep], + dependencies : [libm_dep, libpulsecommon_dep, libpulse_dep, ltdl_dep, shm_dep, sndfile_dep, database_dep, dbus_dep, libatomic_ops_dep, orc_dep, samplerate_dep, soxr_dep, speex_dep, x11_dep, libintl_dep], implicit_include_directories : false) libpulsecore_dep = declare_dependency(link_with: libpulsecore) diff --git a/src/tests/meson.build b/src/tests/meson.build index 621c2c965..a03d73cdb 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -53,7 +53,7 @@ default_tests = [ [ 'queue-test', 'queue-test.c', [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ], [ 'resampler-test', 'resampler-test.c', - [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ], + [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libintl_dep ] ], [ 'rtpoll-test', 'rtpoll-test.c', [ check_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep ] ], [ 'smoother-test', 'smoother-test.c', diff --git a/src/utils/meson.build b/src/utils/meson.build index d00e030ae..dedf4e404 100644 --- a/src/utils/meson.build +++ b/src/utils/meson.build @@ -15,7 +15,7 @@ executable('pacat', install_rpath : privlibdir, include_directories : [configinc, topinc], link_with : [libpulsecommon, libpulse], - dependencies : [sndfile_dep], + dependencies : [sndfile_dep, libintl_dep], c_args : pa_c_args, ) @@ -36,7 +36,7 @@ executable('pactl', install_rpath : privlibdir, include_directories : [configinc, topinc], link_with : [libpulsecommon, libpulse], - dependencies : [sndfile_dep], + dependencies : [sndfile_dep, libintl_dep], c_args : pa_c_args, ) @@ -50,6 +50,7 @@ executable('pasuspender', install_rpath : privlibdir, include_directories : [configinc, topinc], link_with : [libpulsecommon, libpulse], + dependencies: [libintl_dep], c_args : pa_c_args, ) @@ -63,6 +64,7 @@ executable('pacmd', install_rpath : privlibdir, include_directories : [configinc, topinc], link_with : [libpulsecommon, libpulse], + dependencies: [libintl_dep], c_args : pa_c_args, ) @@ -77,7 +79,7 @@ if x11_dep.found() install_rpath : privlibdir, include_directories : [configinc, topinc], link_with : [libpulsecommon, libpulse], - dependencies : [x11_dep], + dependencies : [x11_dep, libintl_dep], c_args : pa_c_args, ) endif