meson: Build libwebrtc-util as a shared library

As it'sdone in the autotools

Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>

diff --git a/src/modules/echo-cancel/meson.build b/src/modules/echo-cancel/meson.build
index ea984f4..0a3deb9 100644 (file)
--- a/src/modules/echo-cancel/meson.build
+++ b/src/modules/echo-cancel/meson.build
@@ -2,18 +2,20 @@
 # link module-echo-cancel with C++ (which it does if there are any C++ deps,
 # even conditional ones).
 
-# Defining this library as shared fails, as it actually requires a symbol
-# from module-echo-cancel.c. Setting it to static solves that.
+# This library requires a symbol from module-echo-cancel, hence we need
+# '-Wl,--unresolved-symbols=ignore-in-object-files' otherwise it fails
+# at link time.
 
 libwebrtc_util_sources = [
   'webrtc.cc'
 ]
 
-libwebrtc_util = static_library('webrtc-util',
+libwebrtc_util = shared_library('webrtc-util',
   libwebrtc_util_sources,
   cpp_args : [pa_c_args, server_c_args],
   include_directories : [configinc, topinc],
   dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, webrtc_dep],
+  link_args : [ '-Wl,--unresolved-symbols=ignore-in-object-files' ],
   install : true,
   install_dir : modlibexecdir,
 )

diff --git a/src/tests/meson.build b/src/tests/meson.build
index a450cb8..d5d4a91 100644 (file)
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -142,7 +142,7 @@ endforeach
 
 norun_tests += [
   [ 'echo-cancel-test', echo_cancel_test_sources,
-    module_echo_cancel_deps + [ libpulse_dep, libpulsecore_dep ],
+    module_echo_cancel_deps + [ libpulse_dep, libpulsecommon_dep, libpulsecore_dep ],
     module_echo_cancel_libs,
     module_echo_cancel_flags + server_c_args + [ '-DPA_MODULE_NAME=module_echo_cancel', '-DECHO_CANCEL_TEST=1' ] ]
 ]